From a206216c95cb4cc2b3a3c7c1e3d247d6ea87183f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 16:25:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index fff71c0..670a82e 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -1076,10 +1076,10 @@
return false;
}
- if (liftProtocol.getPlatShuttleCheck()) {
- //鎻愬崌鏈哄唴鏈夎溅绂佹涓嬪彂
- return false;
- }
+// if (liftProtocol.getPlatShuttleCheck()) {
+// //鎻愬崌鏈哄唴鏈夎溅绂佹涓嬪彂
+// return false;
+// }
if (redisCommand.getLiftSecurityMk()) {
//宸茬粡鎵ц杩囨彁鍗囨満鍛戒护锛岀姝笅鍙�
@@ -1097,18 +1097,18 @@
liftProtocol.setTaskNo(shuttleProtocol.getTaskNo());//璁剧疆浠诲姟鍙�
liftProtocol.setShuttleNo(shuttleProtocol.getShuttleNo());//璁剧疆鍥涘悜绌挎杞﹀彿
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
- liftProtocol.setSecurityMk(true);//鏍囪缃负true锛岄槻姝㈠叾浠栦换鍔″崰鐢ㄥ綋鍓嶆彁鍗囨満
+// liftProtocol.setSecurityMk(true);//鏍囪缃负true锛岄槻姝㈠叾浠栦换鍔″崰鐢ㄥ綋鍓嶆彁鍗囨満
redisCommand.setLiftSecurityMk(true);//鏍囪缃负true锛岄槻姝㈠叾浠栦换鍔″崰鐢ㄥ綋鍓嶆彁鍗囨満
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
//鍛戒护list
ArrayList<LiftCommand> liftCommands = new ArrayList<>();
- LiftCommand liftCommand = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), shuttleLocNoLev);
- liftCommands.add(liftCommand);//灏嗗懡浠ゆ坊鍔犺繘list
+// LiftCommand liftCommand = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), shuttleLocNoLev);
+// liftCommands.add(liftCommand);//灏嗗懡浠ゆ坊鍔犺繘list
LiftAssignCommand liftAssignCommand = new LiftAssignCommand();
- liftAssignCommand.setCommands(liftCommands);
+// liftAssignCommand.setCommands(liftCommands);
liftAssignCommand.setLiftNo(liftProtocol.getLiftNo());
liftAssignCommand.setTaskNo(liftProtocol.getTaskNo());
//涓嬪彂浠诲姟
--
Gitblit v1.9.1