From 1786865cb0dd37da602852b97ab0b80da025f353 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 17 十一月 2025 13:19:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..b50f86f 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -170,8 +170,14 @@
int currentLev = Utils.getLev(currentLocNo);
//鍒ゆ柇褰撳墠妤煎眰鏄惁鏈変换鍔★紝濡傛灉鏈夊垯涓嶅垎閰嶈繖杈嗚溅
List<WrkMast> wrkMasts1 = wrkMastService.selectWrkByLev(currentLev);
- int shuttleCount = this.getShuttleEnableUseCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
- if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
+ int currentLevTaskCount = wrkMasts1.size();
+ for (WrkMast wrkMast : wrkMasts1) {
+ if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
+ currentLevTaskCount--;
+ }
+ }
+ int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
+ if (currentLevTaskCount > 0 && shuttleCount <= 1) {
//瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
continue;
}
@@ -220,6 +226,11 @@
//灏忚溅澶勪簬绌洪棽鐘舵��
if (!shuttleThread.isIdle()) {
News.info("{}鍙峰皬杞︼紝蹇欑涓�", shuttleNo);
+ return false;
+ }
+
+ if (shuttleProtocol.getCurrentLocNo().equals(locNo)) {
+ News.info("{}鍙峰皬杞︼紝绉诲姩鐩爣浣嶇疆涓庡皬杞﹀綋鍓嶄綅缃竴鑷存棤娉曠Щ鍔�", shuttleNo);
return false;
}
@@ -401,6 +412,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