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 | 10 ++++++++--
1 files changed, 8 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 9fbfdbe..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;
}
--
Gitblit v1.9.1