From f1438e7816f5d5ea213834efbd7c39a4ac7d5fd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 02 十一月 2022 10:15:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |   96 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 84 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 36a0324..141502b 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){
@@ -35,6 +44,41 @@
             return msgBuilder.toString();
         }
     }
+
+    public static Integer getGroupRow(String locNo, Boolean pakin){
+        int row = getRow(locNo);
+        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;
+            } 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;
+            }
+        }
+    }
+
+
+
+
+    // -------------------------------------------------------------------------------------------------------------------
+
+
+
+
+
 
     /**
      * 鍒ゆ柇鏄惁涓烘繁搴撲綅
@@ -92,6 +136,13 @@
         return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
     }
 
+    public static void main(String[] args) {
+        SlaveProperties slaveProperties = new SlaveProperties();
+        slaveProperties.setDoubleDeep(true);
+        slaveProperties.setGroupCount(2);
+        System.out.println(getDeepLoc(slaveProperties, "3100101"));
+    }
+
     /**
      * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
      */
@@ -109,7 +160,7 @@
         int targetRow;
         if (remainder == 2) {
             targetRow = row - 1;
-        } else if (remainder == 3) {
+        } else if (remainder == 1) {
             targetRow = row + 1;
         } else {
             throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
@@ -125,7 +176,7 @@
         int targetRow;
         if (remainder == 2) {
             targetRow = shallowRow - 1;
-        } else if (remainder == 3) {
+        } else if (remainder == 1) {
             targetRow = shallowRow + 1;
         } else {
             throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
@@ -142,6 +193,34 @@
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
+
+    /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
+     */
+    public static int getBay(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Integer.parseInt(locNo.substring(2, 5));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
+    /**
+     * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
+     */
+    public static int getLev(String locNo) {
+        if (!Cools.isEmpty(locNo)) {
+            return Integer.parseInt(locNo.substring(5, 7));
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
+    /**
+     * 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
+     */
+    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);
+    }
+
 
     /**
      * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
@@ -161,15 +240,8 @@
 
     }
 
-    public static void main(String[] args) {
-        SlaveProperties slaveProperties = new SlaveProperties();
-        slaveProperties.setDoubleDeep(true);
-        List<Integer> list = new ArrayList<>();
-        list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
-        slaveProperties.setDoubleLocs(list);
-        slaveProperties.setGroupCount(4);
-        Integer deepRow = getDeepRow(slaveProperties, 6);
-        System.out.println(deepRow);
-
+    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);
     }
+
 }

--
Gitblit v1.9.1