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 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index bd7b479..f4eb982 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -180,6 +180,7 @@
 
         return pendingOutboundTasks.stream()
                 .filter(this::isBatchTaskWithSeq)
+                .filter(this::isCrnMoveBlockingOutboundTask)
                 .anyMatch(task -> Objects.equals(activeBatch, task.getBatch()));
     }
 
@@ -206,6 +207,15 @@
                 && 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) {
         if (wrkMast == null || session == null || !session.isActive() || wrkMast.getStaNo() == null) {
             return false;

--
Gitblit v1.9.1