From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 9f155e7..97ca4cd 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
@@ -206,7 +206,7 @@
log.warn("[{}]鍙稟gv鏈敹鍒扮姸鎬佸寘......", agvNo);
return false;
}
- if (agvDetail.getVol() == 0) {
+ if (null == agvDetail.getSoc() || agvDetail.getSoc() == 0) {
return false;
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.IDLE) && !agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -214,7 +214,7 @@
return false;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() < agvModel.getQuaBattery()) {
+ if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
return false;
}
}
@@ -266,11 +266,14 @@
}
@Override
- public Integer getBackpack(Agv agv) {
+ public Integer getBackpack(Long agvId) {
+ if (null == agvId) {
+ return 0;
+ }
// if (null != agv.getStage()) {
// return agv.getStage();
// }
- AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
+ AgvModel agvModel = agvModelService.getByAgvId(agvId);
assert null != agvModel;
return agvModel.getBackpack();
}
--
Gitblit v1.9.1