From d34366b9d348f47a8083aa3dd2e3e0efa2377dcf Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 20:57:18 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/core/action/ShuttleAction.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/action/ShuttleAction.java b/src/main/java/com/zy/core/action/ShuttleAction.java
index 09fc279..61ed0ff 100644
--- a/src/main/java/com/zy/core/action/ShuttleAction.java
+++ b/src/main/java/com/zy/core/action/ShuttleAction.java
@@ -219,8 +219,14 @@
// 绯荤粺浠诲姟
if (assignCommand.getAuto()) {
if (!assignCommand.getCharge()) {
- //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
- shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
+ if (command.getMode() == ShuttleCommandModeType.UPDATE_LOCATION.id) {
+ //鏇存柊鍧愭爣浠诲姟鏃犻渶鎶涘嚭绛夊緟纭
+ shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+ shuttleThread.setSyncTaskNo(0);
+ }else {
+ //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
+ shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
+ }
}else {
shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.CHARGING_WAITING);
}
@@ -358,6 +364,7 @@
}
targetLoc = locMast;
+ break;
}
if(targetLoc == null) {
--
Gitblit v1.9.1