From d317c70cf46549a5cc190d1e3334bd8945ee46a8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 27 六月 2023 15:45:04 +0800
Subject: [PATCH] 单步命令完成状态
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 4359a0f..7d23d51 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -739,8 +739,57 @@
if (commandStep != 0) {
//鍒ゆ柇涓婁竴鏉℃寚浠ゆ槸鍚﹀畬鎴�
ShuttleCommand command = commands.get(commandStep - 1);
- if (command.getDistCodeNum().intValue() == shuttleProtocol.getCurrentCode().intValue()) {
- //涓婁竴鏉℃寚浠ょ殑鐩爣浣嶇疆
+ if (command.getCommandWord().intValue() == 1) {
+ //绉诲姩鍛戒护
+ if (command.getDistCodeNum().intValue() == shuttleProtocol.getCurrentCode().intValue()) {
+ //涓婁竴鏉℃寚浠ょ殑鐩爣浣嶇疆鍜屽綋鍓嶅皬杞︿綅缃浉鍚岋紝鍒欒瀹氫笂涓�鏉′换鍔″畬鎴�
+ command.setComplete(true);
+ }
+ } else if (command.getCommandWord().intValue() == 2) {
+ //鎵樼洏椤跺崌鍛戒护
+ if (command.getPalletLift().intValue() == 1) {
+ //椤跺崌
+ //鍒ゆ柇鏄惁椤跺崌鍒颁綅
+ if (shuttleProtocol.getPlcOutputLift()) {
+ //鑷姩妯″紡
+ if (assignCommand.getAuto() && shuttleProtocol.getPlcInputStatus().intValue() == 1) {
+ //椤跺崌鍒颁綅,涓旀墭鐩橀浄杈炬湁鐗╋紝璁ゅ畾浠诲姟瀹屾垚
+ command.setComplete(true);
+ }else {
+ //鎵嬪姩妯″紡锛屼笉鍒ゆ柇鎵樼洏闆疯揪
+ //椤跺崌鍒颁綅锛岃瀹氫换鍔″畬鎴�
+ command.setComplete(true);
+ }
+ }
+ }else {
+ //涓嬮檷
+ //鍒ゆ柇鏄惁涓嬮檷鍒颁綅锛屽垽鏂墭鐩橀浄杈炬槸鍚︽棤鐗�
+ if (!shuttleProtocol.getPlcOutputLift() && !shuttleProtocol.getPlcOutputTransfer()) {
+ //鑷姩妯″紡
+ if (assignCommand.getAuto() && shuttleProtocol.getPlcInputStatus().intValue() == 0) {
+ //涓嬮檷鍒颁綅锛屼笖鎵樼洏闆疯揪鏃犵墿锛岃瀹氫换鍔″畬鎴�
+ command.setComplete(true);
+ }else {
+ //鎵嬪姩妯″紡锛屼笉鍒ゆ柇鎵樼洏闆疯揪
+ //涓嬮檷鍒颁綅锛屼笖鎵樼洏闆疯揪鏃犵墿锛岃瀹氫换鍔″畬鎴�
+ command.setComplete(true);
+ }
+ }
+ }
+ } else if (command.getCommandWord().intValue() == 5) {
+ //鍏呯數鍛戒护
+ //鍒ゆ柇灏忚溅鍏呯數寮�鍏�
+ if (shuttleProtocol.getPlcOutputCharge()) {
+ //姝ｅ父鍏呯數锛岃瀹氫换鍔″畬鎴�
+ command.setComplete(true);
+ }
+ }
+ //浠诲姟鏁版嵁淇濆瓨鍒皉edis
+ redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
+
+ if (!command.getComplete()) {
+ //涓婁竴鏉′换鍔℃湭瀹屾垚锛岀姝笅鍙戝懡浠�
+ return false;
}
}
--
Gitblit v1.9.1