From ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 08:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/utils/Utils.java | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 89cef79..e75e2a8 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -6,7 +6,9 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2020/8/27
@@ -34,6 +36,13 @@
}
return msgBuilder.toString();
}
+ }
+
+ /**
+ * 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
+ */
+ public static String append(int row, int bay, int lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
/**
@@ -144,6 +153,26 @@
}
/**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+ */
+ public static int getBay(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(2, 5));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+ */
+ public static int getLev(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(5, 7));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
* 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
*/
public static void toDeepIfEmptyByShallow(String shallowLoc) {
@@ -195,42 +224,6 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
}
-
- public static Integer getInnermostRow(String locNo){
- int row = getRow(locNo);
- switch (row) {
- case 1:
- case 2:
- case 3:
- return 1;
- case 4:
- case 5:
- case 6:
- case 7:
- return 7;
- case 8:
- case 9:
- case 10:
- case 11:
- return 8;
- case 12:
- case 13:
- case 14:
- return 14;
- case 15:
- case 16:
- case 17:
- case 18:
- return 15;
- case 19:
- case 20:
- case 21:
- return 21;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- }
-
public static List<String> getGroupLoc(String locNo){
int row = getRow(locNo);
@@ -531,4 +524,12 @@
}
}
+ public Map<Integer, List<Integer>> getRowSeqHasSortOfPakin(int start, int end) {
+ Map<Integer, List<Integer>> result = new HashMap<>();
+ for (int i = start ; i <= end; i++) {
+
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.1