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 | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 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 5b315d8..f0c4ba5 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,10 +1,12 @@
package com.zy.asrs.task;
+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.ApiLogService;
-import com.zy.asrs.service.OrderPakinService;
-import com.zy.asrs.service.OrderPakoutService;
+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.OrderPakinSyncHandler;
import com.zy.asrs.task.handler.OrderPakoutSyncHandler;
@@ -15,6 +17,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.Iterator;
import java.util.List;
/**
@@ -37,6 +41,12 @@
@Autowired
private LoadingConfigTimer loadingConfigTimer;
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Resource
+ private OrderDetlPakinService orderDetlPakinService;
+
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -47,8 +57,49 @@
}
}
+ /**
+ * 瀹氭椂涓婃姤宸插叆搴撶殑璁㈠崟鏁伴噺
+ */
+// @Scheduled(cron = "0 0/5 * * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
+ @Async("orderThreadPool")
+ 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/15 * * * * ? ")
+ /**
+ * 瀹氭椂涓婃姤宸插嚭搴撶殑璁㈠崟鏁伴噺锛屽畾鏃朵换鍔�5鍒嗛挓涓婃姤涓�娆★紝鍑哄叆搴撻敊寮�涓婃姤
+ */
+// @Scheduled(cron = "0 3/5 * * * ?")
+ @Scheduled(cron = "0/10 * * * * ?")
+ @Async("orderThreadPool")
+ 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()) {
@@ -60,7 +111,7 @@
}
- @Scheduled(cron = "0/15 * * * * ? ")
+// @Scheduled(cron = "0/15 * * * * ? ")
@Async("orderThreadPool")
public void completeOrderPakout() {
if (loadingConfigTimer.getErpReport()) {
--
Gitblit v1.9.1