From 500f6ce071c0bc14d6720354ce148599ac3f35ee Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 十月 2024 15:38:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java
index 5ab9c71..cc5973b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java
@@ -59,8 +59,7 @@
}
// 2. in idle status
- final Agv finalAgv = agv;
- if (!agvService.judgeEnable(finalAgv.getId(), agvDetail -> agvDetail.getVol() > finalAgv.getChargeLine())) {
+ if (!agvService.judgeEnable(agv.getId(), true)) {
continue;
}
@@ -75,6 +74,7 @@
if (Cools.isEmpty(availableAgvList)) {
return null;
}
+
return null;
}
@@ -110,9 +110,8 @@
log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝宸茬粡瀛樺湪杩涜涓殑浠诲姟...");
continue;
}
- final Agv finalAgv = agv;
- if (!agvService.judgeEnable(finalAgv.getId(), agvDetail -> agvDetail.getVol() > finalAgv.getChargeLine())) {
- log.info(finalAgv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
+ if (!agvService.judgeEnable(agv.getId(), true)) {
+ log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
continue;
}
@@ -157,9 +156,8 @@
log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝宸茬粡瀛樺湪杩涜涓殑浠诲姟...");
return null;
}
- final Agv finalAgv = agv;
- if (!agvService.judgeEnable(finalAgv.getId(), agvDetail -> agvDetail.getVol() > finalAgv.getChargeLine())) {
- log.info(finalAgv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
+ if (!agvService.judgeEnable(agv.getId(), true)) {
+ log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
return null;
}
--
Gitblit v1.9.1