From bdfe4b740175f29858c870d710ec6ff5d4dc6ef0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 17 四月 2025 21:18:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/utils/LocUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/LocUtils.java b/src/main/java/com/zy/asrs/utils/LocUtils.java
index 87db780..76d8425 100644
--- a/src/main/java/com/zy/asrs/utils/LocUtils.java
+++ b/src/main/java/com/zy/asrs/utils/LocUtils.java
@@ -60,14 +60,14 @@
* @param floor
* @return
*/
- public AgvLocMast getLocNoRuleByFloor(int type, Integer floor) {
+ public AgvLocMast getLocNoRuleByFloor6(int type, Integer floor) {
try {
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_sts", "O").eq("loc_type1", type);
if (floor == 4) {
- wrapper.orderBy("lev1", false);
+ wrapper.eq("floor", 1).eq("lev1", 2).orderBy("bay1", false);
} else {
- wrapper.orderBy("lev1", true);
+ wrapper.orderBy("floor", false).orderBy("lev1", true);
}
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
--
Gitblit v1.9.1