From 401da88caef79968c8c0b1cb15487c4a554761ec Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 23 十月 2024 14:37:04 +0800
Subject: [PATCH] 测试环境暂时注释
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 495e380..d74a0d9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,9 +1,13 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
+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;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -30,8 +34,14 @@
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
@Scheduled(cron = "0 0 1 * * ? ")
- public void clearApiLog(){
+ public void clearApiLog() {
try {
apiLogService.clearWeekBefore();
} catch (Exception e) {
@@ -41,11 +51,27 @@
@Scheduled(cron = "0/5 * * * * ? ")
//@Async("orderThreadPool")
- public void completeAndReport(){
+ public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
+ //濡傛灉鏄姞宸ュ崟鍒欒繘琛屽垽鏂�
+ if (order.getDocType() == 33) {
+ //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ Boolean flag = false;
+ for (OrderDetl orderDetl : orderDetlList) {
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
+ if (!Cools.isEmpty(agvLocDetls)) {
+ //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
+ flag = true;
+ }
+ }
+ if (flag) {
+ continue;
+ }
+ }
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
@@ -54,14 +80,24 @@
}
}
+ @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.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
@Scheduled(cron = "0 */1 * * * ? ")
- public void completeOrder(){
+ 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