From fdbbac3e711e6be54513cca6fa4ec3a17d293f49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 四月 2023 14:13:59 +0800
Subject: [PATCH] 四向穿梭车充电逻辑

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index ed473bd..43f7994 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -289,10 +289,10 @@
         if (!res) {
             return res;
         } else {
-            // 鐢甸噺
+            // 鐢甸噺灏忎簬闃堝�兼垨鐢靛帇灏忎簬48V锛岄渶瑕佽繘琛屽厖鐢�
             try {
                 Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
-                return this.getBatteryPower$() < chargeLine;
+                return this.getBatteryPower$() < chargeLine || this.currentVoltage < 480;
             } catch (Exception e) {
                 News.error("fail", e);
                 return false;

--
Gitblit v1.9.1