From 583b31d46bb8abbee7410d29ca229120ee589cba Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 10:10:08 +0800
Subject: [PATCH] # version merge

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 d5b5c73..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
@@ -54,7 +54,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()) {
+            if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus()) {
                 continue;
             }
             if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -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;
                 }
             }

--
Gitblit v1.9.1