From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 65a84cc..70646f1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,9 +3,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderDetlService;
@@ -73,13 +72,24 @@
continue;
}
}
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
+// ReturnT<String> result = orderSyncHandler.start(order);
+// if (!result.isSuccess()) {
+// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+// }
}
}
}
+
+ //@Scheduled(cron = "* 0/5 * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void reportOrder() {
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
+ orderList.forEach(order -> {
+ orderSyncHandler.timelyStart(order);
+ });
+ }
+
/*
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
@@ -88,7 +98,7 @@
public void completeOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
orderList.forEach(order -> {
- orderService.checkComplete(order.getOrderNo());
+ orderService.checkComplete(order.getOrderNo(), null);
});
}
--
Gitblit v1.9.1