From 055743022694b6fc1bb1864137e0c81b6ea658c5 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 29 一月 2026 19:45:26 +0800
Subject: [PATCH] 盘点出库增加一个标记 可筛选可清除
---
src/main/java/com/zy/asrs/utils/Utils.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e802f20..c965065 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -116,6 +116,9 @@
*/
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
+ if (row ==1 || row == 6){
+ return deepLoc;
+ }
boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
int shallowRow = deepLocLeft ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
@@ -143,8 +146,8 @@
if (row == 1 || row == 6) {
return null;
}
- //2,7,11,15,19,23
- if (row == 2 || row == 8 || row == 12 || row == 16 || row == 20 || row == 24) {
+ //2,8,11,15,19,23
+ if (row == 5 || row == 8 || row == 12 || row == 16 || row == 20 || row == 24) {
return zerofill(String.valueOf(row - 1), 2) + shallowLoc.substring(2);
} else {
return zerofill(String.valueOf(row + 1), 2) + shallowLoc.substring(2);
@@ -621,4 +624,22 @@
return result;
}
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙栨墍鍦ㄥ贩閬�
+ */
+ public static int getLaneByLocNo(String locNo) {
+ int row = Utils.getRow(locNo);
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ return 1;
+ case 4:
+ case 5:
+ case 6:
+ return 2;
+ }
+ return 0;
+ }
+
}
--
Gitblit v1.9.1