From a0b49b0d11220c7fefcbe0ca0e938827c16edae4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 19:09:18 +0800
Subject: [PATCH] #预调度堆垛机2
---
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java | 55 ++++---------------------------------------------------
1 files changed, 4 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index fcb9863..4c09b6b 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -20,17 +20,12 @@
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
-import com.zy.common.utils.RedisUtil;
-import com.zy.core.enums.RedisKeyType;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
@Component
public class InboundCrnMoveDispatchScheduler {
@@ -40,20 +35,17 @@
private final CommonService commonService;
private final BasCrnpService basCrnpService;
private final CrnOperateProcessUtils crnOperateProcessUtils;
- private final RedisUtil redisUtil;
public InboundCrnMoveDispatchScheduler(WrkMastService wrkMastService,
BasStationService basStationService,
CommonService commonService,
BasCrnpService basCrnpService,
- CrnOperateProcessUtils crnOperateProcessUtils,
- RedisUtil redisUtil) {
+ CrnOperateProcessUtils crnOperateProcessUtils) {
this.wrkMastService = wrkMastService;
this.basStationService = basStationService;
this.commonService = commonService;
this.basCrnpService = basCrnpService;
this.crnOperateProcessUtils = crnOperateProcessUtils;
- this.redisUtil = redisUtil;
}
@Scheduled(fixedDelay = 1000L)
@@ -113,7 +105,7 @@
// 鍚屽爢鍨涙満娌℃湁闇�瑕佸弬涓庡綋鍓嶈皟搴﹀垽鏂殑鍑哄簱浠诲姟鏃讹紝浼樺厛鐩存帴鍒板綋鍓嶅叆搴撲换鍔″彇璐т綅绛夊緟銆�
if (!hasBlockingOutboundTask(crnNo)) {
- boolean dispatched = crnOperateProcessUtils.dispatchCrnMove(crnNo, inboundPickupLocNo);
+ boolean dispatched = crnOperateProcessUtils.dispatchCrnMove(crnNo, inboundPickupLocNo, true);
if (dispatched) {
News.info("妫�娴嬪埌浠呮湁鍏ュ簱浠诲姟锛屽凡瑙﹀彂鍫嗗灈鏈虹洿鎺ョЩ鍔ㄥ埌鍏ュ簱浠诲姟鍙栬揣浣嶇瓑寰咃紝宸ヤ綔鍙�={}锛屽爢鍨涙満鍙�={}锛屽彇璐т綅={}",
wrkMast.getWrkNo(), crnNo, inboundPickupLocNo);
@@ -165,9 +157,9 @@
}
return pendingOutboundTasks.stream()
- .filter(this::isBatchTaskWithSeq)
- .filter(task -> isWithinCurrentBatchExecuteWindow(task, pendingOutboundTasks))
.filter(this::isCrnMoveBlockingOutboundTask)
+ .filter(this::isBatchTaskWithSeq)
+ .filter(crnOperateProcessUtils::canOutboundTaskExecuteInCurrentBatchWindow)
.findAny()
.isPresent();
}
@@ -186,44 +178,5 @@
return Objects.equals(wrkMast.getWrkSts(), WrkStsType.NEW_OUTBOUND.sts)
|| Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_RUN.sts)
|| Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_MANUAL.sts);
- }
-
- private boolean isWithinCurrentBatchExecuteWindow(WrkMast wrkMast, List<WrkMast> pendingOutboundTasks) {
- if (!isBatchTaskWithSeq(wrkMast) || pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
- return false;
- }
- int batchRunningLimit = getSystemConfigInt("crnOutBatchRunningLimit", 5);
- if (batchRunningLimit <= 0) {
- return true;
- }
- List<WrkMast> sameBatchTasks = pendingOutboundTasks.stream()
- .filter(this::isBatchTaskWithSeq)
- .filter(task -> Objects.equals(task.getBatch(), wrkMast.getBatch()))
- .sorted(Comparator.comparing(WrkMast::getBatchSeq).thenComparing(WrkMast::getWrkNo))
- .collect(Collectors.toList());
- if (sameBatchTasks.isEmpty()) {
- return false;
- }
- int windowSize = Math.min(batchRunningLimit, sameBatchTasks.size());
- for (int i = 0; i < windowSize; i++) {
- WrkMast current = sameBatchTasks.get(i);
- if (current != null && Objects.equals(current.getWrkNo(), wrkMast.getWrkNo())) {
- return true;
- }
- }
- return false;
- }
-
- private int getSystemConfigInt(String code, int defaultValue) {
- Object systemConfigMapObj = redisUtil == null ? null : redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
- if (!(systemConfigMapObj instanceof HashMap)) {
- return defaultValue;
- }
- try {
- HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
- return Integer.parseInt(systemConfigMap.getOrDefault(code, String.valueOf(defaultValue)));
- } catch (Exception ignore) {
- return defaultValue;
- }
}
}
--
Gitblit v1.9.1