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/common/service/AgvCommonService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 103b8b3..0f60a40 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -134,7 +134,7 @@
// } else {
// //涓嶅姩杩欎釜閫昏緫
if (type == 6) {
- locMast = locUtils.getLocNoRuleByFloor(type, floor);
+ locMast = locUtils.getLocNoRuleByFloor6(type, floor);
} else {
locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
}
@@ -352,7 +352,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", true);
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
--
Gitblit v1.9.1