From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index a3b29bf..9fbfdbe 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -223,6 +223,11 @@
return false;
}
+ if (shuttleProtocol.getCurrentLocNo().equals(locNo)) {
+ News.info("{}鍙峰皬杞︼紝绉诲姩鐩爣浣嶇疆涓庡皬杞﹀綋鍓嶄綅缃竴鑷存棤娉曠Щ鍔�", shuttleNo);
+ return false;
+ }
+
//鍒ゆ柇绌挎杞︽槸鍚﹀瓨鍦ㄦ湭瀹屾垚鐨勫皬杞︾Щ搴撲换鍔�
WrkMast hasMoveWorking = wrkMastService.selectShuttleHasMoveWorking(shuttleNo);
if (hasMoveWorking != null) {//灏忚溅瀛樺湪绉诲簱浠诲姟锛岀瓑寰呮墽琛屽畬鎴愬悗鍐嶇敓鎴愭柊鐨勪换鍔�
--
Gitblit v1.9.1