自动化立体仓库 - WMS系统
野心家
2024-12-25 0cac4ab2975a4dd01c937aa4f33ffa88c45b604b
更换找库位规则
10个文件已修改
917 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/LocMastMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/LocMastService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/Utils.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/service/CommonService.java 632 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/WcsController.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocMastMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -45,4 +45,6 @@
     * 获取目标库位所在巷道最深空库位  深<浅
     * */
    LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos);
    LocMast selectLocByLocStsPakInF(@Param("locNos") List<String> locNos);
}
src/main/java/com/zy/asrs/service/LocMastService.java
@@ -41,11 +41,7 @@
    List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo);
    /*
     * 获取目标库位所在巷道最浅非空库位
     * */
    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
    LocMast selectLocByLocStsPakInF(List<String> locNos);
    /*
     * 获取目标库位所在巷道最深空库位
     * */
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -47,11 +47,8 @@
     *获取目标库位所在巷道最浅非空库位
     * */
    @Override
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locNos);
        }
        return this.baseMapper.selectLocByLocStsPakInF2(locNos);
    public LocMast selectLocByLocStsPakInF(List<String> locNos) {
        return this.baseMapper.selectLocByLocStsPakInF(locNos);
    }
    /*
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -92,7 +92,7 @@
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs.get(0), batchs.get(0), null,locTypeDto);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, batchs, locTypeDto,0);
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -368,7 +368,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,locTypeDto, 0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -37,67 +37,67 @@
    @Autowired
    private AutoMoveService autoMoveService;
    //定时出库   经典双伸
    @Scheduled(cron = "0/3 * * * * ? ")
    public void locToLocAutoLocMove(){
        if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
            Config config = configService.selectConfigByCode("AutoLocMove");
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                return;
            }
            Order order = orderService.selectOrderMoveStatus();
            if (!Cools.isEmpty(order)){
//                autoMoveService.selectList()
            }else {
                order = orderService.selectOrderMoveStatusInitial();
                if (Cools.isEmpty(order)){
                    return;
                }
                order.setMoveStatus(2);
                orderService.updateById(order);
            }
        }
    }
//    //定时出库   经典双伸
//    @Scheduled(cron = "0/3 * * * * ? ")
//    public void locToLocAutoLocMove(){
//        if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
//            Config config = configService.selectConfigByCode("AutoLocMove");
//            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
//                return;
//            }
//            Order order = orderService.selectOrderMoveStatus();
//            if (!Cools.isEmpty(order)){
////                autoMoveService.selectList()
//            }else {
//                order = orderService.selectOrderMoveStatusInitial();
//                if (Cools.isEmpty(order)){
//                    return;
//                }
//                order.setMoveStatus(2);
//                orderService.updateById(order);
//            }
//        }
//    }
    //定时出库
    @Scheduled(cron = "0/3 * * * * ? ")
    public void locToLoc11(){
        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                return;
            }
            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
            for (int crnNo = 1;crnNo < crnCount;crnNo++){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
                if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
                    autoLocMoveHandler.start(crnNo,11);
                }
            }
        }
    }
//    @Scheduled(cron = "0/3 * * * * ? ")
//    public void locToLoc11(){
//        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
//            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
//            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
//                return;
//            }
//            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
//            for (int crnNo = 1;crnNo < crnCount;crnNo++){
//                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
//                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
//                if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
//                    autoLocMoveHandler.start(crnNo,11);
//                }
//            }
//        }
//    }
    //定时入库
    @Scheduled(cron = "0/3 * * * * ? ")
    public void locToLoc111() {
        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
                return;
            }
            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
            for (int crnNo = 1;crnNo < crnCount;crnNo++){
                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
                if (basCrnp == null) {
                    continue;
                }
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
                if (Cools.isEmpty(wrkMast)  && Cools.isEmpty(wrkMast1)){
                    autoLocMoveHandler.start(crnNo,111);
                }
            }
        }
    }
//    //定时入库
//    @Scheduled(cron = "0/3 * * * * ? ")
//    public void locToLoc111() {
//        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
//            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
//            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
//                return;
//            }
//            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
//            for (int crnNo = 1;crnNo < crnCount;crnNo++){
//                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
//                if (basCrnp == null) {
//                    continue;
//                }
//                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
//                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
//                if (Cools.isEmpty(wrkMast)  && Cools.isEmpty(wrkMast1)){
//                    autoLocMoveHandler.start(crnNo,111);
//                }
//            }
//        }
//    }
}
src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
@@ -36,47 +36,47 @@
    @Autowired
    private WorkService workService;
    @Transactional(isolation = Isolation.REPEATABLE_READ)
    public ReturnT<String> start(Integer crnNo, Integer ioType) {
        try {
            //11  穿梭移单边
            if (ioType==11){
                for (int bay = 1;bay < 27;bay++){
                    for (int lev = 1 ; lev <6 ; lev++){
                        List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
                        if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
                            for (LocMast locMast:locMasts){
                                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                                StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
                                workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
                            }
                            return SUCCESS;
                        }
                    }
                }
            }else {//11  单边移穿梭
                List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111   单边移穿梭
                for (Map<String, Object> map : list) {
                    String matnr = map.getOrDefault("matnr","").toString();//物料号
                    String batch = map.getOrDefault("batch","").toString();//批号
                    String grade = map.getOrDefault("brand","").toString();//等级
                    int count = Integer.parseInt(map.get("count").toString());//单边库数量
                    if (count < 4) {
                        continue;
                    }
                    List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
                    for (LocDetl locDetl : locDetlList) {
                        StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
                        workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
                    }
                }
                return SUCCESS;
            }
        }catch (Exception e){
            log.error("自动移库出错,堆垛机号{},工作类型{}",crnNo,ioType);
        }
        return SUCCESS;
    }
//    @Transactional(isolation = Isolation.REPEATABLE_READ)
//    public ReturnT<String> start(Integer crnNo, Integer ioType) {
//        try {
//            //11  穿梭移单边
//            if (ioType==11){
//                for (int bay = 1;bay < 27;bay++){
//                    for (int lev = 1 ; lev <6 ; lev++){
//                        List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
//                        if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
//                            for (LocMast locMast:locMasts){
//                                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
//                                StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
//                                workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
//                            }
//                            return SUCCESS;
//                        }
//                    }
//                }
//            }else {//11  单边移穿梭
//                List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111   单边移穿梭
//                for (Map<String, Object> map : list) {
//                    String matnr = map.getOrDefault("matnr","").toString();//物料号
//                    String batch = map.getOrDefault("batch","").toString();//批号
//                    String grade = map.getOrDefault("brand","").toString();//等级
//                    int count = Integer.parseInt(map.get("count").toString());//单边库数量
//                    if (count < 4) {
//                        continue;
//                    }
//
//                    List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
//                    for (LocDetl locDetl : locDetlList) {
//                        StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
//                        workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
//                    }
//                }
//                return SUCCESS;
//            }
//        }catch (Exception e){
//            log.error("自动移库出错,堆垛机号{},工作类型{}",crnNo,ioType);
//        }
//        return SUCCESS;
//    }
}
src/main/java/com/zy/asrs/utils/Utils.java
@@ -560,4 +560,18 @@
        return result;
    }
    // 外侧方向的货位  优先入库方向/优先出库方向 ===>> 反之
    public static List<String> getGroupOutsideLocCrn(String locNo){
        int row = getRow(locNo);
        List<String> result = new ArrayList<>();
        if (row==3 || row == 4){
            result.add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
            result.add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
            return result;
        }else{
            result.add(locNo);
            return result;
        }
    }
}
src/main/java/com/zy/common/service/CommonService.java
@@ -26,6 +26,8 @@
import java.util.ArrayList;
import java.util.List;
import static com.zy.asrs.utils.Utils.zerofill;
/**
 * 货架核心功能
 * Created by vincent on 2020/6/11
@@ -55,6 +57,7 @@
    /**
     * 生成工作号
     *
     * @param wrkMk
     * @return workNo(工作号)
     */
@@ -114,187 +117,84 @@
     * @param whsType     类型 1:双深式货架
     * @param staDescId   路径ID
     * @param sourceStaNo 源站
     * @param matnr       物料号集合
     * @return locNo 检索到的库位号
     */
    @Transactional
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
        try{
            whsType = Utils.GetWhsType(sourceStaNo);
        }catch (Exception e){
            log.error("站点={} 未查询到对应的规则",sourceStaNo);
            return null;
        }
        return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
    }
    /**
     * 检索库位号
     *
     * @param whsType     类型 1:双深式货架
     * @param staDescId   路径ID
     * @param sourceStaNo 源站
     * @param matnr       物料号集合
     * @return locNo 检索到的库位号
     */
    @Transactional
    public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        if (Cools.isEmpty(matnr)) {  //物料号
            matnr = "";
        }
        if (Cools.isEmpty(batch)) {  //批次
            batch = "";
        }
        if (Cools.isEmpty(grade)) {  //备用
            grade = "";
        }
        // 初始化参数
        int crnNo = 0;      //堆垛机号
        int nearRow = 0;    //最浅库位排
        int curRow = 0;     //最深库位排
        int rowCount = 0;   //轮询轮次
        LocMast locMast = null;     // 目标库位
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, List<String> batchs, LocTypeDto locTypeDto, int times) {
        // 目标堆垛机号
        StartupDto startupDto = new StartupDto();
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        int sRow = rowLastno.getsRow();
        int eRow = rowLastno.geteRow();
        int crnNumber = rowLastno.getCrnQty();
        if (Cools.isEmpty(rowLastno)) {
            throw new CoolException("数据异常,请联系管理员");
        }
        // ===============>>>> 开始执行
        curRow = rowLastno.getCurrentRow();
        // 目标库位
        LocMast locMast = null;
        if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
            crnNumber = moveCrnNo;
            if (times==0){
                curRow = moveCrnNo*4-1;
        for (int i = 0; i < 4; i++) {
            //找库位按堆垛机号来找,从下往上,从前往后,从左到右
            List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("crn_no", whsType)
                    .eq("loc_sts", "O")
                    .orderBy("lev1")
                    .orderBy("bay1")
                    .orderBy("row1"));
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", whsType));
            if (locMastList.size() < 5 || crn_no.getInEnable().equals("N") || crn_no.getCrnSts() != 1) {
                if (whsType == 4) {
                    whsType = 1;
            }else {
                curRow = moveCrnNo*4-2;
                    whsType++;
            }
        }
        //此程序用于优化堆垛机异常时的运行时间
        for (int i = times; i < crnNumber*2; i++) {
            int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
            curRow = locNecessaryParameters[1];
            crnNo = locNecessaryParameters[2];
            if (basCrnpService.checkSiteError(crnNo, true)) {
                rowCount =  locNecessaryParameters[0];
                nearRow = locNecessaryParameters[3];
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
                int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
                if (locMasts.size()-crnCountO<=2){
                    times++;
                i++;
                    continue;
                }
            for (LocMast locMast1 : locMastList) {
                //判断库位是否为3的浅库位,如果是查看其深库位是否为空
                if (locMast1.getRow1() % 4 == 3) {
                    LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("lev1", locMast1.getLev1())
                            .eq("bay1", locMast1.getBay1())
                            .eq("row1", locMast1.getRow1() + 1)
                    );
                    if (locMast2.getLocSts().equals("O")) {
                        locMast = locMast2;
                        break;
                    } else if (locMast2.getLocSts().equals("F")) {
                        locMast = locMast1;
                break;
            } else {
                times++;
            }
        }
        if (nearRow == 0) {
            throw new CoolException("无可用堆垛机");
        }
        boolean signRule1 = false;
        boolean signRule2 = false;
        if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
            // 靠近摆放规则 --- 同天同规格物料 //分离版
            if (!Cools.isEmpty(matnr) &&  staDescId == 1){
                signRule1 = true;
            }
            // 靠近摆放规则 --- 同天同规格物料 //互通版
            if (!Cools.isEmpty(matnr) && staDescId == 1) {
                signRule2 = true;
            }
            if (!Cools.isEmpty(matnr) &&  (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").orderBy("lev1"));
                for (LocMast locMast1:locMasts){
                    //获取巷道
                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
                    //获取目标库位所在巷道最浅非空库位
                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
//                        if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
                            //获取目标库位所在巷道最浅非空库位
                            locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
                            break;
//                        }
                    }
                }
            }
        }else if (signRule2){
            List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
            for (String locNo : locNos) {
                if (Utils.isShallowLoc(slaveProperties, locNo)) {
                    continue;
                }
                String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
                // 检测目标库位是否为空库位
                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                    if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                            locMast = shallowLoc;
                            crnNo = locMast.getCrnNo();
                } else if (locMast1.getRow1() % 4 == 2) {
                    LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("lev1", locMast1.getLev1())
                            .eq("bay1", locMast1.getBay1())
                            .eq("row1", locMast1.getRow1() - 1)
                    );
                    if (locMast2.getLocSts().equals("F")) {
                        locMast = locMast1;
                            break;
                        }
                    }
                }
            }
        }
//        // 靠近摆放规则 --- 空托  //分离版
//        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
//            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));
//                if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
//                    locMast = locMast1;
//                    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));
            if (!locMasts.isEmpty()) {
                for (LocMast loc : locMasts) {
                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                    } else {
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                            if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                locMast = shallowLoc;
                                crnNo = locMast.getCrnNo();
                } else {
                    locMast = locMast1;
                                break;
                            }
                        }
            if (Cools.isEmpty(locMast)) {
                if (whsType == 4) {
                    whsType = 1;
                } else {
                    whsType++;
                    }
                i++;
                }
            if (!Cools.isEmpty(locMast)) {
                break;
            }
        }
@@ -302,115 +202,46 @@
        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);
                .eq("crn_no", whsType);
            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 {
            log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, whsType);
            throw new CoolException("入库路径不存在");
        }
                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 (Cools.isEmpty(locMast)){
                rowLastno.setCurrentRow(curRow);
                rowLastnoService.updateById(rowLastno);
            }
            throw new CoolException("目标站" + staDesc.getCrnStn() + "不可用");
        }
        // 开始查找库位 ==============================>>
        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O")
                    .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"));
                    if (!Cools.isEmpty(locMast2)) {
                        locMast = locMast2;
                        break;
                    }
                } else {
                    if (!Cools.isEmpty(locMast1)) {
                        locMast = locMast1;
                        break;
                    }
                }
            }
            if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
                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"));
                        if (!Cools.isEmpty(locMast2)) {
                            locMast = locMast2;
                            break;
                        } else {
                            locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                    .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
                            if (!Cools.isEmpty(locMast2)) {
                                locMast = locMast1;
                                break;
                            } else {
                                locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                        .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
                                if (!Cools.isEmpty(locMast2)) {
                                    locMast = locMast1;
                                    break;
                                }
                            }
                        }
                    } else {
                        if (!Cools.isEmpty(locMast1)) {
                            locMast = locMast1;
                            break;
                        }
                    }
                }
            }
        }
        if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
            locMast = null;
        }
        // 递归查询
        // 2.库位当前所属尺寸无空库位时,调整尺寸参数,向上兼容检索库位
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
            // 当前巷道无空库位时,递归调整至下一巷道,检索全部巷道无果后,跳出递归
            if (times < rowCount*2) {
            if (times < 4) {
                times = times + 1;
                return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
                return getLocNo(1, staDescId, sourceStaNo, matNos, batchs, locTypeDto, times);
            }
//            // 2.库位当前所属尺寸无空库位时,调整尺寸参数,向上兼容检索库位
//            if (locTypeDto.getLocType1() < 2) {
//                int i = locTypeDto.getLocType1() + 1;
//                locTypeDto.setLocType1((short)i);
//                return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
//            }
            //1==>3==>4==>2
            // 轻货物找轻库位为空时,可以去找重库位仓
            if (locTypeDto.getLocType1() != 2) {
                log.error("系统没有空库位!!! 尺寸规格: {}, 轮询次数:{},开始查询重库位仓", JSON.toJSONString(locTypeDto), times);
                int i = 0;
                if (locTypeDto.getLocType1() == 1) {
                    i = 3;
                } else if (locTypeDto.getLocType1() == 3) {
                    i = locTypeDto.getLocType1() + 1;
                } else if (locTypeDto.getLocType1() == 4) {
                    i = 2;
                }
                locTypeDto.setLocType1((short) i);
                times = 1;
                return getLocNo(1, staDescId, sourceStaNo, matNos, batchs, locTypeDto, times);
            }
            log.error("系统没有空库位!!! 尺寸规格: {}, 轮询次数:{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }
@@ -420,9 +251,308 @@
        int workNo = getWorkNo(0);
        // 返回dto
        startupDto.setWorkNo(workNo);
        startupDto.setCrnNo(crnNo);
        startupDto.setCrnNo(whsType);
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setStaNo(staNo.getDevNo());
        startupDto.setLocNo(locNo);
        return startupDto;
    }
//    /**
//     * 检索库位号
//     *
//     * @param whsType     类型 1:双深式货架
//     * @param staDescId   路径ID
//     * @param sourceStaNo 源站
//     * @param matnr       物料号集合
//     * @return locNo 检索到的库位号
//     */
//    @Transactional
//    public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
//        if (Cools.isEmpty(matnr)) {  //物料号
//            matnr = "";
//        }
//        if (Cools.isEmpty(batch)) {  //批次
//            batch = "";
//        }
//        if (Cools.isEmpty(grade)) {  //备用
//            grade = "";
//        }
//
//        // 初始化参数
//        int crnNo = 0;      //堆垛机号
//        int nearRow = 0;    //最浅库位排
//        int curRow = 0;     //最深库位排
//        int rowCount = 0;   //轮询轮次
//        LocMast locMast = null;     // 目标库位
//
//        StartupDto startupDto = new StartupDto();
//        RowLastno rowLastno = rowLastnoService.selectById(whsType);
//        int sRow = rowLastno.getsRow();
//        int eRow = rowLastno.geteRow();
//        int crnNumber = rowLastno.getCrnQty();
//
//        if (Cools.isEmpty(rowLastno)) {
//            throw new CoolException("数据异常,请联系管理员");
//        }
//        // ===============>>>> 开始执行
//        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(whsType, curRow, crnNumber);
//            curRow = locNecessaryParameters[1];
//            crnNo = locNecessaryParameters[2];
//            if (basCrnpService.checkSiteError(crnNo, true)) {
//                rowCount =  locNecessaryParameters[0];
//                nearRow = locNecessaryParameters[3];
//                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
//                int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
//                if (locMasts.size()-crnCountO<=2){
//                    times++;
//                    continue;
//                }
//                break;
//            } else {
//                times++;
//            }
//        }
//        if (nearRow == 0) {
//            throw new CoolException("无可用堆垛机");
//        }
//
//        boolean signRule1 = false;
//        boolean signRule2 = false;
//
//
//        if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
//            // 靠近摆放规则 --- 同天同规格物料 //分离版
//            if (!Cools.isEmpty(matnr) &&  staDescId == 1){
//                signRule1 = true;
//            }
//            // 靠近摆放规则 --- 同天同规格物料 //互通版
//            if (!Cools.isEmpty(matnr) && staDescId == 1) {
//                signRule2 = true;
//            }
//
//            if (!Cools.isEmpty(matnr) &&  (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").orderBy("lev1"));
//                for (LocMast locMast1:locMasts){
//                    //获取巷道
//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
//                    //获取目标库位所在巷道最浅非空库位
//                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
//                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
//                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
////                        if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
//                            //获取目标库位所在巷道最浅非空库位
//                            locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
//                            break;
////                        }
//                    }
//                }
//            }
//        }else if (signRule2){
//            List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
//            for (String locNo : locNos) {
//                if (Utils.isShallowLoc(slaveProperties, locNo)) {
//                    continue;
//                }
//                String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
//                // 检测目标库位是否为空库位
//                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
//                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
//                    if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
//                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
//                            locMast = shallowLoc;
//                            crnNo = locMast.getCrnNo();
//                            break;
//                        }
//                    }
//                }
//            }
//        }
//
////        // 靠近摆放规则 --- 空托  //分离版
////        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
////            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
////            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));
////                if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
////                    locMast = locMast1;
////                    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));
//            if (!locMasts.isEmpty()) {
//                for (LocMast loc : locMasts) {
//                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
//                        continue;
//                    }
//                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
//                    // 检测目标库位是否为空库位
//                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
//                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
//                        if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
//                            if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
//                                locMast = shallowLoc;
//                                crnNo = locMast.getCrnNo();
//                                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);
////                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 (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")
//                    .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"));
//                    if (!Cools.isEmpty(locMast2)) {
//                        locMast = locMast2;
//                        break;
//                    }
//                } else {
//                    if (!Cools.isEmpty(locMast1)) {
//                        locMast = locMast1;
//                        break;
//                    }
//                }
//            }
//
//            if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
//                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"));
//                        if (!Cools.isEmpty(locMast2)) {
//                            locMast = locMast2;
//                            break;
//                        } else {
//                            locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
//                                    .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
//                            if (!Cools.isEmpty(locMast2)) {
//                                locMast = locMast1;
//                                break;
//                            } else {
//                                locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
//                                        .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
//                                if (!Cools.isEmpty(locMast2)) {
//                                    locMast = locMast1;
//                                    break;
//                                }
//                            }
//                        }
//                    } else {
//                        if (!Cools.isEmpty(locMast1)) {
//                            locMast = locMast1;
//                            break;
//                        }
//                    }
//                }
//            }
//        }
//
//        if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
//            locMast = null;
//        }
//
//        // 递归查询
//        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
//            // 当前巷道无空库位时,递归调整至下一巷道,检索全部巷道无果后,跳出递归
//            if (times < rowCount*2) {
//                times = times + 1;
//                return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
//            }
////            // 2.库位当前所属尺寸无空库位时,调整尺寸参数,向上兼容检索库位
////            if (locTypeDto.getLocType1() < 2) {
////                int i = locTypeDto.getLocType1() + 1;
////                locTypeDto.setLocType1((short)i);
////                return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
////            }
//            log.error("系统没有空库位!!! 尺寸规格: {}, 轮询次数:{}", JSON.toJSONString(locTypeDto), times);
//            throw new CoolException("没有空库位");
//        }
//        String locNo = locMast.getLocNo();
//
//        // 生成工作号
//        int workNo = getWorkNo(0);
//        // 返回dto
//        startupDto.setWorkNo(workNo);
//        startupDto.setCrnNo(crnNo);
//        startupDto.setSourceStaNo(sourceStaNo);
//        startupDto.setLocNo(locNo);
//        return startupDto;
//    }
}
src/main/java/com/zy/common/web/WcsController.java
@@ -49,6 +49,8 @@
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;
    @Autowired
    private BasCrnpService basCrnpService;
    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -111,7 +113,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, null, locTypeDto, 0);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -147,7 +149,9 @@
        }
        EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
        emptyPlateOutParam.setOutSite(12);
        emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
        emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
            add(locMast.getLocNo() + "");
        }});
        WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
        return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
    }
@@ -162,7 +166,20 @@
        // 检索库位
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 1;
        for (int i = 1; i <= rowCount; i++) {
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", integer));
            List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("crn_no", integer)
                    .eq("loc_sts", "O"));
            if (locMastList.size() >= 5 && crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 1) {
                break;
            }
        }
        StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matnrs, batchs, locTypeDto, 0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -236,8 +253,21 @@
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 1;
        for (int i = 1; i <= rowCount; i++) {
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", integer));
            List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("crn_no", integer)
                    .eq("loc_sts", "O"));
            if (locMastList.size() >= 5 && crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 1) {
                break;
            }
        }
        StartupDto dto = commonService.getLocNo(integer, 1, devpNo, null, null, locTypeDto, 0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
src/main/resources/mapper/LocMastMapper.xml
@@ -116,4 +116,12 @@
        AND loc_sts in ('O') order by row1 ,lev1
    </select>
    <select id="selectLocByLocStsPakInF" resultMap="BaseResultMap">
        SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
            #{locNo}
        </foreach>
        AND loc_sts not in ('O') order by row1 DESC
    </select>
</mapper>