From a1c235841ddeef9159092a0c261dfc298058743c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 16 七月 2024 10:11:42 +0800
Subject: [PATCH] # 出库确认

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c09acce..7c65a7c 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,11 +1,12 @@
 package com.zy.asrs.task;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.common.entity.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -37,14 +38,22 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+//    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
-        List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
-        for (Order order : orders) {
-            ReturnT<String> result = orderSyncHandler.start(order);
-            if (!result.isSuccess()) {
-                log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+        String erpReport = Parameter.get().getErpReport();
+        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orders = orderService.selectComplete();
+            for (Order order : orders) {
+                try{
+                    ReturnT<String> result = orderSyncHandler.start(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    }
+                }catch (Exception e){
+                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+                }
             }
         }
     }

--
Gitblit v1.9.1