From cf9211f711be85c8e0c1c739d01c8694d2cf5c51 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 13 四月 2026 16:23:04 +0800
Subject: [PATCH] 屏蔽预调度任务

---
 src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 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..06b3fb8 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -44,7 +44,7 @@
         this.crnOperateProcessUtils = crnOperateProcessUtils;
     }
 
-    @Scheduled(fixedDelay = 1000L)
+//    @Scheduled(fixedDelay = 1000L)
     public void dispatchInboundCrnMove() {
         List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>()
                 .orderByAsc("crn_no"));
@@ -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