From a5de20d0041431b7f5e92a49315082ff2140d447 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 13 七月 2025 10:48:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/ReportInventoryCheckOrdersScheduler.java | 85 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ReportInventoryCheckOrdersScheduler.java b/src/main/java/com/zy/asrs/task/ReportInventoryCheckOrdersScheduler.java
index f7c363c..651f619 100644
--- a/src/main/java/com/zy/asrs/task/ReportInventoryCheckOrdersScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportInventoryCheckOrdersScheduler.java
@@ -7,7 +7,7 @@
import com.zy.asrs.service.InventoryCheckOrderDetlService;
import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.asrs.service.ReportToThirdService;
-import com.zy.system.entity.Config;
+import com.zy.common.entity.Parameter;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,37 +31,43 @@
/**
* 涓婃姤鐩樼偣缁撴灉
+ * 涓嶈嚜鍔ㄤ笂鎶ワ紝閲囩敤浜哄伐鎵嬪姩涓婃姤鏂规
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
public void execute() {
- List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>()
- .eq("status", 1));
- if (inventoryCheckOrders.isEmpty()) {
- return;
- }
-
- for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
- List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
- boolean complete = true;
- for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
- if (!checkOrderDetl.getStatus().equals("2")) {
- complete = false;
- }
- }
- if (complete) {
- boolean result = reportToThirdService.reportCheckOrder(checkOrder);
- if (!result) {
- continue;
- }
-
- checkOrder.setStatus("2");
- if (!inventoryCheckOrderService.updateById(checkOrder)) {
- log.error("鐩樼偣鍗昜orderNo={}]鏇存柊鐘舵�佸け璐�", checkOrder.getOrderNo());
- } else {
- log.info("鐩樼偣鍗昜orderNo={}]鏇存柊鐘舵�佹垚鍔�", checkOrder.getOrderNo());
- }
- }
- }
+// String erpReport = Parameter.get().getErpReport();
+// if (Cools.isEmpty(erpReport) || !erpReport.equals("true")) {
+// return;
+// }
+//
+// List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>()
+// .eq("status", 1));
+// if (inventoryCheckOrders.isEmpty()) {
+// return;
+// }
+//
+// for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
+// List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
+// boolean complete = true;
+// for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
+// if (!checkOrderDetl.getStatus().equals("2")) {
+// complete = false;
+// }
+// }
+// if (complete) {
+// boolean result = reportToThirdService.reportCheckOrder(checkOrder);
+// if (!result) {
+// continue;
+// }
+//
+// checkOrder.setStatus("2");
+// if (!inventoryCheckOrderService.updateById(checkOrder)) {
+// log.error("鐩樼偣鍗昜orderNo={}]鏇存柊鐘舵�佸け璐�", checkOrder.getOrderNo());
+// } else {
+// log.info("鐩樼偣鍗昜orderNo={}]鏇存柊鐘舵�佹垚鍔�", checkOrder.getOrderNo());
+// }
+// }
+// }
}
/**
@@ -85,6 +91,25 @@
}
}
+ /**
+ * 鑷姩鍒犻櫎瓒呰繃3澶╋紝宸插畬鎴愮洏鐐瑰崟
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute3() {
+ List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>()
+ .eq("status", 2));
+ for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
+ if (System.currentTimeMillis() - checkOrder.getCreateTime().getTime() >= 1000 * 60 * 60 * 24 * 3) {
+ inventoryCheckOrderDetlService.delete(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
+ if (!inventoryCheckOrderService.deleteById(checkOrder)) {
+ log.error("鐩樼偣鍗昜orderNo={}]鍒犻櫎澶辫触", checkOrder.getOrderNo());
+ } else {
+ log.info("鐩樼偣鍗昜orderNo={}]鍒犻櫎鎴愬姛", checkOrder.getOrderNo());
+ }
+ }
+ }
+ }
+
// /**
// * 鑷姩瀹岀粨杈惧埌涓�瀹氭暟閲忕殑鐩樼偣鍗�
// */
--
Gitblit v1.9.1