From 15c63539d835441e2a3face40c108650f6103829 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 四月 2025 13:16:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 83f2695..f4306d5 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){
@@ -165,10 +165,10 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
+ if (remainder == 0 ) {
targetRow = row + 1;
+ } else if (remainder == 3) {
+ targetRow = row - 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
@@ -355,6 +355,10 @@
}
}
}
+
+ //鍫嗗灈鏈哄簱浣嶄粠14鎺掑紑濮�
+ necessaryParameters[1] = necessaryParameters[1]+13; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[3] = necessaryParameters[3]+13; //nearRow 鏈�娴呭簱浣嶆帓
return necessaryParameters;
}
@@ -529,22 +533,22 @@
case 1:
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
break;
case 4:
- necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 9:
- necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
+ case 5:
+ necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 14:
+ case 8:
necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 1; //nearRow 鏈�娴呭簱浣嶆帓
break;
default:
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
--
Gitblit v1.9.1