From 6cd08fe4de88df0a21851f96bdc4e617c5d92e36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 29 四月 2026 11:57:31 +0800
Subject: [PATCH] 工单相关功能完善
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 110 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c0f70c5..f0c4ba5 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,19 +1,24 @@
package com.zy.asrs.task;
-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.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
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 com.zy.asrs.task.handler.OrderPakinSyncHandler;
+import com.zy.asrs.task.handler.OrderPakoutSyncHandler;
+import com.zy.system.timer.LoadingConfigTimer;
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;
+import javax.annotation.Resource;
+import java.util.Iterator;
import java.util.List;
/**
@@ -24,11 +29,24 @@
public class OrderSyncScheduler {
@Autowired
- private OrderSyncHandler orderSyncHandler;
+ private OrderPakinSyncHandler orderPakinSyncHandler;
@Autowired
- private OrderService orderService;
+ private OrderPakoutSyncHandler orderPakoutSyncHandler;
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
+
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Resource
+ private OrderDetlPakinService orderDetlPakinService;
+
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -39,31 +57,67 @@
}
}
+ /**
+ * 瀹氭椂涓婃姤宸插叆搴撶殑璁㈠崟鏁伴噺
+ */
+// @Scheduled(cron = "0 0/5 * * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
@Async("orderThreadPool")
- public void completeAndReportOrderInAndOutUtil() {
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = OrderInAndOutUtil.selectComplete(null);
- for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
- }
+ public void reportInStockOrders() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().where("qty > units"));
+ if (!orderDetlPakinList.isEmpty()) {
+ orderPakinSyncHandler.reportInStockOrders(orderDetlPakinList);
}
}
}
- // @Scheduled(cron = "0/5 * * * * ? ")
+ /**
+ * 瀹氭椂涓婃姤宸插嚭搴撶殑璁㈠崟鏁伴噺锛屽畾鏃朵换鍔�5鍒嗛挓涓婃姤涓�娆★紝鍑哄叆搴撻敊寮�涓婃姤
+ */
+// @Scheduled(cron = "0 3/5 * * * ?")
+ @Scheduled(cron = "0/10 * * * * ?")
@Async("orderThreadPool")
- public void completeAndReportOrder() {
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.startOrder(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
+ public void reportOutStockOrders() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().where("qty > units"));
+ if (!orderDetlPakoutList.isEmpty()) {
+ orderPakoutSyncHandler.reportOutStockOrders(orderDetlPakoutList);
+ }
+ }
+ }
+
+ /**
+ * 璁㈠崟宸插畬鎴愶紝涓婃姤宸插畬鎴愶紝璁㈠崟鐘舵�佸彉宸蹭笂鎶�
+ */
+ @Scheduled(cron = "0 * * * * ?")
+ @Async("orderThreadPool")
+ public void completeOrderReport() {
+ // 鍏ュ簱璁㈠崟宸插畬鎴愯浆宸蹭笂鎶�
+ orderPakinSyncHandler.completeOrderReport();
+ // 鍑哄簱璁㈠崟宸插畬鎴愯浆宸蹭笂鎶�
+ orderPakoutSyncHandler.completeOrderReport();
+ }
+
+// @Scheduled(cron = "0/15 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeOrderPakin() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderPakin> orders = orderPakinService.selectComplete();
+ for (OrderPakin order : orders) {
+ orderPakinSyncHandler.startOrderReport(order);
+ }
+ }
+ }
+
+
+// @Scheduled(cron = "0/15 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeOrderPakout() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderPakout> orders = orderPakoutService.selectComplete();
+ for (OrderPakout order : orders) {
+ orderPakoutSyncHandler.startOrderReport(order);
}
}
}
--
Gitblit v1.9.1