From 10f91cf8cc7f5ebe1cb4d9f06bd9cf4693277dc6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 十一月 2024 09:17:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java
index 279d972..96fdae3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java
@@ -54,7 +54,11 @@
if (null == agvModel) {
agvModel = agvModelService.getById(agv.getAgvModel());
}
- return agvDetail.getVol() < agv.getChargeLine() || agvDetail.getVol() < agvModel.getLowBattery();
+ if (null == agv.getChargeLine()) {
+ return agvDetail.getVol() < agvModel.getLowBattery();
+ } else {
+ return agvDetail.getVol() < Math.max(agv.getChargeLine(), agvModel.getLowBattery());
+ }
}
}
--
Gitblit v1.9.1