From ccc33d62a39aeb49751de7d4c833795db459091b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 14:58:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |  149 ++++++++++++++++++-------------------------------
 1 files changed, 56 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 43b62ce..e461afe 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,13 +3,12 @@
 import com.core.common.Arith;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocMast;
 import com.zy.core.model.CrnSlave;
 import com.zy.core.properties.SlaveProperties;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by vincent on 2020/8/27
@@ -58,93 +57,6 @@
             s = 1;
         }
         return crnNo == 1 ? s : 3 - s;
-    }
-
-
-
-
-    //杞崲wms浼犺緭鐨勫簱浣嶅彿
-    public static String getWcsLocNo(String locNo){
-        String[] split = locNo.split("-");
-        int[] wcsRow = getWcsRow(split[0]);
-        int[] ints = null;
-        if (split[3].equals("01")){
-            ints = Arrays.copyOfRange(wcsRow, 0, (wcsRow.length+2-1) / 2);
-            if (split[4].equals("01")){
-                if (ints.length<2){
-
-                }else {
-                    ints = Arrays.copyOfRange(ints, ints.length / 2, ints.length);
-                }
-            }else {
-                if (ints.length<2){
-
-                }else {
-                    ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
-                }
-            }
-        }else {
-            ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2-1,wcsRow.length-1 );
-            if (split[4].equals("01")){
-                if (ints.length<2){
-
-                }else {
-                    ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
-                }
-            }else {
-                if (ints.length<2){
-
-                }else {
-                    ints = Arrays.copyOfRange(ints, ints.length / 2, ints.length);
-                }
-
-
-            }
-        }
-        int i = ints[0];
-        String wcsLocNo = "";
-        Integer bay = Integer.parseInt(split[1])+1;
-        String bay2 = "";
-        if (bay>9){
-            bay2 = bay.toString();
-        }else {
-            bay2 = "0"+bay;
-        }
-        if (i>9){
-            wcsLocNo = i+"0"+bay2+split[2];
-        }else {
-            wcsLocNo = "0"+i+"0"+bay2+split[2];
-        }
-
-
-
-        return wcsLocNo;
-    }
-    public static int[] getWcsRow(String row){
-        int[] array = null;
-        switch (row){
-            case "01":
-                 array= new int[]{1, 2, 3, 4};
-                break;
-            case "02":
-                 array= new int[]{5,6};
-                break;
-            case "03":
-                 array= new int[]{7,8,9,10};
-                break;
-            case "04":
-                 array= new int[]{11,12,13,14};
-                break;
-            case "05":
-                 array= new int[]{15,16,17,18};
-                break;
-            case "06":
-                 array= new int[]{19,20,21};
-                break;
-            default:
-
-        }
-        return array;
     }
 
     public static float scale(Float f){
@@ -224,9 +136,18 @@
      */
     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 remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+        int shallowRow  = getShallowRow(row);
         return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+    }
+    public static int getShallowRow(Integer row){
+        Map<Integer, Integer> map = new HashMap<>();
+        map.put(1,2);map.put(4,3);
+        map.put(7,8);map.put(10,9);
+        map.put(11,12);map.put(14,13);
+        map.put(15,16);map.put(18,17);
+        map.put(19,20);
+        return map.get(row);
     }
 
     /**
@@ -374,7 +295,49 @@
 //        slaveProperties.setGroupCount(4);
 //        Integer deepRow = getDeepRow(slaveProperties, 6);
 //        System.out.println(deepRow);
+    }
 
-        System.out.println(getWmsLocNo("1900201"));
+    public static Integer StaNoCrnNo(Integer staNo) {
+        switch (staNo){
+            case 100:
+            case 101:
+                return 1;
+            case 102:
+            case 103:
+                return 2;
+            case 104:
+            case 105:
+                return 3;
+            case 106:
+            case 107:
+                return 4;
+            default:
+                return 0;
+        }
+    }
+
+    public static boolean locNoRowBoolean(Integer row) {
+        switch (row){
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+            case 8:
+            case 9:
+            case 11:
+            case 12:
+                return true;
+            case 3:
+            case 6:
+            case 7:
+            case 10:
+            case 13:
+            default:
+                return false;
+        }
+    }
+
+    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