From a4948137774a499da38fe184a6bbd0c57336e6f6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十一月 2024 09:48:07 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index 844be39..4f66dce 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -113,11 +113,7 @@
}
// with battery
if (withBattery) {
- if (agvDetail.getVol() < agv.getChargeLine()) {
- log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
- return false;
- }
- if (agvDetail.getVol() < agvModel.getLowBattery()) {
+ if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
return false;
}
@@ -169,6 +165,9 @@
if (null == agvDetail) {
continue;
}
+ if (null == agvDetail.getRecentCode()) {
+ continue;
+ }
if (agvDetail.getRecentCode().equals(codeId)) {
return agv;
}
--
Gitblit v1.9.1