From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |    5 +++--
 1 files changed, 3 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 ef69df3..75e2e92 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -2,6 +2,7 @@
 
 import com.core.common.Cools;
 import com.zy.asrs.entity.Order;
+import com.zy.asrs.enums.OrderTypeEnum;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.core.ReturnT;
@@ -81,7 +82,7 @@
 //        }
     }
 
-//    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReportOrderInAndOutUtil() {
 //        String erpReport = Parameter.get().getErpReport();
@@ -101,7 +102,7 @@
 //        }
     }
 
-//    @Scheduled(cron = "0/30 * * * * ? ")
+    @Scheduled(cron = "0/30 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReportOrderReport() {
         if (!ErpReportOld){

--
Gitblit v1.9.1