From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 220 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 183 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2109368..884f9e1 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -94,79 +94,196 @@
}
/**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
+ * 鍒ゆ柇鏄惁涓烘祬搴撲綅 骞跺瓨鍦ㄦ繁搴撲綅
*/
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 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 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);
}
+ /**
+ * 鑾峰彇 灏忔枡搴撲綅瀵瑰簲鐨勬繁鑾锋祬搴撲綅
+ */
+ public static String singleLoc(String locNo) {
+ int row = getRow(locNo);
+ int rowOther = 0;
+ switch (row){
+ case 1:
+ rowOther = 2;
+ break;
+ case 2:
+ rowOther = 1;
+ break;
+ case 3:
+ rowOther = 4;
+ break;
+ case 4:
+ rowOther = 3;
+ break;
+ case 5:
+ rowOther = 6;
+ break;
+ case 6:
+ rowOther = 5;
+ break;
+ case 7:
+ rowOther = 8;
+ break;
+ case 8:
+ rowOther = 7;
+ break;
+ default:
+ return null;
+ }
+ return zerofill(String.valueOf(rowOther), 2) + locNo.substring(2);
+ }
/**
* 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
*/
@@ -240,22 +357,22 @@
return 0;
}
- public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏� //鏄惁娣辨祬搴撲綅寮�鍏�
+ if (whsType == 1 || whsType==3 || whsType==4 || whsType == 9) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
- if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) {
+ if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4 || whsType == 9) && staDescId != 11 && staDescId != 111) {
return true;
}
return false;
@@ -290,6 +407,8 @@
return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
+ case 9://鍓嶅弻浼� 鍚庡乏鍗曞彸鍙�(灏忓崟澶у弻) 鐓滄槦瀹氬埗
+ return LocNecessaryParametersDoubleExtension9(whsType, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
}
@@ -492,7 +611,7 @@
}
if ((curRow - sRow) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
} else if ((curRow - sRow + 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
@@ -505,6 +624,33 @@
}
return necessaryParameters;
}
+ public static int[] LocNecessaryParametersDoubleExtension9(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(21)) {
+ necessaryParameters[1] = 25; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 7; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 25; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(25)) {
+ necessaryParameters[1] = 24; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 6; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 23; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(24)) {
+ necessaryParameters[1] = 27; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 7; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 26; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(27)) {
+ necessaryParameters[1] = 21; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 6; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 22; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
+ return necessaryParameters;
+ }
public static void main(String[] args) {
--
Gitblit v1.9.1