From be35fc91e03cb078e5a7a3354664b571e0d3ec89 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 07 六月 2025 15:38:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index ebfb840..e7c0f42 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,9 +1,17 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.InventoryCheckOrder;
+import com.zy.asrs.entity.InventoryCheckOrderDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
+import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +34,20 @@
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private InventoryCheckOrderService inventoryCheckOrderService;
+
+
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
+
+ @Autowired
+ private ConfigService configService;
+
+
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute(){
+ public void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
@@ -45,4 +65,64 @@
}
}
+ /**
+ * 鑷姩鍒犻櫎瓒呰繃1澶╋紝鏃犳槑缁嗙殑鐩樼偣鍗�
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute2() {
+ List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>());
+ if (inventoryCheckOrders.isEmpty()) {
+ return;
+ }
+ for (InventoryCheckOrder checkOrder : inventoryCheckOrders) {
+ List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
+ if (checkOrderDetls.isEmpty() && System.currentTimeMillis() - checkOrder.getCreateTime().getTime() >= 1000 * 60 * 60 * 24) {
+ if (!inventoryCheckOrderService.deleteById(checkOrder)) {
+ log.error("鐩樼偣鍗昜orderNo={}]鍒犻櫎澶辫触", checkOrder.getOrderNo());
+ } else {
+ log.info("鐩樼偣鍗昜orderNo={}]鍒犻櫎鎴愬姛", checkOrder.getOrderNo());
+ }
+ }
+ }
+ }
+
+ /**
+ * 鑷姩瀹岀粨杈惧埌涓�瀹氭暟閲忕殑鐩樼偣鍗�
+ */
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void execute3() {
+ List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>());
+ if (inventoryCheckOrders.isEmpty()) {
+ return;
+ }
+ int num = 20;
+ try {
+ Config config = configService.selectConfigByCode("AutoLocMove");
+ if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+
+ } else {
+ num = Integer.parseInt(config.getValue());
+ }
+ } catch (Exception e) {
+
+ }
+ 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 && checkOrderDetls.size() >= num) {
+ checkOrder.setStatus("2");
+ if (!inventoryCheckOrderService.updateById(checkOrder)) {
+ log.error("鐩樼偣鍗昜orderNo={}]鏇存柊鐘舵�佹垚鍔�", checkOrder.getOrderNo());
+ } else {
+ log.info("鐩樼偣鍗昜orderNo={}]鏇存柊鐘舵�佸け璐�", checkOrder.getOrderNo());
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1