From 348e9361bef99747ab6d6f7d0086a3639219c170 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 03 四月 2026 14:55:33 +0800
Subject: [PATCH] #预调度优化

---
 src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index c13f31e..ab059c4 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -63,6 +63,7 @@
 
             WrkMast inboundWrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>()
                     .eq("io_type", WrkIoType.IN.id)
+                    .eq("crn_no", crnNo)
                     .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
                     .last("limit 1"));
             if (inboundWrkMast == null) {
@@ -71,9 +72,7 @@
 
             StationProtocol targetStationProtocol = resolveTargetStationProtocol(inboundWrkMast.getStaNo());
             if (targetStationProtocol != null
-                    && targetStationProtocol.isLoading()
-                    && targetStationProtocol.getTaskNo() > 0
-                    && targetStationProtocol.isInEnable()) {
+                    && targetStationProtocol.getTaskNo() > 0) {
                 continue;
             }
 
@@ -134,10 +133,7 @@
                 .in("wrk_sts",
                         WrkStsType.NEW_OUTBOUND.sts,
                         WrkStsType.OUTBOUND_RUN.sts,
-                        WrkStsType.OUTBOUND_RUN_COMPLETE.sts,
-                        WrkStsType.STATION_RUN.sts,
-                        WrkStsType.STATION_RUN_COMPLETE.sts,
-                        WrkStsType.OUTBOUND_MANUAL.sts)
+                        WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
                 .orderByAsc("wrk_no"));
         if (pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
             return false;

--
Gitblit v1.9.1