From 32bf433492f540b1392c19757124ebb91d0e74bd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 29 三月 2023 15:55:01 +0800
Subject: [PATCH] 四向车入库分配任务逻辑
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 7cd4f70..e2ee80d 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -5,7 +5,6 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.ModBus.ModbusTcpNet;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
@@ -308,6 +307,8 @@
}
}
+ //鍥涘悜绌挎杞﹀彿
+ map.put("shuttle_no", assignCommand.getShuttleNo());
//宸ヤ綔鍙�
map.put("wrk_no", assignCommand.getTaskNo());
//鍛戒护鎵ц姝ュ簭
@@ -391,6 +392,8 @@
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
//浠诲姟鍙锋竻闆�
shuttleProtocol.setTaskNo((short) 0);
+ //鏍囪澶嶄綅
+ shuttleProtocol.setPakMk(true);
break;
default:
}
@@ -437,10 +440,6 @@
//瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
- //璁剧疆鍥涘悜绌挎杞︿负绌洪棽鐘舵��
- shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
- //浠诲姟鍙锋竻闆�
- shuttleProtocol.setTaskNo((short) 0);
News.info("鍥涘悜绌挎杞︿换鍔℃墽琛屽畬鎴愮瓑寰呯‘璁や腑锛岀┛姊溅鍙�={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
}
--
Gitblit v1.9.1