From 7a3193a3d0a94daff257cb13764a83b9863bad22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 04 十月 2023 14:20:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LiftController.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 244cb3c..50f8d46 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -260,26 +260,8 @@
}
} else if (param.getLiftTaskMode() == 0) {
//鎻愬崌鏈哄浣�
- int workNo = commonService.getWorkNo(3);//鑾峰彇浠诲姟鍙�
-
- //鑾峰彇鎻愬崌鏈哄懡浠�
- NyLiftCommand liftCommand = NyLiftUtils.getLiftResetCommand(liftProtocol.getLiftNo().intValue());
- ArrayList<NyLiftCommand> commands = new ArrayList<>();
- commands.add(liftCommand);
-
- //鎻愪氦鍒扮嚎绋嬪幓宸ヤ綔
- LiftAssignCommand assignCommand = new LiftAssignCommand();
- assignCommand.setCommands(commands);
- assignCommand.setLiftNo(liftProtocol.getLiftNo());
- assignCommand.setTaskNo((short) workNo);
- assignCommand.setAuto(false);//鎵嬪姩妯″紡
- assignCommand.setTaskMode(NyLiftTaskModelType.RESET.id.shortValue());
-
- if (MessageQueue.offer(SlaveType.Lift, liftSlave.getId(), new Task(3, assignCommand))) {
- return R.ok();
- } else {
- throw new CoolException("鍛戒护涓嬪彂澶辫触");
- }
+ liftProtocol.setToken(0);
+ liftProtocol.setProtocolStatusType(LiftProtocolStatusType.IDLE);
} else {
throw new CoolException("鏈煡鍛戒护");
}
--
Gitblit v1.9.1