From cdeb9e9559783cae56cbc6581b2e7aef893429b7 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 27 三月 2023 17:02:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/xzjlwcs' into xzjlwcs
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 15 +++++++++++----
src/main/webapp/views/console.html | 11 ++++-------
src/main/java/com/zy/common/utils/NavigatePositionConvert.java | 6 +++---
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 84ba529..52a4d61 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -18,13 +18,13 @@
//xy杞磋浆鍧愭爣缂栧彿
public static Short xyToPosition(int x, int y) {
StringBuffer sb = new StringBuffer();
- sb.append(y);
+ sb.append(x);
if (x < 10) {
sb.append("00");
} else if (x < 100) {
sb.append("0");
}
- sb.append(x);
+ sb.append(y);
return Short.parseShort(sb.toString());
}
@@ -38,7 +38,7 @@
}
public static int[] coverPosition(int col,int row) {
- return new int[]{row, col};
+ return new int[]{col, row};
}
}
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index e5ecf37..03e30b5 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -288,7 +288,7 @@
}
//鍒嗛厤浠诲姟
- private void assignWork(ShuttleAssignCommand assignCommand) {
+ private void assignWork(ShuttleAssignCommand assignCommand) throws Exception {
//灏嗘map瀛樺叆redis涓�
HashMap<String, Object> map = new HashMap<>();
@@ -299,6 +299,13 @@
ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
//璺緞鏁版嵁
map.put("path", data);
+ //璺緞娆℃暟
+ map.put("pathSize", data.size());
+ }else {
+ if (assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_IN.id.shortValue() || assignCommand.getTaskMode() == ShuttleTaskModeType.PAK_OUT.id.shortValue()) {
+ //灞炰簬鍏ュ簱鍑哄簱锛屽繀椤昏璁＄畻璺緞锛屽垯鎶涘嚭寮傚父
+ throw new Exception("鏈兘鎵惧埌杩愯璺緞");
+ }
}
//宸ヤ綔鍙�
@@ -336,11 +343,11 @@
Object o1 = pathList.get(commandStep);
ArrayList path = JSON.parseObject(o1.toString(), ArrayList.class);
- size = path.size();
+ size = Integer.parseInt(map.get("pathSize").toString());
//寮�濮嬭矾寰�
JSONObject startPath = JSON.parseObject(path.get(0).toString());
//鐩爣璺緞
- JSONObject endPath = JSON.parseObject(path.get(size - 1).toString());
+ JSONObject endPath = JSON.parseObject(path.get(path.size() - 1).toString());
command.setCommandWord((short) 1);
command.setStartCodeNum(NavigatePositionConvert.xyToPosition(startPath.getIntValue("x"), startPath.getIntValue("y")));
@@ -393,7 +400,7 @@
shuttleProtocol.setPakMk(false);
//鍒ゆ柇鏁版嵁鏄惁鎵ц瀹屾垚
- if (commandStep < size) {
+ if (commandStep < size - 1) {
//鏇存柊redis鏁版嵁
//姝ュ簭澧炲姞
commandStep++;
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 060086b..351be8b 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -426,7 +426,6 @@
mapData = data
let content = ""
data.forEach((rowData,index) => {
- let lastGroup = '<div class="stock-group">'
//鍘绘帀涓婁笅杈圭紭绂佸尯
if(!(index == 0 || data.length - 1 == index)){
let row = '<div class="stock-group">';
@@ -452,18 +451,16 @@
col = '<div id="site-' + data + '" class="site">' + data + '(9991)</div>';
break;
default:
- col = '<button class="item">' + index + '</button>';
+ col = '<button class="item">' + idx + '</button>';
}
- if(data.length - 2 == index){
- //鍒拌揪鐪熷疄鏁版嵁鐨勬渶鍚庝竴琛岋紝鎵撲笂琛屾暟鏍囪
- lastGroup += '<button class="item">' + idx + '#</button>';
+ if(rowData.length - 2 == idx){
+ //鎵撲笂琛屾暟鏍囪
+ col += '<span class="row-no">' + index + '#</span>';
}
row += col
}
})
- lastGroup += '</div>';
- row += lastGroup;
row += '</div>';
content += row
}
--
Gitblit v1.9.1