From 78c42b85c2fc1a77c80ac0da78367f1021fb511f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 十二月 2024 14:14:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/integrationWms' into integrationWms
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 6 ++++--
1 files changed, 4 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 1619b74..e97ffdf 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -6,6 +6,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +39,13 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
+// List<Order> orders = orderService.selectComplete();
+ List<Order> orders = OrderInAndOutUtil.selectComplete(null);
for (Order order : orders) {
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
--
Gitblit v1.9.1