From 9569af2a6abcccc3f312abff0a7e660c0f2be2c8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 十二月 2025 17:23:19 +0800
Subject: [PATCH] 电压改电量

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 8927b6d..4b285d7 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)) {
@@ -81,7 +81,7 @@
                     continue;
                 }
 
-                mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
+                mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_CHARGE, null, null);
             }
         }
     }
@@ -100,9 +100,9 @@
                 continue;
             }
             // low battery status, that need to go to charge
-            if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
-                continue;
-            }
+//            if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
+//                continue;
+//            }
             // is charging ?
             if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                 if (agvDetail.getVol() < agvModel.getQuaBattery()) {
@@ -144,7 +144,7 @@
                 }
 //            }
 
-            mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_STANDBY, null, null);
+            mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_STANDBY, null, null);
         }
     }
 

--
Gitblit v1.9.1