From 1809dba25f489ea01c07a9ecc977d9f408545310 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 05 一月 2026 09:41:49 +0800
Subject: [PATCH] 电压改电量

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java          |    4 ++--
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index 4b285d7..4ee2c04 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -96,7 +96,7 @@
         for (Agv agv : agvList) {
             AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
             AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
-            if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
+            if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
                 continue;
             }
             // low battery status, that need to go to charge
@@ -105,7 +105,7 @@
 //            }
             // is charging ?
             if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
-                if (agvDetail.getVol() < agvModel.getQuaBattery()) {
+                if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
                     continue;
                 }
             }
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 e432eec..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,9 +73,9 @@
             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());
         }
     }
 

--
Gitblit v1.9.1