From d42a74a62f8bd2ad2760647e73cd6313bbcb10ed Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 18 十月 2023 08:58:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index b9ed6ba..603d742 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -137,7 +137,8 @@
WrkMast wrkMast1 = wrkMastMapper.selectByWorkNo(wrkNo);
if (wrkMast1 != null) {
- int lev = Utils.getLev(wrkMast1.getLocNo());//鐩爣妤煎眰
+ String locNO=wrkMast1.getIoType()<100?wrkMast1.getLocNo():wrkMast1.getSourceLocNo();
+ int lev = Utils.getLev(locNO);//鐩爣妤煎眰
//妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
@@ -318,6 +319,25 @@
}
}
+ //鎼滅储鏄惁瀛樺湪鍓嶅線鐩爣妤煎眰鐨勫皬杞︾Щ鍔ㄥ伐浣滄。
+ for (WrkMast wrkMast : wrkMastMapper.selectShuttleMoveWrk()) {
+ if (wrkMast.getSourceLocNo() == null || wrkMast.getLocNo() == null) {
+ continue;
+ }
+
+ int sourceLev = Utils.getLev(wrkMast.getSourceLocNo());//宸ヤ綔妗ｆ簮妤煎眰
+ int targetLev = Utils.getLev(wrkMast.getLocNo());//宸ヤ綔妗ｇ洰鏍囨ゼ灞�
+ if (sourceLev == lev) {
+ continue;//宸ヤ綔妗ｆゼ灞傚拰鐩爣妤煎眰鐩稿悓锛岃烦杩�
+ }
+
+ if (targetLev == lev) {
+ levCount++;//宸ヤ綔妗ｇ洰鏍囨ゼ灞傚拰瀹為檯妤煎眰鐩稿悓锛屾暟閲忓鍔�
+ continue;
+ }
+ }
+
+
return levCount < Integer.parseInt(config.getValue());
}
--
Gitblit v1.9.1