From 452e0feece8f8ff501fd8651d19d90134dadc78a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 14:29:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/utils/Utils.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 762b1ec..e802f20 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -136,15 +136,18 @@
*/
public static String getDeepLoc2(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
- boolean deepLocLeft = isDeepLoc(slaveProperties, row);//鍒ゆ柇鏄惁涓烘繁搴撲綅
- if (!deepLocLeft) {
+ boolean deepLoc = isDeepLoc(slaveProperties, row);//鍒ゆ柇鏄惁涓烘繁搴撲綅
+ if (deepLoc) {
return null;
}
- //4,7,11,15,19,23
- if (row == 4 || row == 7 || row == 11 || row == 15 || row == 19 || row == 23) {
- return zerofill(String.valueOf(row + 1), 2) + shallowLoc.substring(2);
- } else {
+ 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) {
return zerofill(String.valueOf(row - 1), 2) + shallowLoc.substring(2);
+ } else {
+ return zerofill(String.valueOf(row + 1), 2) + shallowLoc.substring(2);
}
}
--
Gitblit v1.9.1