From 8b8a2086509e28bb902166aa35e4c287eb906621 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 六月 2025 15:28:39 +0800
Subject: [PATCH] #禁止跨层

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java |   12 ++++++------
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java      |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 3a18e78..66eacea 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -951,12 +951,12 @@
             }
 
             //鎼滅储鍏朵粬妤煎眰鍏呯數妗�
-            List<ShuttleChargeSta> list2 = shuttleChargeStaService.list(new LambdaQueryWrapper<ShuttleChargeSta>()
-                    .notIn(ShuttleChargeSta::getDeviceLev, lev)
-                    .eq(ShuttleChargeSta::getStatus, 1));
-            if (!list2.isEmpty()) {
-                allChargeLoc.addAll(list2);
-            }
+//            List<ShuttleChargeSta> list2 = shuttleChargeStaService.list(new LambdaQueryWrapper<ShuttleChargeSta>()
+//                    .notIn(ShuttleChargeSta::getDeviceLev, lev)
+//                    .eq(ShuttleChargeSta::getStatus, 1));
+//            if (!list2.isEmpty()) {
+//                allChargeLoc.addAll(list2);
+//            }
 
             //娌℃湁鎵惧埌鍏呯數妗�
             if (allChargeLoc.isEmpty()) {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index b38f998..95068a4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -97,9 +97,9 @@
         resThread = this.searchCurrentLevShuttle(currentLevDevices, locNo);
 
         //鍚屽眰娌℃湁鎼滅储鍒板悎閫傚皬杞︼紝璺ㄦゼ灞傛悳绱�
-        if(resThread == null) {
-            resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
-        }
+//        if(resThread == null) {
+//            resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
+//        }
 
         return resThread;
     }

--
Gitblit v1.9.1