From f66fd8ba90a75a2002ba7783a870035e7908d89f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 27 十二月 2024 09:21:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 4756338..fc2ccf3 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 IX on 2024/12/17
+ * updated by IX in 2024/12/17
  */
 @Slf4j
 @Component
@@ -39,30 +39,61 @@
         }
     }
 
+    @Scheduled(cron = "0/5 * * * * ? ")
+    @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={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e){
+                    log.error(e.getMessage());
+                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                }
+            }
+        }
+    }
+
+    @Scheduled(cron = "0/5 * * * * ? ")
     @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);
-                if (!result.isSuccess()) {
+                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/5 * * * * ? ")
+    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
-    public void completeAndReportOrder() {
+    public void completeAndReportOrderReport() {
         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()) {
+                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