From 2c8cf379841db2aa268abd4a9c682d9a585786ea Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 三月 2026 00:36:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index ec8a453..a6d9ca1 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -562,6 +562,10 @@
continue;
}
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
+ continue;
+ }
+
StationCommand command = stationThread.getRunBlockRerouteCommand(
wrkMast.getWrkNo(),
stationProtocol.getStationId(),
@@ -577,6 +581,7 @@
continue;
}
+ resetSegmentMoveCommandsBeforeReroute(wrkMast.getWrkNo());
offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "checkStationRunBlock_reroute");
syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderStationIds, dispatchDecision, command);
News.info("杈撻�佺珯鐐瑰牭濉炲悗閲嶆柊璁＄畻璺緞鍛戒护涓嬪彂鎴愬姛锛岀珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
@@ -677,6 +682,10 @@
continue;
}
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
+ continue;
+ }
+
if (isWatchingCircleArrival(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
@@ -707,6 +716,7 @@
if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
+ resetSegmentMoveCommandsBeforeReroute(wrkMast.getWrkNo());
syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderStationIds, dispatchDecision, command);
offerDevpCommandWithDedup(stationObjModel.getDeviceNo(), command, "checkStationOutOrder");
News.info(dispatchDecision.isCircle() ? "{}浠诲姟杩涜缁曞湀" : "{}浠诲姟鐩存帴鍘荤洰鏍囩偣", wrkMast.getWrkNo());
@@ -783,6 +793,7 @@
if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
+ resetSegmentMoveCommandsBeforeReroute(wrkMast.getWrkNo());
syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderList, dispatchDecision, command);
offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "watchCircleStation");
}
--
Gitblit v1.9.1