From b2dbc07e7d3c3f336a0090b7457c89c6895d5e40 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 05 一月 2026 14:50:10 +0800
Subject: [PATCH] 入库流程修改

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

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 6887117..e44b3b9 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;
@@ -29,6 +30,9 @@
     private OrderService orderService;
     @Autowired
     private ApiLogService apiLogService;
+
+    @Value("${erp.switch.ErpReportOld}")
+    private boolean ErpReportOld;
 
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog() {
@@ -56,6 +60,11 @@
         }
     }
 
+    /**
+     * 涓婃姤鍗曟嵁杞墽琛屽崟鎹�
+     * @author Ryan
+     * @date 2026/1/5 14:07
+     */
     @Scheduled(cron = "0/30 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReportOrderIssued() {
@@ -77,7 +86,7 @@
 //        }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+//    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReportOrderInAndOutUtil() {
 //        String erpReport = Parameter.get().getErpReport();
@@ -97,9 +106,12 @@
 //        }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+//    @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();

--
Gitblit v1.9.1