From f4a02e646e174cb6d134286d30ac75120bc6e972 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 14:15:46 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/utils/Utils.java             |   50 +++++++++++++++---------
 src/main/java/com/zy/common/service/CommonService.java |   33 ++++++++++++----
 src/main/resources/application.yml                     |    2 
 3 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 74b2f70..762b1ec 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -8,17 +8,10 @@
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.entity.RowLastno;
 import com.zy.asrs.service.RowLastnoService;
-import com.zy.common.CodeBuilder;
-import com.zy.common.model.LocDetlDto;
 import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
-import com.zy.system.service.UserService;
-
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -123,8 +116,8 @@
      */
     public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
         int row = getRow(deepLoc);
-        boolean deepLocLeft = isDeepLoc(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
-        int shallowRow = deepLocLeft? (row + 1) : (row - 1);
+        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+        int shallowRow = deepLocLeft ? (row + 1) : (row - 1);
         return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
     }
 
@@ -133,10 +126,28 @@
      */
     public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
         int row = getRow(shallowLoc);
-        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
-        int shallowRow = deepLocLeft? (row - 1) : (row + 1);
+        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row - 1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+        int shallowRow = deepLocLeft ? (row - 1) : (row + 1);
         return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
     }
+
+    /**
+     * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿,濡傛灉娌℃湁娣卞簱浣嶏紝鍒欒繑鍥炰负绌�
+     */
+    public static String getDeepLoc2(SlaveProperties slaveProperties, String shallowLoc) {
+        int row = getRow(shallowLoc);
+        boolean deepLocLeft = isDeepLoc(slaveProperties, row);//鍒ゆ柇鏄惁涓烘繁搴撲綅
+        if (!deepLocLeft) {
+            return null;
+        }
+        //4,7,11,15,19,23
+        if (row == 4 || row == 7 || row == 11 || row == 15 || row == 19 || row == 23) {
+            return zerofill(String.valueOf(row + 1), 2) + shallowLoc.substring(2);
+        } else {
+            return zerofill(String.valueOf(row - 1), 2) + shallowLoc.substring(2);
+        }
+    }
+
 
     /**
      * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
@@ -151,8 +162,8 @@
      * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
      */
     public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
-        boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
-        return deepLocLeft? (shallowRow - 1) : (shallowRow + 1);
+        boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow - 1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+        return deepLocLeft ? (shallowRow - 1) : (shallowRow + 1);
     }
 
     /**
@@ -464,6 +475,7 @@
 
         return necessaryParameters;
     }
+
     //鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
     public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
         int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -473,7 +485,7 @@
         necessaryParameters[0] = crnNumber; // 杞娆℃暟
         curRow = curRow - offset;
         //婊℃澘姝e父鍏ュ簱
-        switch (curRow){
+        switch (curRow) {
             case 1:
                 necessaryParameters[1] = 4;    //curRow   鏈�娣卞簱浣嶆帓
                 necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
@@ -519,7 +531,7 @@
         Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
         necessaryParameters[0] = crnNumber; // 杞娆℃暟
         //婊℃澘姝e父鍏ュ簱
-        if (curRow.equals(rowLastno.geteRow())){
+        if (curRow.equals(rowLastno.geteRow())) {
             necessaryParameters[1] = sRow;    //curRow   鏈�娣卞簱浣嶆帓
             necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
             necessaryParameters[3] = sRow;    //nearRow  鏈�娴呭簱浣嶆帓
@@ -594,12 +606,12 @@
     // 澶栦晶鏂瑰悜鐨勮揣浣�  浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
     public static List<String> getGroupOutLocCrn(Integer curRow, Integer nearRow, String locNo, boolean pakin) {
         List<String> result = new ArrayList<>();
-        if (pakin){
-            for (int row = curRow;row>=nearRow;row--){
+        if (pakin) {
+            for (int row = curRow; row >= nearRow; row--) {
                 result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
             }
-        }else {
-            for (int row = curRow;row<=nearRow;row++){
+        } else {
+            for (int row = curRow; row <= nearRow; row++) {
                 result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
             }
         }
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index aa8979c..e0d6b54 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -235,7 +235,12 @@
                 //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
                 crnNo = 1;
                 if (basCrnpService.checkSiteError(crnNo, true)) {
-                    List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+                    List<Integer> nearRowList = new ArrayList<Integer>() {{
+                        add(4);
+                        add(6);
+                        add(3);
+                        add(1);
+                    }};
                     for (Integer near : nearRowList) {
                         List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                 .eq("row1", near)
@@ -247,7 +252,7 @@
                         int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
                         if (locMasts.size() - crnCountO <= 2) {
                             log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
-                        }else {
+                        } else {
                             nearRow = near;
                             break;
                         }
@@ -261,7 +266,12 @@
                 //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
                 crnNo = 1;
                 if (basCrnpService.checkSiteError(crnNo, true)) {
-                    List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+                    List<Integer> nearRowList = new ArrayList<Integer>() {{
+                        add(4);
+                        add(6);
+                        add(3);
+                        add(1);
+                    }};
                     for (Integer near : nearRowList) {
                         List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                 .eq("row1", near)
@@ -273,7 +283,7 @@
                         int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
                         if (locMasts.size() - crnCountO <= 2) {
                             log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
-                        }else {
+                        } else {
                             nearRow = near;
                             break;
                         }
@@ -283,7 +293,7 @@
                 if (nearRow == 0) {
                     throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
                 }
-            }else {
+            } else {
                 throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
             }
         }
@@ -347,7 +357,7 @@
                                     .eq("loc_no", shallowLoc)
                                     .eq("loc_sts", "O")
                             );
-                            if(shallowLocMast != null) {
+                            if (shallowLocMast != null) {
                                 locMast = shallowLocMast;
                                 break;
                             }
@@ -554,9 +564,16 @@
         if (crnNo == 1) {
             configService.updateValue("123CrnSearchList", String.valueOf(0));
         }
-
+        //閽堝1鍙峰爢鍨涙満鎵撶殑琛ヤ竵锛岄槻姝㈡壘鍒板簱浣嶆椂锛屾壘鍒版渶娴呭簱浣�
+        String deepLoc2 = Utils.getDeepLoc2(slaveProperties, locMast.getLocNo());
+        if (!Cools.isEmpty(deepLoc2)) {
+            LocMast locMastNew = locMastService.selectOne(new EntityWrapper<LocMast>()
+                    .eq("loc_no", deepLoc2).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+            if (!Cools.isEmpty(locMastNew)) {
+                locMast = locMastNew;
+            }
+        }
         String locNo = locMast.getLocNo();
-
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = getWorkNo(0);
         // 杩斿洖dto
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 836b4dc..e4ee716 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -70,7 +70,7 @@
   # 宸︽繁搴撲綅鎺掑彿
   doubleLocsLeft: 4,7,11,15,19,23
   # 鍙虫繁搴撲綅鎺掑彿
-  doubleLocsRight: 3,7,10,14,18,22,26
+  doubleLocsRight: 3,10,14,18,22,26
 # wms鍙傛暟閰嶇疆
 wms-parameter:
   # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�

--
Gitblit v1.9.1