From 469d8ceb95ed82f09fd4c1bddbbe672689bc8d82 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 09 四月 2025 19:52:22 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 579a71d..e370d60 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -268,7 +268,7 @@
     private void autoEmptyBackSiqi() {
         Config config2 = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_EMPTY"));
         //鍏堝垽鏂┖搴撲綅鏁颁簡
-        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_type1", 3).eq("floor", 1).eq("lev1", 2).eq("loc_sts", "O"));
+        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_type1", 6).eq("floor", 1).eq("lev1", 2).eq("loc_sts", "O"));
         int size = 0;
         if (agvLocMasts != null) {
             size = agvLocMasts.size();
@@ -308,7 +308,7 @@
 
     private void executeLocType6() {
         // 鏌ヨ 浜屽巶鐨勭殑鍗婃垚鍝佺澹崇被鍨嬬殑绌鸿揣鏋�
-        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).eq("floor", 2));
+        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).eq("floor", 2).orderBy("bay1",false));
         if (agvLocMasts.isEmpty()) {
             return;
         }

--
Gitblit v1.9.1