From 9a8571484d907978247aa6ac62f7ef6c4b49072b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 18:44:12 +0800
Subject: [PATCH] #预调度堆垛机
---
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index f2e7139..f4eb982 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -28,6 +28,8 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
@Component
public class InboundCrnMoveDispatchScheduler {
@@ -108,8 +110,8 @@
return;
}
- // 鍚屽爢鍨涙満娌℃湁鏈畬鎴愬嚭搴撲换鍔℃椂锛屼紭鍏堢洿鎺ュ埌褰撳墠鍏ュ簱浠诲姟鍙栬揣浣嶇瓑寰呫��
- if (!hasPendingOutboundTask(crnNo)) {
+ // 鍚屽爢鍨涙満娌℃湁闇�瑕佸弬涓庡綋鍓嶈皟搴﹀垽鏂殑鍑哄簱浠诲姟鏃讹紝浼樺厛鐩存帴鍒板綋鍓嶅叆搴撲换鍔″彇璐т綅绛夊緟銆�
+ if (!hasBlockingOutboundTask(crnNo)) {
boolean dispatched = crnOperateProcessUtils.dispatchCrnMove(crnNo, inboundPickupLocNo);
if (dispatched) {
News.info("妫�娴嬪埌浠呮湁鍏ュ簱浠诲姟锛屽凡瑙﹀彂鍫嗗灈鏈虹洿鎺ョЩ鍔ㄥ埌鍏ュ簱浠诲姟鍙栬揣浣嶇瓑寰咃紝宸ヤ綔鍙�={}锛屽爢鍨涙満鍙�={}锛屽彇璐т綅={}",
@@ -146,11 +148,11 @@
return null;
}
- private boolean hasPendingOutboundTask(Integer crnNo) {
+ private boolean hasBlockingOutboundTask(Integer crnNo) {
if (crnNo == null) {
return false;
}
- return wrkMastService.count(new QueryWrapper<WrkMast>()
+ List<WrkMast> pendingOutboundTasks = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("io_type", WrkIoType.OUT.id)
.in("wrk_sts",
@@ -159,7 +161,59 @@
WrkStsType.OUTBOUND_RUN_COMPLETE.sts,
WrkStsType.STATION_RUN.sts,
WrkStsType.STATION_RUN_COMPLETE.sts,
- WrkStsType.OUTBOUND_MANUAL.sts)) > 0;
+ WrkStsType.OUTBOUND_MANUAL.sts)
+ .orderByAsc("wrk_no"));
+ if (pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
+ return false;
+ }
+
+ // 闈炴壒娆′换鍔℃垨缂哄皯鎵规搴忓彿鐨勪换鍔′粛鎸夊師閫昏緫澶勭悊锛岄伩鍏嶆斁瀹藉埌鏃犳硶纭鎵ц椤哄簭鐨勫嚭搴撲换鍔°��
+ boolean hasNonBatchTask = pendingOutboundTasks.stream().anyMatch(task -> !isBatchTaskWithSeq(task));
+ if (hasNonBatchTask) {
+ return true;
+ }
+
+ String activeBatch = resolveActiveOutboundBatch(pendingOutboundTasks);
+ if (Cools.isEmpty(activeBatch)) {
+ return true;
+ }
+
+ return pendingOutboundTasks.stream()
+ .filter(this::isBatchTaskWithSeq)
+ .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();
+ }
+
+ private boolean isBatchTaskWithSeq(WrkMast wrkMast) {
+ return wrkMast != null
+ && Objects.equals(wrkMast.getIoType(), WrkIoType.OUT.id)
+ && !Cools.isEmpty(wrkMast.getBatch())
+ && wrkMast.getBatchSeq() != null;
+ }
+
+ private boolean isCrnMoveBlockingOutboundTask(WrkMast wrkMast) {
+ if (wrkMast == null || wrkMast.getWrkSts() == null) {
+ return false;
+ }
+ 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 isInboundCrnMoveDispatchWindow(WrkMast wrkMast, StationMoveSession session) {
--
Gitblit v1.9.1