From 49dfa451ed700fe0d845be9f36d2b4302aff92be Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 17:57:16 +0800
Subject: [PATCH] qw
---
src/main/java/com/zy/asrs/utils/Utils.java | 38 ++++++++++++--------------------------
1 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e1d291c..3af7671 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -40,7 +40,7 @@
map.put(3010,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");map.put(3012,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
- return map.get(sta);
+ return map.get(sta)==null?sta.toString():map.get(sta);
}
public static boolean isNorth(Integer sourceStaNo){
@@ -146,7 +146,7 @@
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);
+ int shallowRow = remainder == 1 ? (row - 1) : (row + 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -355,6 +355,7 @@
}
}
}
+
return necessaryParameters;
}
@@ -527,34 +528,19 @@
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
case 1:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 1; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 6:
+ necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 4:
- necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓
+ case 13:
+ necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 7:
- necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 11; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 9:
- necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 12:
- necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 14:
- necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
break;
default:
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
--
Gitblit v1.9.1