From 21c9d5267c4ca9a7815e47641dd60a04b9643bae Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 三月 2026 15:11:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index fca1f0d..a7c3712 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -753,11 +753,7 @@
if (!Objects.equals(dispatchStationId, wrkMast.getStaNo())
&& isCurrentOutOrderStation(currentStationId, outOrderStationIds)
&& isWatchingCircleArrival(wrkMast.getWrkNo(), currentStationId)) {
- Integer circleTarget = resolveNextCircleOrderTarget(currentStationId, outOrderStationIds);
- if (circleTarget == null) {
- return null;
- }
- return new OutOrderDispatchDecision(circleTarget, true);
+ return new OutOrderDispatchDecision(dispatchStationId, true);
}
return new OutOrderDispatchDecision(dispatchStationId, false);
}
@@ -802,8 +798,7 @@
if (seq == null) {
toTarget = currentBatchSeq.equals(wrkMast.getBatchSeq());
} else {
- toTarget = Integer.valueOf(seq + 1).equals(wrkMast.getBatchSeq())
- && currentBatchSeq.equals(wrkMast.getBatchSeq());
+ toTarget = Integer.valueOf(seq + 1).equals(wrkMast.getBatchSeq());
}
if (toTarget) {
if (hasReachableOutReleaseSlot(currentStationId, wrkMast.getStaNo())) {
--
Gitblit v1.9.1