From 7441616d1f28146f859eb20be839c07fd3719a40 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 25 九月 2023 16:22:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 1ddba1b..3c7508f 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -320,13 +320,22 @@
assignCommand.setCommands(commands);
} else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) {
//鍏呯數寮�鍏�
- NyShuttleHttpCommand command = NyHttpUtils.getChargeCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
+ boolean charge = false;
+ if (shuttleProtocol.getChargState() == 1) {
+ //宸插厖鐢碉紝鍏抽棴鍏呯數
+ charge = false;
+ }else {
+ //寮�鍚厖鐢�
+ charge = true;
+ }
+ NyShuttleHttpCommand command = NyHttpUtils.getChargeCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), charge);
ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
commands.add(command);
assignCommand.setCommands(commands);
} else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
//澶嶄綅
shuttleProtocol.setTaskNo(0);//宸ヤ綔鍙锋竻绌�
+ shuttleProtocol.setToken(0);//浠ょ墝娓呯┖
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
shuttleProtocol.setPakMk(false);//浣滀笟鏍囪澶嶄綅
return R.ok();
--
Gitblit v1.9.1