#修复bug，检索该排全部空库位进行判断

lty

2025-06-11 ddc462832f99c124fbcc9653a0878e18768224cd

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

@@ -105,11 +105,12 @@
        } else if (sourceStaNo > 299){
            whsType = 3;
        }

        // 目标堆垛机号
        int crnNo = whsType;
        if (!basCrnpService.checkSiteError(crnNo, true)){
            throw new CoolException("没有可用的堆垛机");
        }
//        if (!basCrnpService.checkSiteError(crnNo, true)){
//            throw new CoolException("没有可用的堆垛机");
//        }

        StartupDto startupDto = new StartupDto();

@@ -198,7 +199,7 @@

        // 1.当检索库排为浅库位排时，优先寻找当前库排的深库位排
        if (locMast == null) {
            if ((whsType==2 || whsType==4) && Utils.isShallowLoc(slaveProperties, curRow)) {
            if ( Utils.isShallowLoc(slaveProperties, curRow)) {
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
                // todo:luxiaotao 如果用浅排找到的深库位，那么则需要判断这个深库位对应的浅库位是否有货（F、X、D）
@@ -208,23 +209,33 @@
                }
            }
            if (Cools.isEmpty(locMast)) {
                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
                // 目标库位 ===>> 浅库位， 则校验其深库位是否为 F D X
                if ((whsType==2 || whsType==4) && 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;
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", curRow)
                        .eq("loc_sts", "O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .orderBy("lev1",true).orderBy("bay1",true));
                for (LocMast locMast1 : locMasts) {
                    // 因库位移转、需预留空库位
                    if (!locMastService.checkEmptyCount(locMast1)) {
                        locMast1 = null;
                    }
                }
                // 目标库位 ===>> 深库位， 则校验其浅库位是否为 O
                if ((whsType==2 || whsType==4) && null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
                    LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
                    if (!shallowLoc.getLocSts().equals("O")) {
                        locMast = null;
                    // 目标库位 ===>> 浅库位， 则校验其深库位是否为 F D X
                    if (null != locMast1 && Utils.isShallowLoc(slaveProperties, locMast1.getLocNo())) {
                        LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast1.getLocNo()));
                        if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                            locMast1 = null;
                        }
                    }
                    // 目标库位 ===>> 深库位， 则校验其浅库位是否为 O
                    if (null != locMast1 && Utils.isDeepLoc(slaveProperties, locMast1.getLocNo())) {
                        LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast1.getLocNo()));
                        if (!shallowLoc.getLocSts().equals("O")) {
                            locMast1 = null;
                        }
                    }
                    if (!Cools.isEmpty(locMast1)) {
                        locMast = locMast1;
                        break;
                    }
                }
            }
@@ -246,6 +257,7 @@
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }

        String locNo = locMast.getLocNo();

        // 生成工作号