From b1dd4c6e284244bd7224e2c050a9670fbd9a38ea Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 16:21:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 dce8c0c..c8de9a4 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
@@ -73,20 +73,23 @@
agvModel = agvModelService.getByAgvId(agv.getId());
}
if (null == agv.getChargeLine()) {
- return agvDetail.getVol() < agvModel.getLowBattery();
+ return agvDetail.getSoc() < agvModel.getLowBattery();
} else {
- return agvDetail.getVol() < Math.max(agv.getChargeLine(), agvModel.getLowBattery());
+ return agvDetail.getSoc() < Math.max(agv.getChargeLine(), agvModel.getLowBattery());
}
}
@Override
public Code getCurrentCode(Long agvId) {
AgvDetail agvDetail = this.selectMajorByAgvId(agvId);
+ if (null == agvDetail) {
+ return null;
+ }
Long recentCode = agvDetail.getRecentCode();
if (null == recentCode) {
return null;
}
- return codeService.getById(recentCode);
+ return codeService.getCacheById(recentCode);
}
}
--
Gitblit v1.9.1