From 0b21274e100080f7c240be714f31de0a1a6d626c Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 27 三月 2023 17:02:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index ffc4717..e5ecf37 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -20,10 +20,7 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.ShuttleRunDirection;
-import com.zy.core.enums.ShuttleStatusType;
-import com.zy.core.enums.ShuttleTaskModeType;
-import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.*;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.ShuttleAssignCommand;
@@ -121,6 +118,7 @@
if (null == shuttleProtocol) {
shuttleProtocol = new ShuttleProtocol();
shuttleProtocol.setShuttleNo(slave.getId().shortValue());
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
}
//----------璇诲彇鍥涘悜绌挎杞︾姸鎬�-----------
@@ -374,6 +372,14 @@
command.setRunDirection((short) (assignCommand.getTaskMode() - 4));
command.setCommandEnd((short) 1);
break;
+ case 9://鐘舵�佸浣�
+ command.setCommandWord((short) 0);
+ //璁剧疆鍥涘悜绌挎杞︿负绌洪棽鐘舵��
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+ //浠诲姟鍙锋竻闆�
+ shuttleProtocol.setTaskNo((short) 0);
+ break;
+ default:
}
command.setCommandEnd((short) 1);
@@ -415,6 +421,11 @@
}
//鍒犻櫎redis
redisUtil.del("wrk_no_" + map.get("wrk_no").toString());
+
+ //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
+
+ News.info("鍥涘悜绌挎杞︿换鍔℃墽琛屽畬鎴愮瓑寰呯‘璁や腑锛岀┛姊溅鍙�={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
}
}
--
Gitblit v1.9.1