From 5e802e25e196adaf64487bd06103126b5e51187d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 03 一月 2025 10:00:50 +0800
Subject: [PATCH] 添加MES库存同步功能及配置
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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..404a5a6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,7 +1,6 @@
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.AgvLocDetl;
import com.zy.asrs.entity.Order;
@@ -15,7 +14,6 @@
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -50,14 +48,15 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(fixedDelay = 5000)
//@Async("orderThreadPool")
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());
@@ -75,20 +74,35 @@
}
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ //log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
}
}
}
+ //@Scheduled(cron = "* 0/5 * * * ? ")
+ //@Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(fixedDelay = 30000)
+ //@Async("orderThreadPool")
+ public synchronized 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 * * * ? ")
+ //@Scheduled(cron = "0 */1 * * * ? ")
+ @Scheduled(fixedDelay = 60000)
public void completeOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
orderList.forEach(order -> {
- orderService.checkComplete(order.getOrderNo());
+ if (order.getPltType() != null) {
+ orderService.checkComplete(order.getOrderNo(), order.getPltType());
+ }
});
}
--
Gitblit v1.9.1