From 5d6c45fda93e4f80334213205ca5aec4e10436b2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 21:21:47 +0800
Subject: [PATCH] 关闭与erp的对接

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 21de429..988ca1f 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -94,24 +94,6 @@
 
     @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) {
-            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 * * * * ? ")
     //@Async("orderThreadPool")
     public void completeAndReportOrderInAndOutUtil2() {
@@ -132,6 +114,28 @@
 //        }
     }
 
+    @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) {
+            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() {

--
Gitblit v1.9.1