From 710deccd42576ad2dcbdc22e75f18b455d5ce2ff Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期一, 14 四月 2025 18:04:00 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java index a52bde3..9b14b9f 100644 --- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java +++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java @@ -210,7 +210,7 @@ /** * 璋冨害杞﹁締 */ - public boolean searchDispatchShuttleIn(Integer wrkNo, String sourceLocNo, String locNo, String flag, boolean in) { + public boolean searchDispatchShuttleS(Integer wrkNo, String sourceLocNo, String locNo, String flag) { ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅 ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅 @@ -251,23 +251,13 @@ } break; } -// if (in) { - if (currentLev == Utils.getLev(sourceLocNo)) { - //宸ヤ綔妗fゼ灞傜浉鍚岀殑绌挎杞� - sameLev.add(shuttleThread); - } else { - //宸ヤ綔妗d笉鍚屾ゼ灞傜殑绌挎杞� - diffLev.add(shuttleThread); - } -// } else { -// if (currentLev == Utils.getLev(locNo)) { -// //宸ヤ綔妗fゼ灞傜浉鍚岀殑绌挎杞� -// sameLev.add(shuttleThread); -// } else { -// //宸ヤ綔妗d笉鍚屾ゼ灞傜殑绌挎杞� -// diffLev.add(shuttleThread); -// } -// } + if (currentLev == Utils.getLev(sourceLocNo)) { + //宸ヤ綔妗fゼ灞傜浉鍚岀殑绌挎杞� + sameLev.add(shuttleThread); + } else { + //宸ヤ綔妗d笉鍚屾ゼ灞傜殑绌挎杞� + diffLev.add(shuttleThread); + } } -- Gitblit v1.9.1