From 681d5587c0d926711861269047d38e3502ff5fa3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 27 三月 2025 10:36:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 334f01b..dd84c73 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){
@@ -527,34 +527,24 @@
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
case 1:
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 4:
necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
break;
case 5:
- necessaryParameters[1] = 6; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 6:
- necessaryParameters[1] = 10; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 10:
- necessaryParameters[1] = 11; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 11:
- necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 14; //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