From 27c184d7af2775a4d647348ee508f4de335df8fb Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 11 三月 2026 15:28:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java | 2003 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 1,839 insertions(+), 164 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 29bb377..59f9d0c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,12 +3,16 @@
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Arith;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
+import com.zy.asrs.entity.result.KeyValueVo;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
 import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.entity.Parameter;
 import com.zy.common.model.LocTypeDto;
 import com.zy.common.model.Shelves;
 import com.zy.common.model.StartupDto;
@@ -18,7 +22,16 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 璐ф灦鏍稿績鍔熻兘
@@ -27,6 +40,7 @@
 @Slf4j
 @Service
 public class CommonService {
+    private static final int MIN_SPARE_LOC_COUNT = 2;
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -34,6 +48,8 @@
     private WrkLastnoService wrkLastnoService;
     @Autowired
     private RowLastnoService rowLastnoService;
+    @Autowired
+    private RowLastnoTypeService rowLastnoTypeService;
     @Autowired
     private BasCrnpService basCrnpService;
     @Autowired
@@ -46,10 +62,13 @@
     private LocDetlService locDetlService;
     @Autowired
     private SlaveProperties slaveProperties;
+    @Autowired
+    private WrkDetlService wrkDetlService;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
-     * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
+     *
+     * @param wrkMk
      * @return workNo(宸ヤ綔鍙�)
      */
     public int getWorkNo(Integer wrkMk) {
@@ -61,17 +80,17 @@
         int workNo = wrkLastno.getWrkNo();
         int sNo = wrkLastno.getSNo();
         int eNo = wrkLastno.getENo();
-        workNo = workNo>=eNo ? sNo : workNo+1;
+        workNo = workNo >= eNo ? sNo : workNo + 1;
         while (true) {
             WrkMast wrkMast = wrkMastService.selectById(workNo);
             if (null != wrkMast) {
-                workNo = workNo>=eNo ? sNo : workNo+1;
+                workNo = workNo >= eNo ? sNo : workNo + 1;
             } else {
                 break;
             }
         }
         // 淇敼搴忓彿璁板綍
-        if (workNo > 0){
+        if (workNo > 0) {
             wrkLastno.setWrkNo(workNo);
             wrkLastnoService.updateById(wrkLastno);
         }
@@ -79,65 +98,1071 @@
         if (workNo == 0) {
             throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
         } else {
-            if (wrkMastService.selectById(workNo)!=null) {
+            if (wrkMastService.selectById(workNo) != null) {
                 throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
             }
         }
         return workNo;
     }
 
+    //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+    @Transactional
+    public StartupDto getScanBarcodeEmptyBoard() {
+        StartupDto startupDto = new StartupDto();
+        Integer staNo = 0;
+        if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216)) < 2) {
+            staNo = 216;
+        }
+        if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220)) < 2) {
+            staNo = 220;
+        }
+
+        startupDto.setStaNo(staNo);
+        return startupDto;
+    }
+
     /**
      * 妫�绱㈠簱浣嶅彿
-     * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
-     * @param staDescId 璺緞宸ヤ綔绫诲瀷
-     * @param sourceStaNo 婧愮珯
-     * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+     *
+     * @param staDescId            璺緞ID
+     * @param sourceStaNo          婧愮珯
+     * @param findLocNoAttributeVo 灞炴��
+     * @param locTypeDto           绫诲瀷
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     @Transactional
-    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
-        StartupDto startupDto = new StartupDto();
-        // 鐢熸垚宸ヤ綔鍙�
-        int workNo = getWorkNo(0);
+    public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+        return getLocNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto, null);
+    }
 
-        switch (sourceStaNo) {
-            case 202:
-                whsType = 2;
+    @Transactional
+    public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto, List<Integer> recommendRows) {
+        try {
+            Integer whsType = Utils.GetWhsType(sourceStaNo);
+            RowLastno rowLastno = rowLastnoService.selectById(whsType);
+            RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+            Integer preferredArea = resolvePreferredArea(sourceStaNo, findLocNoAttributeVo);
+            if (preferredArea != null) {
+                findLocNoAttributeVo.setOutArea(preferredArea);
+            }
+
+            /**
+             * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱  2: 骞冲簱  3: 绌挎鏉�  4: 鍥涘悜杞�  5: AGV  0: 鏈煡
+             */
+            switch (rowLastnoType.getType()) {
+                case 1:
+                case 2:
+                    return getLocNoRun2(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, recommendRows, 0);
+                case 3:
+                    return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+                case 4:
+                    return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
+                case 5:
+                    return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, recommendRows, 0);
+                default:
+                    throw new CoolException("绔欑偣=" + sourceStaNo + " 鏈煡璇㈠埌瀵瑰簲鐨勫簱浣嶈鍒�");
+            }
+        } catch (CoolException e) {
+            log.error("绔欑偣={} 鏌ユ壘搴撲綅澶辫触: {}", sourceStaNo, e.getMessage(), e);
+            throw e;
+        } catch (Exception e) {
+            log.error("绔欑偣={} 鏌ユ壘搴撲綅寮傚父", sourceStaNo, e);
+            throw new CoolException("绔欑偣=" + sourceStaNo + " 鏌ユ壘搴撲綅澶辫触");
+        }
+    }
+
+    private Integer resolvePreferredArea(Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo) {
+        BasDevp sourceStation = basDevpService.selectById(sourceStaNo);
+        Integer stationArea = parseArea(sourceStation == null ? null : sourceStation.getArea());
+        if (stationArea != null) {
+            return stationArea;
+        }
+        Integer requestArea = findLocNoAttributeVo.getOutArea();
+        if (requestArea != null && requestArea >= 1 && requestArea <= 3) {
+            return requestArea;
+        }
+        return null;
+    }
+
+    private Integer parseArea(String area) {
+        if (Cools.isEmpty(area)) {
+            return null;
+        }
+        String normalized = area.trim();
+        if (normalized.isEmpty()) {
+            return null;
+        }
+        try {
+            int areaNo = Integer.parseInt(normalized);
+            return areaNo >= 1 && areaNo <= 3 ? areaNo : null;
+        } catch (NumberFormatException ignored) {
+        }
+        String upper = normalized.toUpperCase(Locale.ROOT);
+        if ("A".equals(upper) || "A鍖�".equals(upper) || "A搴�".equals(upper) || "A搴撳尯".equals(upper)) {
+            return 1;
+        }
+        if ("B".equals(upper) || "B鍖�".equals(upper) || "B搴�".equals(upper) || "B搴撳尯".equals(upper)) {
+            return 2;
+        }
+        if ("C".equals(upper) || "C鍖�".equals(upper) || "C搴�".equals(upper) || "C搴撳尯".equals(upper)) {
+            return 3;
+        }
+        return null;
+    }
+
+    private String getAgvAreaRowsConfig(Integer area) {
+        Parameter parameter = Parameter.get();
+        if (parameter == null || area == null) {
+            return null;
+        }
+        switch (area) {
+            case 1:
+                return parameter.getAgvArea1Rows();
+            case 2:
+                return parameter.getAgvArea2Rows();
+            case 3:
+                return parameter.getAgvArea3Rows();
+            default:
+                return null;
+        }
+    }
+
+    private List<Integer> getAgvAreaRows(Integer area, RowLastno rowLastno) {
+        List<Integer> configuredRows = parseAgvRows(getAgvAreaRowsConfig(area), rowLastno);
+        if (!configuredRows.isEmpty()) {
+            return configuredRows;
+        }
+        return getLegacyAgvRows(rowLastno);
+    }
+
+    private List<Integer> getAgvFallbackRows(RowLastno rowLastno) {
+        LinkedHashSet<Integer> rows = new LinkedHashSet<>();
+        for (int area = 1; area <= 3; area++) {
+            rows.addAll(parseAgvRows(getAgvAreaRowsConfig(area), rowLastno));
+        }
+        rows.addAll(getLegacyAgvRows(rowLastno));
+        return new ArrayList<>(rows);
+    }
+
+    private List<Integer> parseAgvRows(String configValue, RowLastno rowLastno) {
+        List<Integer> rows = new ArrayList<>();
+        if (rowLastno == null || Cools.isEmpty(configValue)) {
+            return rows;
+        }
+        LinkedHashSet<Integer> orderedRows = new LinkedHashSet<>();
+        String normalized = configValue.replace("锛�", ",")
+                .replace("锛�", ";")
+                .replace("銆�", ",")
+                .replaceAll("\\s+", "");
+        if (normalized.isEmpty()) {
+            return rows;
+        }
+        for (String segment : normalized.split("[,;]")) {
+            if (segment == null || segment.isEmpty()) {
+                continue;
+            }
+            if (segment.contains("-")) {
+                String[] rangeParts = segment.split("-", 2);
+                Integer startRow = safeParseInt(rangeParts[0]);
+                Integer endRow = safeParseInt(rangeParts[1]);
+                if (startRow == null || endRow == null) {
+                    continue;
+                }
+                int step = startRow <= endRow ? 1 : -1;
+                for (int row = startRow; step > 0 ? row <= endRow : row >= endRow; row += step) {
+                    addAgvRow(orderedRows, row, rowLastno);
+                }
+                continue;
+            }
+            addAgvRow(orderedRows, safeParseInt(segment), rowLastno);
+        }
+        rows.addAll(orderedRows);
+        return rows;
+    }
+
+    private List<Integer> getLegacyAgvRows(RowLastno rowLastno) {
+        List<Integer> rows = new ArrayList<>();
+        if (rowLastno == null) {
+            return rows;
+        }
+        LinkedHashSet<Integer> orderedRows = new LinkedHashSet<>();
+        int startRow = Math.min(38, rowLastno.geteRow());
+        int endRow = Math.max(32, rowLastno.getsRow());
+        if (startRow >= endRow) {
+            for (int row = startRow; row >= endRow; row--) {
+                addAgvRow(orderedRows, row, rowLastno);
+            }
+        } else {
+            for (int row = rowLastno.geteRow(); row >= rowLastno.getsRow(); row--) {
+                addAgvRow(orderedRows, row, rowLastno);
+            }
+        }
+        rows.addAll(orderedRows);
+        return rows;
+    }
+
+    private void addAgvRow(LinkedHashSet<Integer> rows, Integer row, RowLastno rowLastno) {
+        if (rows == null || row == null || rowLastno == null) {
+            return;
+        }
+        if (row < rowLastno.getsRow() || row > rowLastno.geteRow()) {
+            return;
+        }
+        rows.add(row);
+    }
+
+    private Integer safeParseInt(String value) {
+        if (Cools.isEmpty(value)) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(value.trim());
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+    }
+
+    private int[] getAgvAreaBayRange(Integer area) {
+        if (area == null) {
+            return new int[]{1, 19};
+        }
+        switch (area) {
+            case 1:
+                return new int[]{1, 12};
+            case 2:
+                return new int[]{13, 36};
+            case 3:
+                return new int[]{37, 56};
+            default:
+                return new int[]{1, 56};
+        }
+    }
+
+    private LocMast findAgvLocByRows(RowLastno rowLastno, RowLastnoType rowLastnoType, List<Integer> rows,
+                                     int startBay, int endBay, int curRow, int nearRow,
+                                     LocTypeDto locTypeDto, boolean useDeepCheck) {
+        for (Integer row : rows) {
+            if (row == null) {
+                continue;
+            }
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("row1", row)
+                    .ge("bay1", startBay)
+                    .le("bay1", endBay)
+                    .eq("loc_sts", "O")
+                    .eq("loc_type1", locTypeDto.getLocType1())
+                    .orderBy("lev1", true)
+                    .orderBy("bay1", true));
+            for (LocMast candidate : locMasts) {
+                if (!VersionUtils.locMoveCheckLocTypeComplete(candidate, locTypeDto)) {
+                    continue;
+                }
+                if (useDeepCheck) {
+                    if (!Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                        continue;
+                    }
+                    LocMast deepLoc = locMastService.selectLocByLocStsPakInO(curRow, nearRow, candidate, rowLastnoType.getType().longValue());
+                    if (!Cools.isEmpty(deepLoc) && deepLoc.getRow1() == curRow) {
+                        return deepLoc;
+                    }
+                    continue;
+                }
+                return candidate;
+            }
+        }
+        return null;
+    }
+    private String getRun2AreaRowsConfig(Integer area) {
+        Parameter parameter = Parameter.get();
+        if (parameter == null || area == null) {
+            return null;
+        }
+        String run2Config;
+        switch (area) {
+            case 1:
+                run2Config = parameter.getRun2Area1Rows();
                 break;
-            case 205:
-                whsType = 1;
+            case 2:
+                run2Config = parameter.getRun2Area2Rows();
                 break;
-            case 126:
-                whsType = 3;
-                break;
-            case 110:
-                whsType = 4;
-                break;
-            case 301:
-                whsType = 5;
+            case 3:
+                run2Config = parameter.getRun2Area3Rows();
                 break;
             default:
-                throw new CoolException("搴撲綅鎺掑彿鍒嗛厤閿欒, 婧愮珯鍙凤細" + sourceStaNo);
+                return null;
         }
+        return Cools.isEmpty(run2Config) ? getAgvAreaRowsConfig(area) : run2Config;
+    }
+
+    private List<Integer> getRun2AreaRows(Integer area, RowLastno rowLastno) {
+        List<Integer> configuredRows = parseAgvRows(getRun2AreaRowsConfig(area), rowLastno);
+        if (!configuredRows.isEmpty()) {
+            return configuredRows;
+        }
+        return getLegacyAgvRows(rowLastno);
+    }
+
+    private List<Integer> getRun2FallbackRows(RowLastno rowLastno) {
+        LinkedHashSet<Integer> rows = new LinkedHashSet<>();
+        for (int area = 1; area <= 3; area++) {
+            rows.addAll(parseAgvRows(getRun2AreaRowsConfig(area), rowLastno));
+        }
+        rows.addAll(getLegacyAgvRows(rowLastno));
+        return new ArrayList<>(rows);
+    }
+
+    private Integer resolveRun2CrnNo(RowLastno rowLastno) {
+        if (rowLastno == null) {
+            return null;
+        }
+        Integer currentRow = rowLastno.getCurrentRow();
+        Integer rowSpan = getCrnRowSpan(rowLastno.getTypeId());
+        if (rowSpan == null || rowSpan <= 0) {
+            rowSpan = 2;
+        }
+        int startRow = rowLastno.getsRow() == null ? 1 : rowLastno.getsRow();
+        int startCrnNo = rowLastno.getsCrnNo() == null ? 1 : rowLastno.getsCrnNo();
+        if (currentRow == null) {
+            return startCrnNo;
+        }
+        int offset = Math.max(currentRow - startRow, 0) / rowSpan;
+        int crnNo = startCrnNo + offset;
+        Integer endCrnNo = rowLastno.geteCrnNo();
+        if (endCrnNo != null && crnNo > endCrnNo) {
+            return startCrnNo;
+        }
+        return crnNo;
+    }
+
+    private int getNextRun2CurrentRow(RowLastno rowLastno, int currentRow) {
+        Integer rowSpan = getCrnRowSpan(rowLastno.getTypeId());
+        if (rowSpan == null || rowSpan <= 0) {
+            rowSpan = 2;
+        }
+        int startRow = rowLastno.getsRow() == null ? 1 : rowLastno.getsRow();
+        int endRow = rowLastno.geteRow() == null ? currentRow : rowLastno.geteRow();
+        int lastStartRow = Math.max(startRow, endRow - rowSpan + 1);
+        if (currentRow >= lastStartRow) {
+            return startRow;
+        }
+        return currentRow + rowSpan;
+    }
+
+    private List<Integer> getOrderedCrnNos(RowLastno rowLastno, Integer startCrnNo) {
+        List<Integer> orderedCrnNos = new ArrayList<>();
+        if (rowLastno == null) {
+            return orderedCrnNos;
+        }
+        int start = rowLastno.getsCrnNo() == null ? 1 : rowLastno.getsCrnNo();
+        int end = rowLastno.geteCrnNo() == null ? start + rowLastno.getCrnQty() - 1 : rowLastno.geteCrnNo();
+        int first = startCrnNo == null ? start : startCrnNo;
+        if (first < start || first > end) {
+            first = start;
+        }
+        for (int crnNo = first; crnNo <= end; crnNo++) {
+            orderedCrnNos.add(crnNo);
+        }
+        for (int crnNo = start; crnNo < first; crnNo++) {
+            orderedCrnNos.add(crnNo);
+        }
+        return orderedCrnNos;
+    }
+
+    private List<Integer> filterCrnNosByRows(RowLastno rowLastno, List<Integer> orderedCrnNos, List<Integer> rows) {
+        if (Cools.isEmpty(rows)) {
+            return new ArrayList<>(orderedCrnNos);
+        }
+        LinkedHashSet<Integer> rowSet = new LinkedHashSet<>(rows);
+        List<Integer> result = new ArrayList<>();
+        Integer rowSpan = getCrnRowSpan(rowLastno.getTypeId());
+        if (rowSpan == null || rowSpan <= 0) {
+            rowSpan = 2;
+        }
+        int startCrnNo = rowLastno.getsCrnNo() == null ? 1 : rowLastno.getsCrnNo();
+        int startRow = rowLastno.getsRow() == null ? 1 : rowLastno.getsRow();
+        int endRow = rowLastno.geteRow() == null ? Integer.MAX_VALUE : rowLastno.geteRow();
+        for (Integer crnNo : orderedCrnNos) {
+            if (crnNo == null || crnNo < startCrnNo) {
+                continue;
+            }
+            int crnOffset = crnNo - startCrnNo;
+            int crnStartRow = startRow + crnOffset * rowSpan;
+            for (int row = crnStartRow; row < crnStartRow + rowSpan && row <= endRow; row++) {
+                if (rowSet.contains(row)) {
+                    result.add(crnNo);
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    private List<Integer> mapRowsToCrnNos(RowLastno rowLastno, List<Integer> rows) {
+        List<Integer> result = new ArrayList<>();
+        if (rowLastno == null || Cools.isEmpty(rows)) {
+            return result;
+        }
+        LinkedHashSet<Integer> orderedCrnNos = new LinkedHashSet<>();
+        Integer rowSpan = getCrnRowSpan(rowLastno.getTypeId());
+        if (rowSpan == null || rowSpan <= 0) {
+            rowSpan = 2;
+        }
+        int startCrnNo = rowLastno.getsCrnNo() == null ? 1 : rowLastno.getsCrnNo();
+        int endCrnNo = rowLastno.geteCrnNo() == null ? startCrnNo + rowLastno.getCrnQty() - 1 : rowLastno.geteCrnNo();
+        int startRow = rowLastno.getsRow() == null ? 1 : rowLastno.getsRow();
+        int endRow = rowLastno.geteRow() == null ? Integer.MAX_VALUE : rowLastno.geteRow();
+        for (Integer row : rows) {
+            if (row == null || row < startRow || row > endRow) {
+                continue;
+            }
+            int crnNo = startCrnNo + (row - startRow) / rowSpan;
+            if (crnNo >= startCrnNo && crnNo <= endCrnNo) {
+                orderedCrnNos.add(crnNo);
+            }
+        }
+        result.addAll(orderedCrnNos);
+        return result;
+    }
+
+    private Integer resolveTargetStaNo(RowLastno rowLastno, Integer staDescId, Integer sourceStaNo, Integer crnNo) {
+        if (!Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+            return null;
+        }
+        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+                .eq("type_no", staDescId)
+                .eq("stn_no", sourceStaNo)
+                .eq("crn_no", crnNo));
+        if (Cools.isEmpty(staDesc)) {
+            log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+            return null;
+        }
+        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+        if (Cools.isEmpty(staNo) || !"Y".equals(staNo.getAutoing())) {
+            log.error("鐩爣绔檣}涓嶅彲鐢�", staDesc.getCrnStn());
+            return null;
+        }
+        return staNo.getDevNo();
+    }
+
+    private void logRun2NoMatch(String stage, Integer sourceStaNo, Integer preferredArea, List<Integer> candidateCrnNos,
+                                LocTypeDto locTypeDto, List<Integer> crnErrorCrns, List<Integer> routeBlockedCrns,
+                                List<Integer> noEmptyCrns, List<Integer> locTypeBlockedCrns) {
+        log.warn("run2 no location. stage={}, sourceStaNo={}, preferredArea={}, candidateCrnNos={}, crnErrorCrns={}, routeBlockedCrns={}, noEmptyCrns={}, locTypeBlockedCrns={}, spec={}",
+                stage, sourceStaNo, preferredArea, candidateCrnNos, crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns,
+                JSON.toJSONString(locTypeDto));
+    }
+
+    private LocMast findRun2EmptyLocByCrnNos(RowLastno rowLastno, RowLastnoType rowLastnoType, List<Integer> candidateCrnNos,
+                                             LocTypeDto locTypeDto, Integer staDescId, Integer sourceStaNo, StartupDto startupDto,
+                                             Integer preferredArea, String stage) {
+        if (Cools.isEmpty(candidateCrnNos)) {
+            log.warn("run2 skip empty candidate list. stage={}, sourceStaNo={}, preferredArea={}, spec={}",
+                    stage, sourceStaNo, preferredArea, JSON.toJSONString(locTypeDto));
+            return null;
+        }
+        List<Integer> crnErrorCrns = new ArrayList<>();
+        List<Integer> routeBlockedCrns = new ArrayList<>();
+        List<Integer> noEmptyCrns = new ArrayList<>();
+        List<Integer> locTypeBlockedCrns = new ArrayList<>();
+        for (Integer candidateCrnNo : candidateCrnNos) {
+            if (candidateCrnNo == null || !basCrnpService.checkSiteError(candidateCrnNo, true)) {
+                crnErrorCrns.add(candidateCrnNo);
+                continue;
+            }
+            Integer targetStaNo = resolveTargetStaNo(rowLastno, staDescId, sourceStaNo, candidateCrnNo);
+            if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && targetStaNo == null) {
+                routeBlockedCrns.add(candidateCrnNo);
+                continue;
+            }
+            Wrapper<LocMast> openWrapper = new EntityWrapper<LocMast>()
+                    .eq("crn_no", candidateCrnNo)
+                    .eq("loc_sts", "O")
+                    .eq("loc_type1", locTypeDto.getLocType1())
+                    .orderBy("lev1")
+                    .orderBy("bay1");
+            LocMast anyOpenLoc = locMastService.selectOne(openWrapper);
+            if (Cools.isEmpty(anyOpenLoc)) {
+                noEmptyCrns.add(candidateCrnNo);
+                continue;
+            }
+            Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
+                    .eq("crn_no", candidateCrnNo)
+                    .eq("loc_sts", "O")
+                    .eq("loc_type1", locTypeDto.getLocType1())
+                    .orderBy("lev1")
+                    .orderBy("bay1");
+            if (locTypeDto != null && locTypeDto.getLocType1() != null) {
+                wrapper.eq("loc_type1", locTypeDto.getLocType1());
+            }
+            LocMast candidateLoc = locMastService.selectOne(wrapper);
+            if (Cools.isEmpty(candidateLoc) || (locTypeDto != null && !VersionUtils.locMoveCheckLocTypeComplete(candidateLoc, locTypeDto))) {
+                locTypeBlockedCrns.add(candidateCrnNo);
+                continue;
+            }
+            if (targetStaNo != null) {
+                startupDto.setStaNo(targetStaNo);
+            }
+            return candidateLoc;
+        }
+        logRun2NoMatch(stage, sourceStaNo, preferredArea, candidateCrnNos, locTypeDto, crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+        return null;
+    }
+    private LocMast findRun2EmptyLocByCrnLocTypeEntries(RowLastno rowLastno, RowLastnoType rowLastnoType,
+                                                        List<Map<String, Integer>> crnLocTypeEntries, LocTypeDto locTypeDto,
+                                                        Integer staDescId, Integer sourceStaNo, StartupDto startupDto,
+                                                        Integer preferredArea, String stage) {
+        if (Cools.isEmpty(crnLocTypeEntries)) {
+            log.warn("run2 skip empty crn-locType list. stage={}, sourceStaNo={}, preferredArea={}, spec={}",
+                    stage, sourceStaNo, preferredArea, JSON.toJSONString(locTypeDto));
+            return null;
+        }
+        List<Integer> candidateCrnNos = extractCrnNos(crnLocTypeEntries);
+        List<Integer> crnErrorCrns = new ArrayList<>();
+        List<Integer> routeBlockedCrns = new ArrayList<>();
+        List<Integer> noEmptyCrns = new ArrayList<>();
+        List<Integer> locTypeBlockedCrns = new ArrayList<>();
+        return findRun2EmptyLocByCrnLocTypeEntriesRecursively(rowLastno, rowLastnoType, crnLocTypeEntries, locTypeDto,
+                staDescId, sourceStaNo, startupDto, preferredArea, stage, 0, candidateCrnNos,
+                crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+    }
+
+    private LocMast findRun2EmptyLocByCrnLocTypeEntriesRecursively(RowLastno rowLastno, RowLastnoType rowLastnoType,
+                                                                   List<Map<String, Integer>> crnLocTypeEntries, LocTypeDto locTypeDto,
+                                                                   Integer staDescId, Integer sourceStaNo, StartupDto startupDto,
+                                                                   Integer preferredArea, String stage, int index,
+                                                                   List<Integer> candidateCrnNos, List<Integer> crnErrorCrns,
+                                                                   List<Integer> routeBlockedCrns, List<Integer> noEmptyCrns,
+                                                                   List<Integer> locTypeBlockedCrns) {
+        if (index >= crnLocTypeEntries.size()) {
+            logRun2NoMatch(stage, sourceStaNo, preferredArea, candidateCrnNos, locTypeDto, crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+            return null;
+        }
+        Map<String, Integer> crnLocTypeEntry = crnLocTypeEntries.get(index);
+        Integer candidateCrnNo = crnLocTypeEntry == null ? null : crnLocTypeEntry.get("crnNo");
+        Short candidateLocType1 = crnLocTypeEntry == null || crnLocTypeEntry.get("locType1") == null
+                ? null : crnLocTypeEntry.get("locType1").shortValue();
+        if (candidateCrnNo == null || !basCrnpService.checkSiteError(candidateCrnNo, true)) {
+            crnErrorCrns.add(candidateCrnNo);
+            return findRun2EmptyLocByCrnLocTypeEntriesRecursively(rowLastno, rowLastnoType, crnLocTypeEntries, locTypeDto,
+                    staDescId, sourceStaNo, startupDto, preferredArea, stage, index + 1, candidateCrnNos,
+                    crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+        }
+        Integer targetStaNo = resolveTargetStaNo(rowLastno, staDescId, sourceStaNo, candidateCrnNo);
+        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && targetStaNo == null) {
+            routeBlockedCrns.add(candidateCrnNo);
+            return findRun2EmptyLocByCrnLocTypeEntriesRecursively(rowLastno, rowLastnoType, crnLocTypeEntries, locTypeDto,
+                    staDescId, sourceStaNo, startupDto, preferredArea, stage, index + 1, candidateCrnNos,
+                    crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+        }
+        LocTypeDto searchLocTypeDto = buildRun2SearchLocTypeDto(locTypeDto, candidateLocType1);
+        LocMast candidateLoc = findRun2OrderedEmptyLocByCrnLocType(rowLastnoType, candidateCrnNo, candidateLocType1, searchLocTypeDto);
+        if (Cools.isEmpty(candidateLoc)) {
+            noEmptyCrns.add(candidateCrnNo);
+            return findRun2EmptyLocByCrnLocTypeEntriesRecursively(rowLastno, rowLastnoType, crnLocTypeEntries, locTypeDto,
+                    staDescId, sourceStaNo, startupDto, preferredArea, stage, index + 1, candidateCrnNos,
+                    crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+        }
+        if (searchLocTypeDto != null && !VersionUtils.locMoveCheckLocTypeComplete(candidateLoc, searchLocTypeDto)) {
+            locTypeBlockedCrns.add(candidateCrnNo);
+            return findRun2EmptyLocByCrnLocTypeEntriesRecursively(rowLastno, rowLastnoType, crnLocTypeEntries, locTypeDto,
+                    staDescId, sourceStaNo, startupDto, preferredArea, stage, index + 1, candidateCrnNos,
+                    crnErrorCrns, routeBlockedCrns, noEmptyCrns, locTypeBlockedCrns);
+        }
+        if (targetStaNo != null) {
+            startupDto.setStaNo(targetStaNo);
+        }
+        return candidateLoc;
+    }
+
+    private List<Integer> extractCrnNos(List<Map<String, Integer>> crnLocTypeEntries) {
+        LinkedHashSet<Integer> orderedCrnNos = new LinkedHashSet<>();
+        if (Cools.isEmpty(crnLocTypeEntries)) {
+            return new ArrayList<>();
+        }
+        for (Map<String, Integer> crnLocTypeEntry : crnLocTypeEntries) {
+            if (crnLocTypeEntry == null || crnLocTypeEntry.get("crnNo") == null) {
+                continue;
+            }
+            orderedCrnNos.add(crnLocTypeEntry.get("crnNo"));
+        }
+        return new ArrayList<>(orderedCrnNos);
+    }
+
+    private LocTypeDto buildRun2SearchLocTypeDto(LocTypeDto locTypeDto, Short candidateLocType1) {
+        if (locTypeDto == null && candidateLocType1 == null) {
+            return null;
+        }
+        LocTypeDto searchLocTypeDto = new LocTypeDto();
+        if (locTypeDto != null) {
+            searchLocTypeDto.setLocType1(locTypeDto.getLocType1());
+            searchLocTypeDto.setLocType2(locTypeDto.getLocType2());
+            searchLocTypeDto.setLocType3(locTypeDto.getLocType3());
+            searchLocTypeDto.setSiteId(locTypeDto.getSiteId());
+        }
+        if (candidateLocType1 != null) {
+            searchLocTypeDto.setLocType1(candidateLocType1);
+        }
+        return searchLocTypeDto;
+    }
+
+    private LocMast findRun2OrderedEmptyLocByCrnLocType(RowLastnoType rowLastnoType, Integer candidateCrnNo,
+                                                        Short candidateLocType1, LocTypeDto locTypeDto) {
+        if (candidateCrnNo == null) {
+            return null;
+        }
+        Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
+                .eq("crn_no", candidateCrnNo)
+                .eq("loc_sts", "O");
+        if (candidateLocType1 != null) {
+            wrapper.eq("loc_type1", candidateLocType1);
+        }
+        // 鍗曚几鍫嗗灈鏈烘寜灞傘�佸垪閫掑椤哄簭鎵剧涓�涓┖搴撲綅銆�
+        if (rowLastnoType != null && rowLastnoType.getType() != null && (rowLastnoType.getType() == 1 || rowLastnoType.getType() == 2)) {
+            wrapper.orderBy("lev1", true).orderBy("bay1", true);
+        } else {
+            wrapper.orderBy("lev1", true).orderBy("bay1", true);
+        }
+        LocMast candidateLoc = locMastService.selectOne(wrapper);
+        if (Cools.isEmpty(candidateLoc)) {
+            return null;
+        }
+        if (locTypeDto != null && !VersionUtils.locMoveCheckLocTypeComplete(candidateLoc, locTypeDto)) {
+            return null;
+        }
+        return candidateLoc;
+    }
+
+    private Optional<CrnRowInfo> findAvailableCrnAndNearRow(RowLastno rowLastno, int curRow, int crnNumber, int times,
+                                                            FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto,
+                                                            RowLastnoType rowLastnoType) {
+        int attempt = times;
+        while (attempt < crnNumber * 4) {
+            int[] params = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+            curRow = params[1];
+            int crnNo = params[2];
+//            if (!basCrnpService.checkSiteError(crnNo, true)) {
+//                attempt++;
+//                continue;
+//            }
+            int rowCount = params[0];
+            int nearRow = params[3];
+
+            // 鍙彇鏁伴噺鍒ゆ柇锛岄伩鍏嶆媺鏁� list
+            int availableLocCount = locMastService.selectCount(new EntityWrapper<LocMast>()
+                    .eq("row1", nearRow)
+                    .eq("loc_sts", "O")
+                    .eq("whs_type", 1));
+            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+                    .eq("crn_no", crnNo).le("io_type", 100));
+            if (availableLocCount - crnCountO <= 2) { // 鍙互鎻愭垚甯搁噺锛屾瘮濡� MIN_SPARE_SLOTS = 2
+                log.error("{}鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", crnNo, JSON.toJSONString(locTypeDto), attempt);
+                attempt++;
+                continue;
+            }
+            return Optional.of(new CrnRowInfo(crnNo, nearRow, curRow, rowCount, attempt));
+        }
+        return Optional.empty();
+    }
+
+    private Optional<CrnRowInfo> findBalancedCrnAndNearRow(RowLastno rowLastno, int curRow, int crnNumber, int times,
+                                                           FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto,
+                                                           RowLastnoType rowLastnoType) {
+        int maxScanTimes = Math.max(crnNumber * 2, 1);
+        int scanCurRow = curRow;
+        Map<Integer, Integer> availableLocCountCache = new HashMap<>();
+        Map<Integer, Integer> crnTaskCountCache = new HashMap<>();
+
+        CrnRowInfo bestInfo = null;
+        int bestTaskCount = Integer.MAX_VALUE;
+        int bestSpareLocCount = Integer.MIN_VALUE;
+        int bestOffset = Integer.MAX_VALUE;
+        CrnRowInfo fallbackInfo = null;
+        int fallbackTaskCount = Integer.MAX_VALUE;
+        int fallbackAvailableLocCount = Integer.MIN_VALUE;
+        int fallbackOffset = Integer.MAX_VALUE;
+
+        for (int attempt = 0; attempt < maxScanTimes; attempt++) {
+            int[] params = Utils.LocNecessaryParameters(rowLastno, scanCurRow, crnNumber);
+            scanCurRow = params[1];
+            int rowCount = params[0];
+            int crnNo = params[2];
+            int nearRow = params[3];
+
+            if (attempt < times) {
+                continue;
+            }
+
+            int availableLocCount = availableLocCountCache.computeIfAbsent(crnNo, key ->
+                    countAvailableLocForCrn(rowLastno, rowLastnoType, key, nearRow));
+            int crnTaskCount = crnTaskCountCache.computeIfAbsent(crnNo, key ->
+                    wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+                            .eq("crn_no", key)
+                            .le("io_type", 100)));
+            int spareLocCount = availableLocCount - crnTaskCount;
+            int offset = attempt - times;
+
+            if (availableLocCount > 0 && isBetterCrnCandidate(crnTaskCount, availableLocCount, offset,
+                    fallbackTaskCount, fallbackAvailableLocCount, fallbackOffset)) {
+                fallbackInfo = new CrnRowInfo(crnNo, nearRow, scanCurRow, rowCount, attempt);
+                fallbackTaskCount = crnTaskCount;
+                fallbackAvailableLocCount = availableLocCount;
+                fallbackOffset = offset;
+            }
+
+            if (spareLocCount <= MIN_SPARE_LOC_COUNT) {
+                log.warn("{}鍙峰爢鍨涙満鍙敤绌哄簱浣嶄綑閲忎笉瓒筹紝闄嶇骇鍊欓�夌户缁繚鐣欍�傚昂瀵歌鏍硷細{}锛岃疆璇㈡鏁帮細{}", crnNo, JSON.toJSONString(locTypeDto), attempt);
+                continue;
+            }
+
+            if (isBetterCrnCandidate(crnTaskCount, spareLocCount, offset, bestTaskCount, bestSpareLocCount, bestOffset)) {
+                bestInfo = new CrnRowInfo(crnNo, nearRow, scanCurRow, rowCount, attempt);
+                bestTaskCount = crnTaskCount;
+                bestSpareLocCount = spareLocCount;
+                bestOffset = offset;
+            }
+        }
+        if (bestInfo != null) {
+            return Optional.of(bestInfo);
+        }
+        if (fallbackInfo != null) {
+            log.warn("鍫嗗灈鏈哄潎琛″垎閰嶆湭鎵惧埌婊¤冻浣欓噺闃堝�肩殑鍊欓�夛紝闄嶇骇浣跨敤浠嶆湁绌轰綅鐨勫爢鍨涙満: crnNo={}", fallbackInfo.getCrnNo());
+        }
+        return Optional.ofNullable(fallbackInfo);
+    }
+
+    private boolean isBetterCrnCandidate(int taskCount, int spareLocCount, int offset,
+                                         int bestTaskCount, int bestSpareLocCount, int bestOffset) {
+        if (taskCount != bestTaskCount) {
+            return taskCount < bestTaskCount;
+        }
+        if (spareLocCount != bestSpareLocCount) {
+            return spareLocCount > bestSpareLocCount;
+        }
+        return offset < bestOffset;
+    }
+
+    private int countAvailableLocForCrn(RowLastno rowLastno, RowLastnoType rowLastnoType, int crnNo, int preferredNearRow) {
+        List<Integer> searchRows = getCrnSearchRows(rowLastno, crnNo, preferredNearRow);
+        if (searchRows.isEmpty()) {
+            return 0;
+        }
+        return locMastService.selectCount(new EntityWrapper<LocMast>()
+                .in("row1", searchRows)
+                .eq("loc_sts", "O")
+                .eq("whs_type", rowLastnoType.getType().longValue()));
+    }
+
+    private int countAvailableSingleExtensionLocForCrn(RowLastno rowLastno, RowLastnoType rowLastnoType, int crnNo, int preferredNearRow, LocTypeDto locTypeDto) {
+        List<Integer> searchRows = getCrnSearchRows(rowLastno, crnNo, preferredNearRow);
+        if (searchRows.isEmpty()) {
+            return 0;
+        }
+        Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
+                .in("row1", searchRows)
+                .eq("loc_sts", "O")
+                .eq("whs_type", rowLastnoType.getType().longValue());
+        if (locTypeDto != null && locTypeDto.getLocType1() != null) {
+            wrapper.eq("loc_type1", locTypeDto.getLocType1());
+        }
+        return locMastService.selectCount(wrapper);
+    }
+
+    private Optional<CrnRowInfo> findBalancedSingleExtensionCrnAndNearRow(RowLastno rowLastno, int curRow, int crnNumber, int times,
+                                                                           LocTypeDto locTypeDto, RowLastnoType rowLastnoType) {
+        int maxScanTimes = Math.max(crnNumber * 2, 1);
+        int scanCurRow = curRow;
+        Map<Integer, Integer> availableLocCountCache = new HashMap<>();
+        Map<Integer, Integer> crnTaskCountCache = new HashMap<>();
+
+        CrnRowInfo bestInfo = null;
+        int bestTaskCount = Integer.MAX_VALUE;
+        int bestSpareLocCount = Integer.MIN_VALUE;
+        int bestOffset = Integer.MAX_VALUE;
+        CrnRowInfo fallbackInfo = null;
+        int fallbackTaskCount = Integer.MAX_VALUE;
+        int fallbackAvailableLocCount = Integer.MIN_VALUE;
+        int fallbackOffset = Integer.MAX_VALUE;
+
+        for (int attempt = 0; attempt < maxScanTimes; attempt++) {
+            int[] params = Utils.LocNecessaryParameters(rowLastno, scanCurRow, crnNumber);
+            scanCurRow = params[1];
+            int rowCount = params[0];
+            int crnNo = params[2];
+            int nearRow = params[3];
+
+            if (attempt < times) {
+                continue;
+            }
+
+            int availableLocCount = availableLocCountCache.computeIfAbsent(crnNo, key ->
+                    countAvailableSingleExtensionLocForCrn(rowLastno, rowLastnoType, key, nearRow, locTypeDto));
+            int crnTaskCount = crnTaskCountCache.computeIfAbsent(crnNo, key ->
+                    wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+                            .eq("crn_no", key)
+                            .le("io_type", 100)));
+            int spareLocCount = availableLocCount - crnTaskCount;
+            int offset = attempt - times;
+
+            if (availableLocCount > 0 && isBetterCrnCandidate(crnTaskCount, availableLocCount, offset,
+                    fallbackTaskCount, fallbackAvailableLocCount, fallbackOffset)) {
+                fallbackInfo = new CrnRowInfo(crnNo, nearRow, scanCurRow, rowCount, attempt);
+                fallbackTaskCount = crnTaskCount;
+                fallbackAvailableLocCount = availableLocCount;
+                fallbackOffset = offset;
+            }
+
+            if (spareLocCount <= MIN_SPARE_LOC_COUNT) {
+                continue;
+            }
+
+            if (isBetterCrnCandidate(crnTaskCount, spareLocCount, offset, bestTaskCount, bestSpareLocCount, bestOffset)) {
+                bestInfo = new CrnRowInfo(crnNo, nearRow, scanCurRow, rowCount, attempt);
+                bestTaskCount = crnTaskCount;
+                bestSpareLocCount = spareLocCount;
+                bestOffset = offset;
+            }
+        }
+        if (bestInfo != null) {
+            return Optional.of(bestInfo);
+        }
+        return Optional.ofNullable(fallbackInfo);
+    }
+
+    private List<Integer> getCrnSearchRows(RowLastno rowLastno, int crnNo, int preferredNearRow) {
+        List<Integer> searchRows = new ArrayList<>();
+        addSearchRow(searchRows, preferredNearRow, rowLastno);
+
+        Integer rowSpan = getCrnRowSpan(rowLastno.getTypeId());
+        if (rowSpan == null) {
+            return searchRows;
+        }
+
+        int crnOffset = crnNo - rowLastno.getsCrnNo();
+        if (crnOffset < 0) {
+            return searchRows;
+        }
+        int startRow = rowLastno.getsRow() + crnOffset * rowSpan;
+        switch (rowLastno.getTypeId()) {
+            case 1:
+                addSearchRow(searchRows, startRow + 1, rowLastno);
+                addSearchRow(searchRows, startRow + 2, rowLastno);
+                break;
+            case 2:
+                addSearchRow(searchRows, startRow, rowLastno);
+                addSearchRow(searchRows, startRow + 1, rowLastno);
+                break;
+            default:
+                break;
+        }
+        return searchRows;
+    }
+
+    private Integer getCrnRowSpan(Integer typeId) {
+        if (typeId == null) {
+            return null;
+        }
+        switch (typeId) {
+            case 1:
+                return 4;
+            case 2:
+                return 2;
+            default:
+                return null;
+        }
+    }
+
+    private void addSearchRow(List<Integer> searchRows, Integer row, RowLastno rowLastno) {
+        if (row == null) {
+            return;
+        }
+        if (row < rowLastno.getsRow() || row > rowLastno.geteRow()) {
+            return;
+        }
+        if (!searchRows.contains(row)) {
+            searchRows.add(row);
+        }
+    }
+
+    private LocMast findStandardEmptyLoc(RowLastno rowLastno, RowLastnoType rowLastnoType, int crnNo, int nearRow, LocTypeDto locTypeDto) {
+        for (Integer searchRow : getCrnSearchRows(rowLastno, crnNo, nearRow)) {
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("row1", searchRow)
+                    .eq("loc_sts", "O")
+                    .eq("whs_type", rowLastnoType.getType().longValue())
+                    .orderBy("lev1", true)
+                    .orderBy("bay1", true));
+            for (LocMast locMast1 : locMasts) {
+                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+                    continue;
+                }
+                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                    String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+                    LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+                            .eq("loc_no", shallowLoc)
+                            .eq("loc_sts", "O")
+                            .eq("whs_type", rowLastnoType.getType().longValue()));
+                    if (!Cools.isEmpty(locMast2)) {
+                        return locMast2;
+                    }
+                } else if (!Cools.isEmpty(locMast1)) {
+                    return locMast1;
+                }
+            }
+
+            if (!Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                continue;
+            }
+
+            for (LocMast locMast1 : locMasts) {
+                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+                    continue;
+                }
+                String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+                LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+                        .eq("loc_no", shallowLoc)
+                        .eq("loc_sts", "O")
+                        .eq("whs_type", rowLastnoType.getType().longValue()));
+                if (!Cools.isEmpty(locMast2)) {
+                    return locMast2;
+                }
+                locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+                        .eq("loc_no", shallowLoc)
+                        .eq("loc_sts", "F")
+                        .eq("whs_type", rowLastnoType.getType().longValue()));
+                if (!Cools.isEmpty(locMast2)) {
+                    return locMast1;
+                }
+                locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+                        .eq("loc_no", shallowLoc)
+                        .eq("loc_sts", "D")
+                        .eq("whs_type", rowLastnoType.getType().longValue()));
+                if (!Cools.isEmpty(locMast2)) {
+                    return locMast1;
+                }
+            }
+        }
+        return null;
+    }
+
+    private LocTypeDto buildUpwardCompatibleLocTypeDto(LocTypeDto locTypeDto) {
+        if (locTypeDto == null || locTypeDto.getLocType1() == null || locTypeDto.getLocType1() >= 2) {
+            return null;
+        }
+        LocTypeDto compatibleLocTypeDto = new LocTypeDto();
+        compatibleLocTypeDto.setLocType1((short) (locTypeDto.getLocType1() + 1));
+        compatibleLocTypeDto.setLocType2(locTypeDto.getLocType2());
+        compatibleLocTypeDto.setLocType3(locTypeDto.getLocType3());
+        compatibleLocTypeDto.setSiteId(locTypeDto.getSiteId());
+        return compatibleLocTypeDto;
+    }
+
+
+
+    /**
+     * 妫�绱㈠簱浣嶅彿
+     *
+     * @param whsType              绫诲瀷 1:鍙屾繁寮忚揣鏋�
+     * @param staDescId            璺緞ID
+     * @param sourceStaNo          婧愮珯
+     * @param findLocNoAttributeVo 灞炴��
+     * @param moveCrnNo            婧�
+     * @param locTypeDto           绫诲瀷
+     * @param times                杞娆℃暟
+     * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+     */
+    @Transactional
+    public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+
+        // 鍒濆鍖栧弬鏁�
+        int crnNo = 0;      //鍫嗗灈鏈哄彿
+        int nearRow = 0;    //鏈�娴呭簱浣嶆帓
+        int curRow = 0;     //鏈�娣卞簱浣嶆帓
+        int rowCount = 0;   //杞杞
+        LocMast locMast = null;     // 鐩爣搴撲綅
+
+        StartupDto startupDto = new StartupDto();
         RowLastno rowLastno = rowLastnoService.selectById(whsType);
         if (Cools.isEmpty(rowLastno)) {
-            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
         }
-
-        // ===============>>>> 寮�濮嬫墽琛�
-        int curRow = rowLastno.getCurrentRow();
+        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+        if (Cools.isEmpty(rowLastnoType)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�");
+        }
         int sRow = rowLastno.getsRow();
         int eRow = rowLastno.geteRow();
-        int crn_qty = rowLastno.getCrnQty();
-        int rowCount = eRow - sRow + 1;
-        // 鐩爣鍫嗗灈鏈哄彿
-        int crnNo = 0;
-        // 鐩爣搴撲綅
-        LocMast locMast = null;
+        int crnNumber = rowLastno.getCrnQty();
 
-        // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
-        if (!Cools.isEmpty(matNos)) {
-            List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
+
+        // ===============>>>> 寮�濮嬫墽琛�
+        curRow = rowLastno.getCurrentRow();
+
+        if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
+            crnNumber = moveCrnNo;
+            if (times == 0) {
+                curRow = moveCrnNo * 4 - 1;
+            } else {
+                curRow = moveCrnNo * 4 - 2;
+            }
+        }
+
+        //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+        Optional<CrnRowInfo> infoOpt = findBalancedCrnAndNearRow(rowLastno, curRow, crnNumber, times, findLocNoAttributeVo, locTypeDto, rowLastnoType);
+        if (!infoOpt.isPresent()) {
+            infoOpt = findAvailableCrnAndNearRow(rowLastno, curRow, crnNumber, times, findLocNoAttributeVo, locTypeDto, rowLastnoType);
+        }
+        if (!infoOpt.isPresent()) {
+            throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+        }
+        CrnRowInfo info = infoOpt.get();
+        crnNo = info.getCrnNo();
+        nearRow = info.getNearRow();
+        curRow = info.getCurRow();
+        rowCount = info.getRowCount();
+        times = info.getTimes();
+
+
+        boolean signRule1 = false;
+        boolean signRule2 = false;
+
+
+        if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+            // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+            if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
+                signRule1 = true;
+            }
+            // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+            if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
+                signRule2 = true;
+            }
+
+            if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (staDescId == 11 || staDescId == 111)) {
+                signRule1 = true;
+            }
+        }
+
+        if (signRule1) {
+            if (nearRow != curRow) {
+                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                        .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+                for (LocMast locMast1 : locMasts) {
+                    //鑾峰彇宸烽亾
+//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+//                    LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
+                    //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")) {
+                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+                        if (!Cools.isEmpty(locDetl) && findLocNoAttributeVo.beSimilar(locDetl)) {
+                            //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+                            locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                            break;
+                        }
+                    }
+                }
+            }
+        } else if (signRule2) {
+            List<String> locNos = locDetlService.getSameDetlToday(findLocNoAttributeVo.getMatnr(), sRow, eRow);
             for (String locNo : locNos) {
                 if (Utils.isShallowLoc(slaveProperties, locNo)) {
                     continue;
@@ -146,7 +1171,7 @@
                 // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                 LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                 if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-                    if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+                    if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                         if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                             locMast = shallowLoc;
                             crnNo = locMast.getCrnNo();
@@ -157,162 +1182,811 @@
             }
         }
 
-        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
-        if (staDescId == 10) {
-            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
-            if (locMasts.size() > 0) {
+
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
+        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type", rowLastnoType.getType().longValue()));
+            if (!locMasts.isEmpty()) {
                 for (LocMast loc : locMasts) {
                     if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                         continue;
                     }
-                    String shallowLocNo = Utils.getShallowLoc(slaveProperties,  loc.getLocNo());
+                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                     // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                     LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                     if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
-                            locMast = shallowLoc;
-                            crnNo = locMast.getCrnNo();
-                            break;
+                        if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+                            if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+                                locMast = shallowLoc;
+                                crnNo = locMast.getCrnNo();
+                                break;
+                            }
                         }
                     }
                 }
             }
         }
 
-        // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
-        if (null == locMast) {
-            Shelves shelves = new Shelves(rowCount, crn_qty);
-            // 1-4鎺�
-            if (whsType == 1) {
-                for (int i = 0; i < shelves.group; i ++) {
-                    curRow = shelves.start(curRow);
-                    if (curRow < 0) {
-                        throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-                    }
-                    Integer crnNo1 = shelves.get(curRow);
-                    if (basCrnpService.checkSiteError(crnNo1, true)) {
-                        crnNo = crnNo1;
-                        break;
-                    }
-                }
-            // 5-8鎺�
-            } else if (whsType == 2) {
-                curRow = curRow - 4;
-                for (int i = 0; i < shelves.group; i ++) {
-                    curRow = shelves.start(curRow);
-                    if (curRow < 0) {
-                        throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-                    }
-                    Integer crnNo1 = shelves.get(curRow);
-                    if (basCrnpService.checkSiteError(crnNo1 + 1, true)) {
-                        // 鍋忕Щ閲忚ˉ鍋�
-                        curRow = curRow + 4;
-                        crnNo = crnNo1 + 1;
-                        break;
-                    }
+        Wrapper<StaDesc> wrapper = null;
+        StaDesc staDesc = null;
+        BasDevp staNo = null;
 
-                }
-            // 126绌烘澘鍏� 1-8鎺�
+        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+            // 鑾峰彇鐩爣绔�
+            wrapper = new EntityWrapper<StaDesc>()
+                    .eq("type_no", staDescId)
+                    .eq("stn_no", sourceStaNo)
+                    .eq("crn_no", crnNo);
+            staDesc = staDescService.selectOne(wrapper);
+            if (Cools.isEmpty(staDesc)) {
+                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+//                throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+                crnNo = 0;
             } else {
-                for (int i = 0; i < shelves.group; i ++) {
-                    curRow = shelves.start(curRow);
-                    if (curRow < 0) {
-                        throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-                    }
-                    Integer crnNo1 = shelves.get(curRow);
-                    if (basCrnpService.checkSiteError(crnNo1, true)) {
-                        crnNo = crnNo1;
-                        break;
-                    }
+                staNo = basDevpService.selectById(staDesc.getCrnStn());
+                if (!staNo.getAutoing().equals("Y")) {
+                    log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+//                throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+                    crnNo = 0;
                 }
+                startupDto.setStaNo(staNo.getDevNo());
             }
-        }
-
-        if (crnNo == 0) {
-            throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
-        }
-        // 鑾峰彇鐩爣绔�
-        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-                .eq("type_no", staDescId)
-                .eq("stn_no", sourceStaNo)
-                .eq("crn_no", crnNo);
-        StaDesc staDesc = staDescService.selectOne(wrapper);
-        if (Cools.isEmpty(staDesc)) {
-            log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
-            throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
-        }
-        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
-        if (!staNo.getAutoing().equals("Y")) {
-            throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
-        }
-        // 鏇存柊搴撲綅鎺掑彿
-        rowLastno.setCurrentRow(curRow);
-        rowLastnoService.updateById(rowLastno);
-
-        // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
-        // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
-        if (locMast == null) {
-            if (Utils.isShallowLoc(slaveProperties, curRow)) {
-                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
-                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
-                // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(locMast)) {
-                    locMast = null;
-                }
-            }
+            // 鏇存柊搴撲綅鎺掑彿
             if (Cools.isEmpty(locMast)) {
-                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
-                // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(locMast)) {
-                    locMast = null;
-                }
-                // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
-                if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
-                    LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
-                    if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
-                        locMast = null;
-                    }
-                }
-                // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
-                if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
-                    LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
-                    if (!shallowLoc.getLocSts().equals("O")) {
-                        locMast = null;
-                    }
-                }
+                rowLastno.setCurrentRow(curRow);
+                rowLastnoService.updateById(rowLastno);
             }
         }
 
-        // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
-        if (Cools.isEmpty(locMast)) {
-            // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
-            if (times < rowCount) {
-                times = times + 1;
-                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
-            } else {
-                times = 0;
-            }
+        // Search empty location ==============================>>
+        if (staDescId == 10 && Cools.isEmpty(locMast) && crnNo != 0) {
+            locMast = findStandardEmptyLoc(rowLastno, rowLastnoType, crnNo, nearRow, locTypeDto);
+        }
 
-            // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
-            if (locTypeDto.getLocType1() == 1) {
-                locTypeDto.setLocType1((short) 2);
-                return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times);
+
+
+        if (Cools.isEmpty(locMast) && crnNo != 0) {
+            locMast = findStandardEmptyLoc(rowLastno, rowLastnoType, crnNo, nearRow, locTypeDto);
+        }
+
+        if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+            locMast = null;
+        }
+
+        // Retry search
+        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+            // Scan next aisle first, then retry with upward-compatible locType1.
+            if (times < rowCount * 2) {
+                times = times + 1;
+                return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
             }
-            log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
-            throw new CoolException("娌℃湁绌哄簱浣�");
+            LocTypeDto compatibleLocTypeDto = buildUpwardCompatibleLocTypeDto(locTypeDto);
+            if (compatibleLocTypeDto != null) {
+                log.warn("locType1 upward compatibility retry. source={}, target={}", JSON.toJSONString(locTypeDto), JSON.toJSONString(compatibleLocTypeDto));
+                return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, compatibleLocTypeDto, 0);
+            }
+            log.error("No empty location found. spec={}, times={}", JSON.toJSONString(locTypeDto), times);
+            throw new CoolException("\u6ca1\u6709\u7a7a\u5e93\u4f4d");
         }
         String locNo = locMast.getLocNo();
 
+        // 鐢熸垚宸ヤ綔鍙�
+        int workNo = getWorkNo(0);
         // 杩斿洖dto
         startupDto.setWorkNo(workNo);
         startupDto.setCrnNo(crnNo);
         startupDto.setSourceStaNo(sourceStaNo);
-        startupDto.setStaNo(staNo.getDevNo());
         startupDto.setLocNo(locNo);
         return startupDto;
     }
 
+    public StartupDto getLocNoRun2(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+        return getLocNoRun2(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, null, times);
+    }
+
+    public StartupDto getLocNoRun2(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, List<Integer> recommendRows, int times) {
+
+        int crnNo = 0;
+        int nearRow = 0;
+        int curRow = 0;
+        int rowCount = 0;
+        LocMast locMast = null;
+
+        StartupDto startupDto = new StartupDto();
+        RowLastno rowLastno = rowLastnoService.selectById(whsType);
+
+        if (Cools.isEmpty(rowLastno)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
+        }
+        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+        if (Cools.isEmpty(rowLastnoType)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�");
+        }
+        int crnNumber = rowLastno.getCrnQty();
+        rowCount = crnNumber;
+
+        curRow = rowLastno.getCurrentRow();
+        crnNo = resolveRun2CrnNo(rowLastno);
+        Integer preferredArea = findLocNoAttributeVo.getOutArea();
+
+        List<Integer> orderedCrnNos = getOrderedCrnNos(rowLastno, crnNo);
+        List<Integer> triedCrnNos = new ArrayList<>();
+        List<Integer> recommendCrnNos = mapRowsToCrnNos(rowLastno, recommendRows);
+        if (!Cools.isEmpty(recommendCrnNos)) {
+            locMast = findRun2EmptyLocByCrnNos(rowLastno, rowLastnoType, recommendCrnNos, locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "recommend");
+            triedCrnNos.addAll(recommendCrnNos);
+        }
+        if (Cools.isEmpty(locMast)) {
+            List<Map<String, Integer>> stationCrnLocTypes = Utils.getStationStorageAreaName(
+                    sourceStaNo,
+                    locTypeDto == null || locTypeDto.getLocType1() == null ? null : locTypeDto.getLocType1().intValue(),
+                    findLocNoAttributeVo == null ? null : findLocNoAttributeVo.getMatnr());
+            if (!Cools.isEmpty(stationCrnLocTypes)) {
+                locMast = findRun2EmptyLocByCrnLocTypeEntries(rowLastno, rowLastnoType, stationCrnLocTypes,
+                        locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "station-priority");
+            } else if (preferredArea == null) {
+                List<Integer> defaultCrnNos = new ArrayList<>(orderedCrnNos);
+                defaultCrnNos.removeAll(triedCrnNos);
+                locMast = findRun2EmptyLocByCrnNos(rowLastno, rowLastnoType, defaultCrnNos, locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "default");
+            } else {
+                List<Integer> preferredCrnNos = filterCrnNosByRows(rowLastno, orderedCrnNos, getRun2AreaRows(preferredArea, rowLastno));
+                preferredCrnNos.removeAll(triedCrnNos);
+                locMast = findRun2EmptyLocByCrnNos(rowLastno, rowLastnoType, preferredCrnNos, locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "preferred-area");
+                if (Cools.isEmpty(locMast)) {
+                    List<Integer> fallbackCrnNos = filterCrnNosByRows(rowLastno, orderedCrnNos, getRun2FallbackRows(rowLastno));
+                    fallbackCrnNos.removeAll(triedCrnNos);
+                    fallbackCrnNos.removeAll(preferredCrnNos);
+                    locMast = findRun2EmptyLocByCrnNos(rowLastno, rowLastnoType, fallbackCrnNos, locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "fallback-area");
+                }
+            }
+        }
+
+        if (!Cools.isEmpty(locMast)) {
+            crnNo = locMast.getCrnNo();
+            nearRow = locMast.getRow1();
+        }
+        if (curRow == 0) {
+            curRow = rowLastno.getsRow() == null ? 1 : rowLastno.getsRow();
+        }
+        curRow = getNextRun2CurrentRow(rowLastno, curRow);
+        rowLastno.setCurrentRow(curRow);
+        rowLastnoService.updateById(rowLastno);
+
+        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+            if (times < rowCount * 2) {
+                times = times + 1;
+                return getLocNoRun2(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, recommendRows, times);
+            }
+            LocTypeDto compatibleLocTypeDto = buildUpwardCompatibleLocTypeDto(locTypeDto);
+            if (compatibleLocTypeDto != null) {
+                log.warn("locType1 upward compatibility retry. source={}, target={}", JSON.toJSONString(locTypeDto), JSON.toJSONString(compatibleLocTypeDto));
+                return getLocNoRun2(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, compatibleLocTypeDto, recommendRows, 0);
+            }
+            log.error("No empty location found. spec={}, times={}, preferredArea={}, nearRow={}", JSON.toJSONString(locTypeDto), times, preferredArea, nearRow);
+            throw new CoolException("娌℃湁绌哄簱浣�");
+        }
+
+        int workNo = getWorkNo(0);
+        startupDto.setWorkNo(workNo);
+        startupDto.setCrnNo(crnNo);
+        startupDto.setSourceStaNo(sourceStaNo);
+        startupDto.setLocNo(locMast.getLocNo());
+        return startupDto;
+    }
+    private LocMast findSingleExtensionEmptyLoc(RowLastno rowLastno, int crnNo, int nearRow, RowLastnoType rowLastnoType, LocTypeDto locTypeDto) {
+        for (Integer searchRow : getCrnSearchRows(rowLastno, crnNo, nearRow)) {
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("row1", searchRow)
+                    .eq("loc_sts", "O")
+                    .eq("whs_type", rowLastnoType.getType().longValue())
+                    .orderBy("bay1", true)
+                    .orderBy("lev1", true));
+            for (LocMast locMast : locMasts) {
+                if (VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+                    return locMast;
+                }
+            }
+        }
+        return null;
+    }
+
+    public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+
+        // 鍒濆鍖栧弬鏁�
+        int crnNo = 0;      //鍫嗗灈鏈哄彿
+        int nearRow = 0;    //鏈�娴呭簱浣嶆帓
+        int curRow = 0;     //鏈�娣卞簱浣嶆帓
+        int rowCount = 0;   //杞杞
+        LocMast locMast = null;     // 鐩爣搴撲綅
+
+        StartupDto startupDto = new StartupDto();
+        RowLastno rowLastno = rowLastnoService.selectById(whsType);
+        if (Cools.isEmpty(rowLastno)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
+        }
+        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+        if (Cools.isEmpty(rowLastnoType)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�");
+        }
+        int sRow = rowLastno.getsRow();
+        int eRow = rowLastno.geteRow();
+        int crnNumber = rowLastno.getCrnQty();
+
+        // ===============>>>> 寮�濮嬫墽琛�
+        curRow = rowLastno.getCurrentRow();
+
+        if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
+            crnNumber = moveCrnNo;
+//            if (times==0){
+//                curRow = moveCrnNo*4-1;
+//            }else {
+//                curRow = moveCrnNo*4-2;
+//            }
+        }
+
+        //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+        for (int i = times; i < crnNumber * 2; i++) {
+            int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+            rowCount = locNecessaryParameters[0];
+            curRow = locNecessaryParameters[1];
+            crnNo = locNecessaryParameters[2];
+            nearRow = locNecessaryParameters[3];
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+            if (locMasts.size() <= 5) {
+                nearRow = 0;
+                times++;
+                continue;
+            }
+            break;
+
+        }
+        if (crnNo == 0) {
+            throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
+        }
+
+
+        // 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+        if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
+            //鏌ヨ鐩镐技宸ヤ綔妗ｆ
+            List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetl(staDescId, findLocNoAttributeVo, crnNo);
+            int nearbay = 0;    //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
+            int nearlev = 0;    //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅灞�
+            for (WrkMast wrkMast : wrkMasts) {
+                int curRowW = curRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+                int nearRowW = nearRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+                if (Cools.isEmpty(wrkMast.getLocNo())) {
+                    continue;
+                }
+                //鐩爣鎺掍负鏈�澶栧眰鎺�
+                if (Utils.getRow(wrkMast.getLocNo()) == nearRow) {
+                    continue;
+                }
+                //璧峰绔欎笉涓�鑷�
+                if (!wrkMast.getSourceStaNo().equals(sourceStaNo)) {
+                    continue;
+                }
+                //鐩稿悓鍒椼�佸眰杩囨护
+                if (Utils.getBay(wrkMast.getLocNo()) == nearbay && Utils.getLev(wrkMast.getLocNo()) == nearlev) {
+                    continue;
+                } else {
+                    nearbay = Utils.getBay(wrkMast.getLocNo());
+                    nearlev = Utils.getLev(wrkMast.getLocNo());
+                }
+
+                //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
+//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+                LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
+
+                for (int i = 0; i < crnNumber * 2; i++) {
+                    if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+                        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+                        curRowW = locNecessaryParameters[1];
+                        nearRowW = locNecessaryParameters[3];
+                    } else {
+                        break;
+                    }
+                }
+
+                //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+
+                //鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣嶅瓨鍦�&&闈炴渶澶栦晶搴撲綅&&鍏ュ簱鐘舵��
+                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))) {
+                    //鑾峰彇搴撳瓨鏄庣粏
+                    WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+                    //鍒ゆ柇鍚岃鏍肩墿鏂�
+                    if (!Cools.isEmpty(wrkDetl) && findLocNoAttributeVo.beSimilar(wrkDetl)) {
+                        int row2 = 0;
+                        if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+                            row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+                        } else {
+                            row2 = Utils.getRow(locMast2.getLocNo()) + 1;
+                        }
+                        String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
+                        locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+                        if (Cools.isEmpty(locMast)) {
+                            continue;
+                        }
+                        break;
+                    }
+                }
+            }
+
+        }
+
+        // 鐩镐技宸ヤ綔妗� --- 绌烘墭
+        if (Cools.isEmpty(locMast) && staDescId == 10) {
+            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10).eq("crn_no", crnNo).eq("whs_type", rowLastnoType.getType().longValue()));
+            int nearbay = 0;
+            int nearlev = 0;
+            for (WrkMast wrkMast : wrkMasts) {
+                int curRowW = curRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+                int nearRowW = nearRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+                if (Cools.isEmpty(wrkMast.getLocNo())) {
+                    continue;
+                }
+                if (Utils.getRow(wrkMast.getLocNo()) == nearRow) {
+                    continue;
+                }
+                //璧峰绔欎笉涓�鑷�
+                if (!wrkMast.getSourceStaNo().equals(sourceStaNo)) {
+                    continue;
+                }
+                if (Utils.getBay(wrkMast.getLocNo()) == nearbay && Utils.getLev(wrkMast.getLocNo()) == nearlev) {
+                    continue;
+                } else {
+                    nearbay = Utils.getBay(wrkMast.getLocNo());
+                    nearlev = Utils.getLev(wrkMast.getLocNo());
+                }
+//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+                LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
+
+                for (int i = 0; i < crnNumber * 2; i++) {
+                    if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+                        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+                        curRowW = locNecessaryParameters[1];
+                        nearRowW = locNecessaryParameters[3];
+                    } else {
+                        break;
+                    }
+                }
+
+                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+
+                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+                    int row2 = 0;
+                    if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+                        row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+                    } else {
+                        row2 = Utils.getRow(locMast2.getLocNo()) + 1;
+                    }
+                    String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
+                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+                    if (Cools.isEmpty(locMast)) {
+                        continue;
+                    }
+                    break;
+                }
+            }
+        }
+
+        boolean signRule1 = false;
+        boolean signRule2 = false;
+
+
+        if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+            // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+            if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
+//                signRule1 = true;
+            }
+            // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+            if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
+                signRule2 = true;
+            }
+
+            if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (staDescId == 11 || staDescId == 111)) {
+                signRule1 = true;
+            }
+        }
+
+        if (signRule1) {
+            if (nearRow != curRow) {
+                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                        .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+                for (LocMast locMast1 : locMasts) {
+                    //鑾峰彇宸烽亾
+//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+                    //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")) {
+                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+                        if (!Cools.isEmpty(locDetl) && findLocNoAttributeVo.beSimilar(locDetl)) {
+                            //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+                            locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                            break;
+                        }
+                    }
+                }
+            }
+        } else if (signRule2) {
+            List<String> locNos = locDetlService.getSameDetlToday(findLocNoAttributeVo.getMatnr(), sRow, eRow);
+            int nearbay = 0;
+            int nearlev = 0;
+            for (String locNo : locNos) {
+                int curRowW = curRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+                int nearRowW = nearRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+                if (Cools.isEmpty(locNo)) {
+                    continue;
+                }
+                if (Utils.getRow(locNo) == nearRow) {
+                    continue;
+                }
+                if (Utils.getBay(locNo) == nearbay && Utils.getLev(locNo) == nearlev) {
+                    continue;
+                } else {
+                    nearbay = Utils.getBay(locNo);
+                    nearlev = Utils.getLev(locNo);
+                }
+//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+                LocMast locMastGro = locMastService.selectById(locNo);
+
+                for (int i = 0; i < crnNumber * 2; i++) {
+                    if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+                        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+                        curRowW = locNecessaryParameters[1];
+                        nearRowW = locNecessaryParameters[3];
+                    } else {
+                        break;
+                    }
+                }
+
+                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+
+                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+                    int row2 = 0;
+                    if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+                        row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+                    } else {
+                        row2 = Utils.getRow(locMast2.getLocNo()) + 1;
+                    }
+                    String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
+                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+                    if (Cools.isEmpty(locMast)) {
+                        continue;
+                    }
+                    break;
+                }
+            }
+        }
+
+//        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭  //鍒嗙鐗�
+//        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+//            for (LocMast locMast1:locMasts){
+//                //鑾峰彇宸烽亾
+////                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+//                //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+//                LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+//                if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("D")){
+//                    //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+//                    locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+//                    break;
+//                }
+//            }
+//        }
+
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
+        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+            int nearbay = 0;
+            int nearlev = 0;
+            for (LocMast locMastSign : locMasts) {
+                int curRowW = curRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+                int nearRowW = nearRow;    //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+                if (Cools.isEmpty(locMastSign.getLocNo())) {
+                    continue;
+                }
+                if (Utils.getRow(locMastSign.getLocNo()) == nearRow) {
+                    continue;
+                }
+                if (Utils.getBay(locMastSign.getLocNo()) == nearbay && Utils.getLev(locMastSign.getLocNo()) == nearlev) {
+                    continue;
+                } else {
+                    nearbay = Utils.getBay(locMastSign.getLocNo());
+                    nearlev = Utils.getLev(locMastSign.getLocNo());
+                }
+//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+                LocMast locMastGro = locMastService.selectById(locMastSign.getLocNo());
+
+                for (int i = 0; i < crnNumber * 2; i++) {
+                    if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+                        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
+                        curRowW = locNecessaryParameters[1];
+                        nearRowW = locNecessaryParameters[3];
+                    } else {
+                        break;
+                    }
+                }
+
+                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+
+                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+                    int row2 = 0;
+                    if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
+                        row2 = Utils.getRow(locMast2.getLocNo()) - 1;
+                    } else {
+                        row2 = Utils.getRow(locMast2.getLocNo()) + 1;
+                    }
+                    String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
+                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+                    if (Cools.isEmpty(locMast)) {
+                        continue;
+                    }
+                    break;
+                }
+            }
+        }
+
+        Wrapper<StaDesc> wrapper = null;
+        StaDesc staDesc = null;
+        BasDevp staNo = null;
+
+        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+            // 鑾峰彇鐩爣绔�
+            wrapper = new EntityWrapper<StaDesc>()
+                    .eq("type_no", staDescId)
+                    .eq("stn_no", sourceStaNo)
+                    .eq("crn_no", crnNo);
+            staDesc = staDescService.selectOne(wrapper);
+            if (Cools.isEmpty(staDesc)) {
+                log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+                crnNo = 0;
+            } else {
+                staNo = basDevpService.selectById(staDesc.getCrnStn());
+                if (!staNo.getAutoing().equals("Y")) {
+                    log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+                    crnNo = 0;
+                }
+                startupDto.setStaNo(staNo.getDevNo());
+            }
+        }
+
+        // 鏇存柊搴撲綅鎺掑彿
+        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) {
+            rowLastno.setCurrentRow(curRow);
+            rowLastnoService.updateById(rowLastno);
+        }
+
+        // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+
+        // 1.鎸夎鍒欐煡鎵惧簱浣�
+        if (Cools.isEmpty(locMast) && crnNo != 0) {
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("row1", nearRow)
+                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+                    .orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
+            for (LocMast locMast1 : locMasts) {
+                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+                    continue;
+                }
+                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                    //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                    if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
+                        locMast = locMast2;
+                        break;
+                    }
+
+                }
+            }
+
+            //鏈壘鍒�  鍏佽娣锋枡
+            if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                for (LocMast locMast1 : locMasts) {
+                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+                        continue;
+                    }
+                    if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                        // ?????????????
+//                        List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+
+                        // ????????????????
+                        LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                        if (Cools.isEmpty(locMast2)) {
+                            LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                            if (!Cools.isEmpty(locMast3)) {
+                                locMast = locMast3;
+                                break;
+                            }
+                        } else {
+                            if ((locMast2.getLocSts().equals("F") && staDescId == 1) || (locMast2.getLocSts().equals("D") && staDescId == 10)) {
+                                LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                                if (!Cools.isEmpty(locMast3)) {
+                                    locMast = locMast3;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Retry search
+        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+            // Scan next aisle first, then retry with upward-compatible locType1.
+            if (times < rowCount * 2) {
+                times = times + 1;
+                return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
+            }
+            LocTypeDto compatibleLocTypeDto = buildUpwardCompatibleLocTypeDto(locTypeDto);
+            if (compatibleLocTypeDto != null) {
+                log.warn("locType1 upward compatibility retry. source={}, target={}", JSON.toJSONString(locTypeDto), JSON.toJSONString(compatibleLocTypeDto));
+                return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, compatibleLocTypeDto, 0);
+            }
+            log.error("No empty location found. spec={}, times={}", JSON.toJSONString(locTypeDto), times);
+            throw new CoolException("\u6ca1\u6709\u7a7a\u5e93\u4f4d");
+        }
+        String locNo = locMast.getLocNo();
+
+        // 鐢熸垚宸ヤ綔鍙�
+        int workNo = getWorkNo(0);
+        // 杩斿洖dto
+        startupDto.setWorkNo(workNo);
+        startupDto.setCrnNo(crnNo);
+        startupDto.setSourceStaNo(sourceStaNo);
+        startupDto.setLocNo(locNo);
+        return startupDto;
+    }
+
+    public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, List<Integer> recommendRows, int times) {
+
+        // 鍒濆鍖栧弬鏁�
+        int crnNo = 0;      //鍫嗗灈鏈哄彿
+        int nearRow = 0;    //鏈�娴呭簱浣嶆帓
+        int curRow = 0;     //鏈�娣卞簱浣嶆帓
+        int rowCount = 0;   //杞杞
+        LocMast locMast = null;     // 鐩爣搴撲綅
+
+        StartupDto startupDto = new StartupDto();
+        RowLastno rowLastno = rowLastnoService.selectById(whsType);
+        if (Cools.isEmpty(rowLastno)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
+        }
+        RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+        if (Cools.isEmpty(rowLastnoType)) {
+            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�");
+        }
+        int sRow = rowLastno.getsRow();
+        int eRow = rowLastno.geteRow();
+        int crnNumber = eRow - sRow + 1;
+
+        // ===============>>>> 寮�濮嬫墽琛�
+        curRow = rowLastno.getCurrentRow();
+
+        if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
+            crnNumber = moveCrnNo;
+        }
+
+        //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+        curRow = locNecessaryParameters[1];
+        crnNo = 6;
+        rowCount = locNecessaryParameters[0];
+        nearRow = locNecessaryParameters[3];
+
+        Wrapper<StaDesc> wrapper = null;
+        StaDesc staDesc = null;
+        BasDevp staNo = null;
+
+//        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+            // 鑾峰彇鐩爣绔�
+//            wrapper = new EntityWrapper<StaDesc>()
+//                    .eq("type_no", staDescId)
+//                    .eq("stn_no", sourceStaNo)
+//                    .eq("crn_no", crnNo);
+//            staDesc = staDescService.selectOne(wrapper);
+//            if (Cools.isEmpty(staDesc)) {
+//                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+////                throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+//                crnNo = 0;
+//            }
+//            else {
+//                staNo = basDevpService.selectById(staDesc.getCrnStn());
+//                if (!staNo.getAutoing().equals("Y")) {
+//                    log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+////                throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+//                    crnNo = 0;
+//                }
+//                startupDto.setStaNo(staNo.getDevNo());
+//            }
+//        }
+
+        // 鏇存柊搴撲綅鎺掑彿
+        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) {
+            rowLastno.setCurrentRow(curRow);
+            rowLastnoService.updateById(rowLastno);
+        }
+
+        // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+
+        if (Cools.isEmpty(locMast) && !Cools.isEmpty(recommendRows)) {
+            for (Integer recommendRow : recommendRows) {
+                if (Cools.isEmpty(recommendRow)) {
+                    continue;
+                }
+                LocMast recommendLoc = locMastService.queryFreeLocMast(recommendRow, locTypeDto.getLocType1(), rowLastnoType.getType().longValue());
+                if (!Cools.isEmpty(recommendLoc) && VersionUtils.locMoveCheckLocTypeComplete(recommendLoc, locTypeDto)) {
+                    locMast = recommendLoc;
+                    crnNo = recommendLoc.getCrnNo();
+                    break;
+                }
+            }
+        }
+
+        Integer preferredArea = findLocNoAttributeVo.getOutArea();
+
+        if (Cools.isEmpty(locMast) && preferredArea == null) {
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("row1", nearRow)
+                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+                    .orderBy("lev1", true).orderBy("bay1", true)); // 鏈�娴呭簱浣�
+            for (LocMast locMast1 : locMasts) {
+                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+                    continue;
+                }
+                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+                    // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+                    if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
+                        locMast = locMast2;
+                        break;
+                    }
+                }
+            }
+        } else if (Cools.isEmpty(locMast)) {
+            int[] bayRange = getAgvAreaBayRange(preferredArea);
+            locMast = findAgvLocByRows(rowLastno, rowLastnoType, getAgvAreaRows(preferredArea, rowLastno),
+                    bayRange[0], bayRange[1], curRow, nearRow, locTypeDto, false);
+            if (!Cools.isEmpty(locMast)) {
+                crnNo = locMast.getCrnNo();
+            }
+            if (Cools.isEmpty(locMast)) {
+                locMast = findAgvLocByRows(rowLastno, rowLastnoType, getAgvFallbackRows(rowLastno),
+                        1, 19, curRow, nearRow, locTypeDto, true);
+                if (!Cools.isEmpty(locMast)) {
+                    crnNo = locMast.getCrnNo();
+                }
+            }
+        }
+        // Retry search
+        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+            // Scan next aisle first, then retry with upward-compatible locType1.
+            if (times < rowCount * 2) {
+                times = times + 1;
+                return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, recommendRows, times);
+            }
+            LocTypeDto compatibleLocTypeDto = buildUpwardCompatibleLocTypeDto(locTypeDto);
+            if (compatibleLocTypeDto != null) {
+                log.warn("locType1 upward compatibility retry. source={}, target={}", JSON.toJSONString(locTypeDto), JSON.toJSONString(compatibleLocTypeDto));
+                return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, compatibleLocTypeDto, recommendRows, 0);
+            }
+            log.error("No empty location found. spec={}, times={}", JSON.toJSONString(locTypeDto), times);
+            throw new CoolException("\u6ca1\u6709\u7a7a\u5e93\u4f4d");
+        }
+        String locNo = locMast.getLocNo();
+
+        // 鐢熸垚宸ヤ綔鍙�
+        int workNo = getWorkNo(0);
+        // 杩斿洖dto
+        startupDto.setWorkNo(workNo);
+        startupDto.setCrnNo(crnNo);
+        startupDto.setSourceStaNo(sourceStaNo);
+        startupDto.setLocNo(locNo);
+        return startupDto;
+    }
 
     public static String zerofill(String msg, Integer count) {
         if (msg.length() == count) {
@@ -321,7 +1995,7 @@
             return msg.substring(0, 16);
         } else {
             StringBuilder msgBuilder = new StringBuilder(msg);
-            for(int i = 0; i < count - msg.length(); ++i) {
+            for (int i = 0; i < count - msg.length(); ++i) {
                 msgBuilder.insert(0, "0");
             }
             return msgBuilder.toString();
@@ -329,3 +2003,4 @@
     }
 
 }
+

--
Gitblit v1.9.1