From 5d2e76e56ef199debdcb38a65ae2121650c615d0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 九月 2025 09:00:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 18 ++++++++++++------
1 files changed, 12 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..ac837db 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);
@@ -136,15 +139,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,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);
}
}
--
Gitblit v1.9.1