From 0a05bcf1064431e7f2ba84856d5d0dad0cf48ecc Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 21 五月 2024 15:59:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 203 ++++++++++++++++++++++++++++----------------------
1 files changed, 112 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1e4be2e..7da282b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -94,137 +94,158 @@
}
/**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
+ * 鍒ゆ柇鏄惁涓烘祬搴撲綅 骞跺瓨鍦ㄦ繁搴撲綅
*/
public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
+ if (!slaveProperties.getDoubleLocs().contains(row)){
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ if (deepLocLeft){
+ return true;
+ }
+ return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
+ }
}
+ return false;
}
/**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
+ * 鍒ゆ柇鏄惁涓烘祬搴撲綅 骞跺瓨鍦ㄦ繁搴撲綅
*/
public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
+ if (!slaveProperties.getDoubleLocs().contains(row)){
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ if (deepLocLeft){
+ return true;
+ }
+ return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
+ }
}
+ return false;
}
/**
* 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
*/
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
+// int row = getRow(deepLoc);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+// return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
int row = getRow(deepLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ int shallowRow = deepLocLeft? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
- /**
- * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿 鍙屼几+鍗曞弻浼� 鐓滄槦瀹氬埗
- */
- public static String getShallowLoc5(SlaveProperties slaveProperties, String deepLoc,Integer whsType) {
- if (whsType==9){
- int row = getRow(deepLoc);
- int shallowRow;
- if (row == 21) {
- shallowRow = row + 1;
- } else if (row == 24) {
- shallowRow = row - 1;
- } else if (row == 25) {
- shallowRow = row;
- } else if (row == 27) {
- shallowRow = row - 1;
- } else {
- throw new RuntimeException(row + "涓嶆槸娣卞簱浣嶏紝绯荤粺绻佸繖");
- }
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
- }else {
- int row = getRow(deepLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
- }
- }
+// /**
+// * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿 鍙屼几+鍗曞弻浼� 鐓滄槦瀹氬埗
+// */
+// public static String getShallowLoc5(SlaveProperties slaveProperties, String deepLoc,Integer whsType) {
+// if (whsType==9){
+// int row = getRow(deepLoc);
+// int shallowRow;
+// if (row == 21) {
+// shallowRow = row + 1;
+// } else if (row == 24) {
+// shallowRow = row - 1;
+// } else if (row == 25) {
+// shallowRow = row;
+// } else if (row == 27) {
+// shallowRow = row - 1;
+// } else {
+// throw new RuntimeException(row + "涓嶆槸娣卞簱浣嶏紝绯荤粺绻佸繖");
+// }
+// return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+// }else {
+// int row = getRow(deepLoc);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+// return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+// }
+// }
/**
* 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
*/
public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
- int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
- return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
+// int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, deepRow);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ return deepLocLeft ? (deepRow + 1) : (deepRow - 1);
}
/**
* 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
+// int row = getRow(shallowLoc);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// int targetRow;
+// if (remainder == 2) {
+// targetRow = row - 1;
+// } else if (remainder == 3) {
+// targetRow = row + 1;
+// } else {
+// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+// }
+// return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ int shallowRow = deepLocLeft? (row - 1) : (row + 1);
+ return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
}
- /**
- * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿 鍙屼几+鍗曞弻浼� 鐓滄槦瀹氬埗
- */
- public static String getDeepLoc5(SlaveProperties slaveProperties, String shallowLoc,Integer whsType) {
- if (whsType==9){
- int row = getRow(shallowLoc);
- int targetRow;
- if (row == 22) {
- targetRow = row - 1;
- } else if (row == 23) {
- targetRow = row + 1;
- } else if (row == 25) {
- targetRow = row;
- } else if (row == 26) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
- } else {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
- }
- }
+// /**
+// * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿 鍙屼几+鍗曞弻浼� 鐓滄槦瀹氬埗
+// */
+// public static String getDeepLoc5(SlaveProperties slaveProperties, String shallowLoc,Integer whsType) {
+// if (whsType==9){
+// int row = getRow(shallowLoc);
+// int targetRow;
+// if (row == 22) {
+// targetRow = row - 1;
+// } else if (row == 23) {
+// targetRow = row + 1;
+// } else if (row == 25) {
+// targetRow = row;
+// } else if (row == 26) {
+// targetRow = row + 1;
+// } else {
+// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+// }
+// return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+// } else {
+// int row = getRow(shallowLoc);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// int targetRow;
+// if (remainder == 2) {
+// targetRow = row - 1;
+// } else if (remainder == 3) {
+// targetRow = row + 1;
+// } else {
+// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+// }
+// return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+// }
+// }
/**
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
- int targetRow;
- if (remainder == 2) {
- targetRow = shallowRow - 1;
- } else if (remainder == 3) {
- targetRow = shallowRow + 1;
- } else {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
- }
- return targetRow;
+// int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
+// int targetRow;
+// if (remainder == 2) {
+// targetRow = shallowRow - 1;
+// } else if (remainder == 3) {
+// targetRow = shallowRow + 1;
+// } else {
+// throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
+// }
+// return targetRow;
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ return deepLocLeft? (shallowRow - 1) : (shallowRow + 1);
}
/**
--
Gitblit v1.9.1