From 6915c91a99e133e927993f8794c85bffaad4ce0c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 11:03:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 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 e97ffdf..4756338 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 /**
- * Created by vincent on 2020/7/7
+ * Created by IX on 2024/12/17
  */
 @Slf4j
 @Component
@@ -31,7 +31,7 @@
     private ApiLogService apiLogService;
 
     @Scheduled(cron = "0 0 1 * * ? ")
-    public void clearApiLog(){
+    public void clearApiLog() {
         try {
             apiLogService.clearWeekBefore();
         } catch (Exception e) {
@@ -39,20 +39,33 @@
         }
     }
 
-//    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
-    public void completeAndReport(){
+    public void completeAndReportOrderInAndOutUtil() {
         String erpReport = Parameter.get().getErpReport();
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-//            List<Order> orders = orderService.selectComplete();
             List<Order> orders = OrderInAndOutUtil.selectComplete(null);
             for (Order order : orders) {
-                ReturnT<String> result = orderSyncHandler.start(order);
+                ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+                if (!result.isSuccess()) {
+                    log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+                }
+            }
+        }
+    }
+
+    //    @Scheduled(cron = "0/5 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReportOrder() {
+        String erpReport = Parameter.get().getErpReport();
+        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orders = orderService.selectComplete();
+//            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+            for (Order order : orders) {
+                ReturnT<String> result = orderSyncHandler.startOrder(order);
                 if (!result.isSuccess()) {
                     log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
                 }
             }
         }
     }
-
 }

--
Gitblit v1.9.1