From 2c70de24f676af47132638a3aeaa69cc5b64a8c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 20 十月 2025 16:34:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index 1ac69f0..bf7a896 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -675,6 +675,10 @@
.eq("status", 1));
if (shuttleMaxPowerVerifyConfig != null) {
if (shuttleMaxPowerVerifyConfig.getValue().equals("true")) {
+ if (this.shuttleProtocol.getBatteryPower() == null) {
+ return false;
+ }
+
if (this.shuttleProtocol.getBatteryVoltage() < 5630) {
return false;//鐢靛帇涓嶅缁х画鍏呯數
}
@@ -953,6 +957,10 @@
List<NavigationMapType> restartCalcMapTypes = new ArrayList<>(mapTypes);
restartCalcMapTypes.add(NavigationMapType.SHUTTLE);
+ if (assignCommand.getTaskMode() == ShuttleTaskModeType.TRANSPORT.id) {
+ restartCalcMapTypes.add(NavigationMapType.DFX);
+ }
+
String currentLocNo = shuttleProtocol.getCurrentLocNo();
List<ShuttleCommand> commands = shuttleOperaUtils.getStartToTargetCommands(currentLocNo, locNo, restartCalcMapTypes, assignCommand, this);
if (commands == null) {
--
Gitblit v1.9.1