From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/utils/Utils.java | 94 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 9625946..dfb0cab 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -220,6 +220,72 @@
}
/**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
+ */
+ public static short getRow(Integer staNo) {
+ switch (staNo){
+ case 107:
+ return 3;
+ case 207:
+ return 19;
+ case 112:
+ return 4;
+ case 212:
+ return 18;
+ }
+ throw new RuntimeException("绔欑偣瑙ｆ瀽寮傚父");
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+ */
+ public static short getBay(Integer staNo) {
+ switch (staNo){
+ case 107:
+ return 2;
+ case 207:
+ return 6;
+ case 112:
+ return 5;
+ case 212:
+ return 5;
+ }
+ throw new RuntimeException("绔欑偣瑙ｆ瀽寮傚父");
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+ */
+ public static short getLev(Integer staNo) {
+ return 1;
+ }
+ public static Integer getStaNoConvertCentreOther2(Integer staNo){//鏀捐揣涓鸿幏鍙栬璧扮洰鏍囦綅
+ switch (staNo){
+ case 108:
+ return 111;
+ case 208:
+ return 211;
+ case 112:
+ return 114;
+ case 212:
+ return 214;
+ default:
+ return staNo;
+ }
+ }
+
+ public static Integer getStaNoConvertCentreOther3(Integer staNo,Integer staNoS){//鏀捐揣涓鸿幏鍙栬璧扮洰鏍囦綅
+ switch (staNoS){
+ case 113:
+ return 112;
+ case 213:
+ return 212;
+ default:
+ return staNo;
+ }
+ }
+
+ /**
* 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
*/
public static String append(int row, int bay, int lev) {
@@ -648,20 +714,20 @@
return false;
}
}
- if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
- if (locMast.getLocSts().equals("X")){
- row = selectInSide2(row);
- if (row==0){
- return true;
- }
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
- if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
- return true;
- }
- } else {
- return true;
- }
- }
+// if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
+// if (locMast.getLocSts().equals("X")){
+// row = selectInSide2(row);
+// if (row==0){
+// return true;
+// }
+// LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
+// if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
+// return true;
+// }
+// } else {
+// return true;
+// }
+// }
return false;
}
--
Gitblit v1.9.1