From 1c820ced316b0adcc122a1b1389b5962d4be03b9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 十二月 2025 17:07:00 +0800
Subject: [PATCH] agv工作档相关功能完善
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index a797915..82bba23 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -2,8 +2,9 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -15,6 +16,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -30,6 +32,12 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Resource
+ private OrderPakinService orderPakinService;
+ @Resource
+ private OrderPakoutService orderPakoutService;
+ @Resource
+ private MesService mesService;
@Value("${erp.switch.ErpReportOld}")
private boolean ErpReportOld;
@@ -81,7 +89,7 @@
// }
}
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderInAndOutUtil() {
// String erpReport = Parameter.get().getErpReport();
@@ -101,26 +109,46 @@
// }
}
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
- if (!ErpReportOld){
- return;
- }
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderReport(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
- } catch (Exception e) {
- log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
+
+ // 鍏ュ簱瀹屾垚
+ List<OrderPakin> pakins = orderPakinService.selectComplete();
+ for (OrderPakin orderPakin : pakins) {
+ try {
+ mesService.inFeedback(orderPakin.getOrderNo());
+ } catch (Exception e) {
+ log.error("鎺ㄩ�佸叆搴撳畬鎴愪俊鎭敊璇�, order{}", orderPakin, e);
}
}
+
+ List<OrderPakout> pakouts = orderPakoutService.selectComplete();
+ for (OrderPakout orderPakout : pakouts) {
+ try {
+ mesService.outFeedback(orderPakout.getOrderNo());
+ } catch (Exception e) {
+ log.error("鎺ㄩ�佸嚭搴撳畬鎴愪俊鎭敊璇�, order{}", orderPakout, e);
+ }
+ }
+
+// if (!ErpReportOld){
+// return;
+// }
+// String erpReport = Parameter.get().getErpReport();
+// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+// List<Order> orders = orderService.selectComplete();
+// for (Order order : orders) {
+// try {
+// ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+// if (!result.isSuccess()) {
+// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+// }
+// } catch (Exception e) {
+// log.error(e.getMessage());
+// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+// }
+// }
+// }
}
}
--
Gitblit v1.9.1