From e62b874901a4f357d1ff9aa0fb9ca48f0aa9d3fa Mon Sep 17 00:00:00 2001
From: lfdMem <1>
Date: 星期一, 10 三月 2025 09:42:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 25948df..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,7 +43,7 @@
         }
     }
 
-    @Scheduled(cron = "0/30 * * * * ? ")
+    @Scheduled(cron = "0 1 * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReportOrderIssuedOnceMore() {
         List<Order> orderList = orderService.selectComplete99();
@@ -56,7 +60,7 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/30 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReportOrderIssued() {
 //        String erpReport = Parameter.get().getErpReport();
@@ -97,9 +101,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