From ff9ff27ce3da6f911576152a0d41e8830041f0a0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 21 五月 2025 10:12:14 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/common/service/AgvCommonService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 0f60a40..e360c91 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -313,7 +313,7 @@
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
if (lev1 == 2) {
int num = 20;
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_3_NUM"));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_3_NUM2"));
if (config != null && !Cools.isEmpty(config.getValue())) {
num = Integer.parseInt(config.getValue());
}
@@ -323,7 +323,7 @@
}
} else if (lev1 == 1) {
int num = 8;
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_3_NUM2"));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_3_NUM"));
if (config != null && !Cools.isEmpty(config.getValue())) {
num = Integer.parseInt(config.getValue());
}
@@ -353,14 +353,15 @@
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_sts", "O").eq("loc_type1", type);
wrapper.eq("floor", floor).eq("lev1", lev1).orderBy("bay1", true);
-
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
+
for (AgvLocMast agvLocMast : agvLocMasts) {
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
if (agvLocMast1.getLocSts().equals("O")) {
return agvLocMast1;
}
}
+
return null;
} catch (Exception e) {
throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
--
Gitblit v1.9.1