From 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 21:30:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/utils/LocUtils.java | 17 ++++++++++++++---
1 files changed, 14 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..ab5fedf 100644
--- a/src/main/java/com/zy/asrs/utils/LocUtils.java
+++ b/src/main/java/com/zy/asrs/utils/LocUtils.java
@@ -19,6 +19,7 @@
/**
* 鏌ヨ搴撲綅
+ *
* @param type
* @param factory
* @return
@@ -56,21 +57,31 @@
/**
* 鏌ヨ搴撲綅
+ *
* @param type
* @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) {
+ if (floor == 2) {
+ if (agvLocMast.getFloor() == 3) {
+ continue;
+ }
+ } else if (floor == 3) {
+ if (agvLocMast.getFloor() == 2) {
+ continue;
+ }
+ }
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
if (agvLocMast1.getLocSts().equals("O")) {
return agvLocMast1;
--
Gitblit v1.9.1