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/manager/service/impl/AgvServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 72fe8ab..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;
             }
         }

--
Gitblit v1.9.1