From 029b996ab6f5d8bf9c4ef5f97db635984fc59858 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 05 三月 2025 18:34:36 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/common/service/AgvCommonService.java | 15 ++++++++++++---
1 files changed, 12 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 a24d141..7fc5a4e 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -178,14 +178,23 @@
num = Integer.parseInt(config.getValue());
}
agvLocMasts = agvLocMastService.selectList(wrapper);
+ int er = 0;
for (AgvLocMast agvLocMast : agvLocMasts) {
-
+ if (agvLocMast.getLev1() == 2) {
+ er++;
+ }
}
-
for (AgvLocMast agvLocMast : agvLocMasts) {
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
if (agvLocMast1.getLocSts().equals("O")) {
- return agvLocMast1;
+ if (agvLocMast1.getLev1() == 2) {
+ if (er > num) {
+ return agvLocMast1;
+ }
+ } else {
+ return agvLocMast1;
+ }
+
}
}
throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
--
Gitblit v1.9.1