no message

skyouc

2 天以前 046ea994b2c30456162f094eef6afa95e162c902

no message

 src/main/java/com/zy/common/service/CommonService.java

@@ -3,17 +3,14 @@
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.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -21,10 +18,6 @@
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.Arrays;
import java.util.List;

@@ -120,24 +113,27 @@
     *
     * @param staDescId            路径ID
     * @param sourceStaNo          源站
     * @param whsType
     * @param findLocNoAttributeVo 属性
     * @param locTypeDto           类型
     * @return locNo 检索到的库位号
     */
    @Transactional
    public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
    public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, Integer whsType, FindLocNoAttributeVo findLocNoAttributeVo,
                               LocTypeDto locTypeDto) {
        try {
            Integer whsType = Utils.GetWhsType(sourceStaNo);
            RowLastno rowLastno = rowLastnoService.selectById(whsType);
            RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
//            Integer whsType = Utils.GetWhsType(sourceStaNo);
//            RowLastno rowLastno = rowLastnoService.selectById(whsType);
//            RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
            /**
             * 库型 1: 标准堆垛机库  2: 平库  3: 穿梭板  4: 四向车  5: AGV  0: 未知
             */
            return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
            return getLocNoRun(staDescId, whsType,  sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);

//            switch (rowLastnoType.getType()) {
//                case 1:
//                    return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
            // return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0,
            // locTypeDto, 0);
////                case 2:
////                    log.error("站点={} 未查询到对应的规则", sourceStaNo);
////                    break;
@@ -145,9 +141,11 @@
////                    log.error("站点={} 未查询到对应的规则", sourceStaNo);
////                    break;
////                case 4:
////                    return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
            //// return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo,
            // 4, locTypeDto, 0);
////                case 5:
////                    return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
            //// return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo,
            // 0, locTypeDto, 0);
////                default:
////                    log.error("站点={} 未查询到对应的规则", sourceStaNo);
////                    break;
@@ -172,7 +170,8 @@
     * @return locNo 检索到的库位号
     */
    @Transactional
    public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
    public StartupDto getLocNoRun( Integer staDescId, Integer whsType, Integer sourceStaNo,
            FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        staDescId = 1;
        // 初始化参数
        int crnNo = 0;      //堆垛机号
@@ -183,14 +182,25 @@
        if (Cools.isEmpty(rowLastno)) {
            throw new CoolException("数据异常，请联系管理员===>库位规则未知");
        }

        // 均衡分布堆垛机
        int minCount = Integer.MAX_VALUE;
        for (int i = rowLastno.getsCrnNo(); i <= rowLastno.geteCrnNo(); i++) {
            int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
            if (count < minCount) {
                minCount = count;
                crnNo = i;
            }
        }
        StartupDto startupDto = new StartupDto();
        //TODO 需要区分207，217， 239站点，滤芯和中件需要区分开
         locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .ge("row1", rowLastno.getsRow())
                .le("row1", rowLastno.geteRow())
                .eq("crn_no", crnNo)
                .eq("loc_sts", "O")
                .orderAsc(Arrays.asList("row1", "bay1", "lev1")));
//        int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
                .orderAsc(Arrays.asList("lev1", "row1", "bay1")));
        // int crnCountO = wrkMastService.selectCount(new
        // EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));

        // 生成工作号
        int workNo = getWorkNo(0);
@@ -202,7 +212,8 @@
        return startupDto;
    }

    public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
    public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo,
            FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {

        // 初始化参数
        int crnNo = 0;      //堆垛机号
@@ -257,9 +268,9 @@
            throw new CoolException("无可用库位");
        }


        // 相似工作档案 --- 同天同规格物料
        if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
        if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr())
                && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
            //查询相似工作档案
            List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetl(staDescId, findLocNoAttributeVo, crnNo);
            int nearbay = 0;    //相似工作档案 目标库位列
@@ -287,11 +298,15 @@
                }

                //获取目标库位所在巷道并排序
//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
                // 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)) {
                    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];
@@ -301,12 +316,15 @@
                }

                //获取目标库位所在巷道最浅非空库位
                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
                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"))) {
                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()));
                    WrkDetl wrkDetl = wrkDetlService
                            .selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    //判断同规格物料
                    if (!Cools.isEmpty(wrkDetl) && findLocNoAttributeVo.beSimilar(wrkDetl)) {
                        int row2 = 0;
@@ -316,7 +334,8 @@
                            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"));
                        locMast = locMastService
                                .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
                        if (Cools.isEmpty(locMast)) {
                            continue;
                        }
@@ -329,7 +348,8 @@

        // 相似工作档 --- 空托
        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()));
            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) {
@@ -351,11 +371,15 @@
                    nearbay = Utils.getBay(wrkMast.getLocNo());
                    nearlev = Utils.getLev(wrkMast.getLocNo());
                }
//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
                // 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)) {
                    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];
@@ -364,9 +388,11 @@
                    }
                }

                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
                        rowLastnoType.getType().longValue());

                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
                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;
@@ -374,7 +400,8 @@
                        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"));
                    locMast = locMastService
                            .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
                    if (Cools.isEmpty(locMast)) {
                        continue;
                    }
@@ -385,7 +412,6 @@

        boolean signRule1 = false;
        boolean signRule2 = false;


        if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
            // 靠近摆放规则 --- 同天同规格物料 //分离版
@@ -408,14 +434,18 @@
                        .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);
                    // List<String> groupOutsideLocCrn =
                    // Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
                    //获取目标库位所在巷道最浅非空库位
                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                    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()));
                        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());
                            locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
                                    rowLastnoType.getType().longValue());
                            break;
                        }
                    }
@@ -440,11 +470,15 @@
                    nearbay = Utils.getBay(locNo);
                    nearlev = Utils.getLev(locNo);
                }
//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
                // 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)) {
                    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];
@@ -453,9 +487,11 @@
                    }
                }

                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
                        rowLastnoType.getType().longValue());

                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
                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;
@@ -463,7 +499,8 @@
                        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"));
                    locMast = locMastService
                            .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
                    if (Cools.isEmpty(locMast)) {
                        continue;
                    }
@@ -474,15 +511,19 @@

//        // 靠近摆放规则 --- 空托  //分离版
//        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
        // 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);
        //// List<String> groupOutsideLocCrn =
        // Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
//                //获取目标库位所在巷道最浅非空库位
//                LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
        // 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());
        // locMast =
        // locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
//                    break;
//                }
//            }
@@ -490,7 +531,8 @@

        // 靠近摆放规则 --- 空托 //互通版
        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
            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) {
@@ -502,17 +544,22 @@
                if (Utils.getRow(locMastSign.getLocNo()) == nearRow) {
                    continue;
                }
                if (Utils.getBay(locMastSign.getLocNo()) == nearbay && Utils.getLev(locMastSign.getLocNo()) == nearlev) {
                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);
                // 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)) {
                    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];
@@ -521,9 +568,11 @@
                    }
                }

                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
                        rowLastnoType.getType().longValue());

                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
                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;
@@ -531,7 +580,8 @@
                        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"));
                    locMast = locMastService
                            .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
                    if (Cools.isEmpty(locMast)) {
                        continue;
                    }
@@ -584,7 +634,8 @@
                }
                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
                    //获取目标库位所在巷道最深空库位
                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
                            rowLastnoType.getType().longValue());
                    if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
                        locMast = locMast2;
                        break;
@@ -600,19 +651,24 @@
                    }
                    if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
                        //获取目标库位所在巷道并排序
//                        List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
                        // List<String> groupOutsideLocCrn =
                        // Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);

                        //获取目标库位所在巷道最浅非空库位
                        LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                        LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1,
                                rowLastnoType.getType().longValue());
                        if (Cools.isEmpty(locMast2)) {
                            LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                            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 ((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;
@@ -629,7 +685,8 @@
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < rowCount * 2) {
                times = times + 1;
                return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
                return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto,
                        times);
            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
@@ -646,7 +703,8 @@
        return startupDto;
    }

    public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
    public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo,
            FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {

        // 初始化参数
        int crnNo = 0;      //堆垛机号
@@ -728,7 +786,8 @@
                }
                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
                    //获取目标库位所在巷道最深空库位
                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
                            rowLastnoType.getType().longValue());
                    if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
                        locMast = locMast2;
                        break;
@@ -742,7 +801,8 @@
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < rowCount * 2) {
                times = times + 1;
                return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
                return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto,
                        times);
            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");