From d9b78fe9683a6d7c22a3ca511dd9b3212922fe54 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 19:35:39 +0800
Subject: [PATCH] #预调度堆垛机2
---
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java | 11 +++--------
1 files changed, 3 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..331a8f3 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;
}
@@ -133,11 +132,7 @@
.eq("io_type", WrkIoType.OUT.id)
.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.sts)
.orderByAsc("wrk_no"));
if (pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
return false;
--
Gitblit v1.9.1