From 525047977e8e9074a21567ae9eb5b9f6ac0c07fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 14 十月 2023 12:49:07 +0800
Subject: [PATCH] #拣料回库
---
src/main/java/com/zy/core/thread/NyShuttleThread.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java
index 12e841d..9a8b6d1 100644
--- a/src/main/java/com/zy/core/thread/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java
@@ -388,6 +388,7 @@
NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(shuttleProtocol.getCurrentLocNo()));
+ boolean isLock = false;//鏄惁瑙ｉ攣璺緞
//鍙栧嚭鍛戒护
NyShuttleHttpCommand command = null;
if (commandStep < commands.size()) {
@@ -403,13 +404,15 @@
if (shuttleProtocol.getPoint().equals(target)) {
//涓婁竴鏉℃寚浠ょ殑鐩爣浣嶇疆鍜屽綋鍓嶅皬杞︿綅缃浉鍚岋紝鍒欒瀹氫笂涓�鏉′换鍔″畬鎴�
lastCommand.setComplete(true);
- //瑙ｉ攣閿佸畾璺緞锛屼笂涓�鏉¤矾寰勫拰褰撳墠璺緞
+ //瑙ｉ攣閿佸畾璺緞锛屼笂涓�鏉¤矾寰�
List<NavigateNode> nodes = lastCommand.getNodes();
- if (command != null && command.getNodes() != null) {
- nodes.addAll(command.getNodes());
- }
+// //瑙ｉ攣褰撳墠璺緞
+// if (command != null && command.getNodes() != null) {
+// nodes.addAll(command.getNodes());
+// }
if (nodes != null) {
navigateMapData.writeNavigateNodeToRedisMap(nodes, false);//瑙ｉ攣璺緞
+ isLock = true;//瑙ｉ攣杩囪矾寰�
}
}
}else {
@@ -473,9 +476,19 @@
whiteList.add(startArr);
}
- //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
- if (!checkPath(command.getNodes(), nextNodes, whiteList)) {
- return false;
+ //瑙ｉ攣杩囪矾寰勶紝鍙娴嬩笅涓�娈佃矾寰勬槸鍚﹀彲璧�(褰撳墠璺緞宸茬粡琚攣瀹氭棤闇�鍐嶆娴�)
+ if (isLock) {
+ //鍙娴嬩笅涓�娈佃矾寰勬槸鍚﹀彲璧�(褰撳墠璺緞宸茬粡琚攣瀹氭棤闇�鍐嶆娴�)
+ //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
+ if (!checkPath(nextNodes == null ? command.getNodes() : nextNodes, null, whiteList)) {
+ return false;
+ }
+ }else {
+ //妫�娴嬪綋鍓嶈矾寰勫拰涓嬩竴娈佃矾寰�
+ //妫�娴嬭矾寰勬槸鍚﹀彲琛岃蛋
+ if (!checkPath(command.getNodes(), nextNodes, whiteList)) {
+ return false;
+ }
}
//閿佸畾璺緞锛岄攣瀹氬綋鍓嶈矾寰勫拰涓嬩竴姝ヨ矾寰�
--
Gitblit v1.9.1