From 16bd33b89e43278a1080a5f322356675522c84ee Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 30 四月 2026 15:08:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AutoEmptyOutScheduler.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoEmptyOutScheduler.java b/src/main/java/com/zy/asrs/task/AutoEmptyOutScheduler.java
index c63ce45..1b8015a 100644
--- a/src/main/java/com/zy/asrs/task/AutoEmptyOutScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoEmptyOutScheduler.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.AutoEmptyOutHandler;
@@ -24,7 +26,8 @@
private AutoEmptyOutHandler autoEmptyOutHandler;
@Autowired
private WrkMastService wrkMastService;
-
+ @Autowired
+ private LocMastService locMastService;
//瀹氭椂绌哄簱浣嶉鐣欙紝绌鸿酱鍑哄簱
@Scheduled(cron = "0/3 * * * * ? ")
public void autoEmptyOut() {
@@ -41,21 +44,37 @@
@Scheduled(cron = "0/30 * * * * ? ")
public void autoLocMove() {
- Config config = configService.selectConfigByCode("AutoLocMove");
+ Config config = configService.selectConfigByCode("AutoLocMoveToOther");
if (Cools.isEmpty(config) || config.getValue().equals("false")) {
return;
+ }
+ Config configMax = configService.selectConfigByCode("moveMax");
+ Integer max;
+ if (Cools.isEmpty(configMax)) {
+ max = 4;
+ }else{
+ max = Integer.valueOf(config.getValue());
}
try {
Integer existCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
.eq("io_type", 101)
.eq("log_mk", "Y")
.eq("ove_mk", "N"));
- int allow = 2 - (existCount == null ? 0 : existCount);
+ int allow = max - (existCount == null ? 0 : existCount);
if (allow <= 0) {
return;
}
int created = 0;
for (int crnNo = 1; crnNo < 5 && created < allow; crnNo++) {
+ Integer emptyLocCount = locMastService.selectCount(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo)
+ .eq("loc_sts", "O")
+ .eq("frozen", 0)
+ .eq("deleted", 0)
+ .eq("whs_type", 1));
+ if (emptyLocCount == null || emptyLocCount >= 50) {
+ continue;
+ }
String result = autoEmptyOutHandler.moveMostMatnrInventoryInner(crnNo, 1L);
if (!Cools.isEmpty(result)) {
created++;
--
Gitblit v1.9.1