From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   77 +++++++++++++++++++++++++++++++++-----
 1 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 90ced31..a797915 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -10,6 +10,7 @@
 import com.zy.common.entity.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -30,6 +31,9 @@
     @Autowired
     private ApiLogService apiLogService;
 
+    @Value("${erp.switch.ErpReportOld}")
+    private boolean ErpReportOld;
+
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog() {
         try {
@@ -39,30 +43,81 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0 1 * * * ? ")
     @Async("orderThreadPool")
-    public void completeAndReportOrderInAndOutUtil() {
-        String erpReport = Parameter.get().getErpReport();
-        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
-            for (Order order : orders) {
-                ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+    public void completeAndReportOrderIssuedOnceMore() {
+        List<Order> orderList = orderService.selectComplete99();
+        for (Order order : orderList) {
+            try {
+                ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
                 if (!result.isSuccess()) {
-                    log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+                    log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(),result.getMsg());
                 }
+            } catch (Exception e){
+                log.error(e.getMessage());
+                log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触", order.getOrderNo());
             }
         }
     }
 
+    @Scheduled(cron = "0/30 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReportOrderIssued() {
+//        String erpReport = Parameter.get().getErpReport();
+//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orderList = orderService.selectComplete1();
+//            List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
+            for (Order order : orderList) {
+                try {
+                    ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e){
+                    log.error(e.getMessage());
+                    log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
+                }
+            }
+//        }
+    }
+
     @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
-    public void completeAndReportOrder() {
+    public void completeAndReportOrderInAndOutUtil() {
+//        String erpReport = Parameter.get().getErpReport();
+//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+            for (Order order : orders) {
+                try {
+                    ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e){
+                    log.error(e.getMessage());
+                    log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+                }
+            }
+//        }
+    }
+
+    @Scheduled(cron = "0/30 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReportOrderReport() {
+        if (!ErpReportOld){
+            return;
+        }
         String erpReport = Parameter.get().getErpReport();
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
             List<Order> orders = orderService.selectComplete();
             for (Order order : orders) {
-                ReturnT<String> result = orderSyncHandler.startOrder(order);
-                if (!result.isSuccess()) {
+                try {
+                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e) {
+                    log.error(e.getMessage());
                     log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
                 }
             }

--
Gitblit v1.9.1