From 04e434d4d2671546870375675b79dc53f619f446 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 25 十月 2022 11:21:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 87 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a708bfb..5d29d14 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -13,6 +13,15 @@
*/
public class Utils {
+ public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
+ add(11);add(12);add(13);add(14);add(15);add(16);add(17);
+ }};
+ public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(18);add(19);add(20);
+ add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
+ }};
+
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
public static float scale(Float f){
@@ -36,61 +45,35 @@
}
}
-
- public static Integer getGroupRow(String locNo){
+ public static Integer getGroupRow(String locNo, Boolean pakin){
int row = getRow(locNo);
- switch (row) {
- case 1:
- case 2:
- case 3:
- return 3;
- case 4:
- case 5:
- case 6:
- case 7:
- return 4;
- case 8:
- case 9:
- case 10:
- case 11:
- return 11;
- case 12:
- case 13:
- case 14:
- return 12;
- case 15:
- case 16:
- case 17:
- case 18:
+ return getGroupRow(row, pakin);
+ }
+
+ public static Integer getGroupRow(Integer row, Boolean pakin) {
+ if (pakin) {
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 17;
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
return 18;
- case 19:
- case 20:
- case 21:
- return 19;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ } else {
+ return 0;
+ }
+ } else {
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 2;
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 30;
+ } else {
+ return 0;
+ }
}
}
-
-
-
-
-
-
-
-
-
// -------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
@@ -225,6 +208,14 @@
}
/**
+ * 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
+ */
+ 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);
+ }
+
+
+ /**
* 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
*/
public static void toDeepIfEmptyByShallow(String shallowLoc) {
@@ -242,6 +233,10 @@
}
+ public static String getLocNo(Number row, Number bay, Number lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+ }
+
public static void main(String[] args) {
SlaveProperties slaveProperties = new SlaveProperties();
slaveProperties.setDoubleDeep(true);
--
Gitblit v1.9.1