From 7c5ef2e79211e1554eaa506ba7a34eada83fc7b8 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 25 三月 2025 21:02:40 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/common/service/AgvCommonService.java | 2 +- src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 2 +- 2 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..c2623c1 100644 --- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java +++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java @@ -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; } diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java index 1762837..aba0aae 100644 --- a/src/main/java/com/zy/common/service/AgvCommonService.java +++ b/src/main/java/com/zy/common/service/AgvCommonService.java @@ -255,7 +255,7 @@ try { EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>(); wrapper.eq("loc_sts", "O").eq("loc_type1", type); - wrapper.eq("floor", floor).eq("lev1", lev1); + wrapper.eq("floor", floor).eq("lev1", lev1).orderBy("bay1", false); List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper); for (AgvLocMast agvLocMast : agvLocMasts) { AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo())); -- Gitblit v1.9.1