From 7c8b32a58dd812d1400b21cddbf0ea36832a6d0d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 三月 2026 11:21:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 0fc3e15..4821a41 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -466,6 +466,17 @@
if (wrkMast.getIoType() == WrkIoType.IN.id && runBlockReassignLocStationList.contains(stationProtocol.getStationId())) {
//绔欑偣澶勪簬閲嶆柊鍒嗛厤搴撲綅鍖哄煙
+ int currentTaskBufferCommandCount = countCurrentTaskBufferCommands(
+ stationProtocol.getTaskBufferItems(),
+ stationProtocol.getTaskNo()
+ );
+ if (currentTaskBufferCommandCount > 0) {
+ News.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸鍒嗛厤宸茶烦杩囷紝缂撳瓨鍖轰粛瀛樺湪褰撳墠浠诲姟鍛戒护銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽綋鍓嶄换鍔″懡浠ゆ暟={}",
+ stationProtocol.getStationId(),
+ stationProtocol.getTaskNo(),
+ currentTaskBufferCommandCount);
+ continue;
+ }
//杩愯鍫靛锛岄噸鏂扮敵璇蜂换鍔�
String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo(), stationProtocol.getStationId());
if (Cools.isEmpty(response)) {
@@ -559,6 +570,10 @@
);
Integer moveStaNo = dispatchDecision == null ? null : dispatchDecision.getTargetStationId();
if (moveStaNo == null || Objects.equals(moveStaNo, stationProtocol.getStationId())) {
+ continue;
+ }
+
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
continue;
}
@@ -678,6 +693,10 @@
continue;
}
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
+ continue;
+ }
+
if (isWatchingCircleArrival(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
@@ -758,6 +777,9 @@
if (Objects.equals(stationProtocol.getStationId(), wrkMast.getStaNo())) {
continue;
}
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
+ continue;
+ }
Double pathLenFactor = resolveOutboundPathLenFactor(wrkMast);
OutOrderDispatchDecision dispatchDecision = resolveOutboundDispatchDecision(
--
Gitblit v1.9.1