From 56de968727bd6e871c6823dce837f8d42f30e6f8 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 10 六月 2025 09:28:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 64e2cfa..28b4960 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -16,10 +16,7 @@
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2020/8/27
@@ -27,6 +24,24 @@
public class Utils {
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
+
+ public static String getStaName(Integer sta){
+ HashMap<Integer, String> map = new HashMap<>();
+ map.put(113,"Ctu搴�102");map.put(115,"Ctu搴�101");
+ map.put(204,"Ctu搴�201");map.put(304,"Ctu搴�301");
+ map.put(31001,"鍥涘悜搴�101");
+
+ map.put(1024,"鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");map.put(1028,"鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛");
+ map.put(1040,"鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");map.put(1042,"鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛");
+
+ map.put(2000,"鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");map.put(2002,"鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛");
+ map.put(2010,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");map.put(2012,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛");
+
+
+ map.put(3010,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");map.put(3012,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
+
+ return map.get(sta)==null?sta.toString():map.get(sta);
+ }
public static boolean isNorth(Integer sourceStaNo){
if ((sourceStaNo>1000 && sourceStaNo < 1040) || (sourceStaNo>2000 && sourceStaNo > 2010)|| (sourceStaNo > 3000 && sourceStaNo < 3010)){
@@ -131,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);
}
@@ -303,6 +318,8 @@
return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 7://骞冲簱 CTU搴�
return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 8://鍥涘悜搴�(鐗涚溂杞�)eg:鍏夋嘲鍥涘悜
+ return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
@@ -340,6 +357,7 @@
}
}
}
+
return necessaryParameters;
}
@@ -512,24 +530,19 @@
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
case 1:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 4:
- necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
+ case 3:
+ necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 9:
- 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