From 909164aa1859fdf25330eb130bc90b8bd22e540b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 三月 2026 12:00:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 12 ++++++++++++
1 files changed, 12 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 4821a41..ea10e5d 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -696,6 +696,9 @@
if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
continue;
}
+ if (isWatchingCircleTransit(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
+ continue;
+ }
if (isWatchingCircleArrival(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
@@ -1284,6 +1287,15 @@
return command != null && stationId != null && stationId.equals(command.getTargetStaNo());
}
+ private boolean isWatchingCircleTransit(Integer wrkNo, Integer stationId) {
+ StationCommand command = getWatchCircleCommand(wrkNo);
+ if (command == null || stationId == null || Objects.equals(stationId, command.getTargetStaNo())) {
+ return false;
+ }
+ List<Integer> navigatePath = command.getNavigatePath();
+ return navigatePath != null && navigatePath.contains(stationId);
+ }
+
private StationCommand getWatchCircleCommand(Integer wrkNo) {
if (wrkNo == null || wrkNo <= 0) {
return null;
--
Gitblit v1.9.1