From 98e6dd8f3597a36512699151a7f74b6cf733268f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 19 九月 2025 14:06:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 10 ++++++++++
1 files changed, 10 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 18ec992..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) {//灏忚溅瀛樺湪绉诲簱浠诲姟锛岀瓑寰呮墽琛屽畬鎴愬悗鍐嶇敓鎴愭柊鐨勪换鍔�
@@ -401,6 +406,11 @@
//鍒ゆ柇鏄惁鏈夊厖鐢典换鍔℃鍦ㄤ娇鐢ㄧ┛姊溅
WrkMast wrkMast = wrkMastService.selectChargeWorking(shuttleNo);
if (wrkMast != null) {
+ if (wrkMast.getMemo().equals("suggestCharge")) {
+ wrkMast.setMemo("suggestChargeTaskStop");//鏂紑鍏呯數
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }
return true;//鏈夊厖鐢典换鍔�
}
return false;//鏃犲厖鐢典换鍔�
--
Gitblit v1.9.1