From cc5b5daacf92ac5601370c50463237b34b7ba78f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 18:57:54 +0800
Subject: [PATCH] #预调度堆垛机2
---
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java | 96 +++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index f4eb982..fcb9863 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -18,17 +18,18 @@
import com.zy.core.enums.WrkStsType;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.protocol.StationProtocol;
-import com.zy.core.move.StationMoveCoordinator;
-import com.zy.core.move.StationMoveSession;
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.Set;
import java.util.stream.Collectors;
@Component
@@ -39,20 +40,20 @@
private final CommonService commonService;
private final BasCrnpService basCrnpService;
private final CrnOperateProcessUtils crnOperateProcessUtils;
- private final StationMoveCoordinator stationMoveCoordinator;
+ private final RedisUtil redisUtil;
public InboundCrnMoveDispatchScheduler(WrkMastService wrkMastService,
BasStationService basStationService,
CommonService commonService,
BasCrnpService basCrnpService,
CrnOperateProcessUtils crnOperateProcessUtils,
- StationMoveCoordinator stationMoveCoordinator) {
+ RedisUtil redisUtil) {
this.wrkMastService = wrkMastService;
this.basStationService = basStationService;
this.commonService = commonService;
this.basCrnpService = basCrnpService;
this.crnOperateProcessUtils = crnOperateProcessUtils;
- this.stationMoveCoordinator = stationMoveCoordinator;
+ this.redisUtil = redisUtil;
}
@Scheduled(fixedDelay = 1000L)
@@ -117,18 +118,8 @@
News.info("妫�娴嬪埌浠呮湁鍏ュ簱浠诲姟锛屽凡瑙﹀彂鍫嗗灈鏈虹洿鎺ョЩ鍔ㄥ埌鍏ュ簱浠诲姟鍙栬揣浣嶇瓑寰咃紝宸ヤ綔鍙�={}锛屽爢鍨涙満鍙�={}锛屽彇璐т綅={}",
wrkMast.getWrkNo(), crnNo, inboundPickupLocNo);
}
- return;
- }
-
- StationMoveSession session = stationMoveCoordinator == null ? null : stationMoveCoordinator.loadSession(wrkMast.getWrkNo());
- if (!isInboundCrnMoveDispatchWindow(wrkMast, session)) {
- return;
- }
-
- boolean dispatched = crnOperateProcessUtils.dispatchCrnMove(crnNo, inboundPickupLocNo);
- if (dispatched) {
- News.info("鍏ュ簱浠诲姟鍗冲皢鍒拌揪鍙栬揣浣嶏紝宸茶Е鍙戝爢鍨涙満棰勭Щ杞︼紝宸ヤ綔鍙�={}锛屽爢鍨涙満鍙�={}锛屽彇璐т綅={}",
- wrkMast.getWrkNo(), crnNo, inboundPickupLocNo);
+ } else {
+ News.taskInfo(wrkMast.getWrkNo(), "褰撳墠瀛樺湪闃诲鍏ュ簱棰勭Щ杞︾殑鍑哄簱浠诲姟锛屾殏涓嶈Е鍙戝爢鍨涙満棰勭Щ杞�");
}
}
@@ -173,31 +164,12 @@
return true;
}
- String activeBatch = resolveActiveOutboundBatch(pendingOutboundTasks);
- if (Cools.isEmpty(activeBatch)) {
- return true;
- }
-
return pendingOutboundTasks.stream()
.filter(this::isBatchTaskWithSeq)
+ .filter(task -> isWithinCurrentBatchExecuteWindow(task, pendingOutboundTasks))
.filter(this::isCrnMoveBlockingOutboundTask)
- .anyMatch(task -> Objects.equals(activeBatch, task.getBatch()));
- }
-
- private String resolveActiveOutboundBatch(List<WrkMast> pendingOutboundTasks) {
- if (pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
- return null;
- }
- Set<String> activeBatchSet = pendingOutboundTasks.stream()
- .filter(this::isBatchTaskWithSeq)
- .filter(task -> !Objects.equals(task.getWrkSts(), WrkStsType.NEW_OUTBOUND.sts))
- .map(WrkMast::getBatch)
- .filter(batch -> !Cools.isEmpty(batch))
- .collect(Collectors.toSet());
- if (activeBatchSet.size() != 1) {
- return null;
- }
- return activeBatchSet.iterator().next();
+ .findAny()
+ .isPresent();
}
private boolean isBatchTaskWithSeq(WrkMast wrkMast) {
@@ -216,24 +188,42 @@
|| Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_MANUAL.sts);
}
- private boolean isInboundCrnMoveDispatchWindow(WrkMast wrkMast, StationMoveSession session) {
- if (wrkMast == null || session == null || !session.isActive() || wrkMast.getStaNo() == null) {
+ private boolean isWithinCurrentBatchExecuteWindow(WrkMast wrkMast, List<WrkMast> pendingOutboundTasks) {
+ if (!isBatchTaskWithSeq(wrkMast) || pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
return false;
}
- List<Integer> fullPathStationIds = session.getFullPathStationIds();
- Integer currentStationId = session.getCurrentStationId();
- if (fullPathStationIds == null || fullPathStationIds.isEmpty() || currentStationId == null) {
+ 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 currentIndex = fullPathStationIds.lastIndexOf(currentStationId);
- if (currentIndex < 0 || currentIndex >= fullPathStationIds.size() - 1) {
- 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;
+ }
}
- int remainingStationCount = fullPathStationIds.size() - currentIndex - 1;
- if (remainingStationCount != 1) {
- return false;
+ 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;
}
- Integer nextStationId = fullPathStationIds.get(currentIndex + 1);
- return Objects.equals(nextStationId, wrkMast.getStaNo());
+ 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