#

luxiaotao1123

2023-02-06 9594129ba3c8adbf0c3c8852f9ff5cbbf172b681

#

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

@@ -178,9 +178,12 @@
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            crnNo = locMast0.getCrnNo();
                            locMast = locMast0;
                            break;
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10)) {
                                crnNo = locMast0.getCrnNo();
                                locMast = locMast0;
                                break;
                            }
                        }
                    }
                }
@@ -200,9 +203,12 @@
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                                locMast = locMast0;
                                break;
                                // 因库位移转、需预留空库位
                                if (locMastService.checkEmptyCount(locMast0, 10)) {
                                    crnNo = locMast0.getCrnNo();
                                    locMast = locMast0;
                                    break;
                                }
                            }
                        }
                    }
@@ -224,9 +230,12 @@
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                                locMast = locMast0;
                                break;
                                // 因库位移转、需预留空库位
                                if (locMastService.checkEmptyCount(locMast0, 10)) {
                                    crnNo = locMast0.getCrnNo();
                                    locMast = locMast0;
                                    break;
                                }
                            }
                        }
                    }
@@ -381,6 +390,10 @@
                            success = false; break;
                        }
                    }
                    // 因库位移转、需预留空库位
                    if (!locMastService.checkEmptyCount(loc, 10)) {
                        success = false;
                    }
                    if (success) {
                        locMast = loc;
                        break;
@@ -389,39 +402,6 @@
                sign = getCurRow(sign);
            }
        }


//        if (Cools.isEmpty(locMast)){
//            List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow, locTypeDto.getLocType1());
//            int sign=curRow;
//            while (true){
//                if (locMasts.size()==0){
//                    sign = getCurRow(sign);
//                    if (sign != 0){
//                        locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
//                    }else {
//                        break;
//                    }
//                }else {
//                    break;
//                }
//            }
//            for (LocMast locMast1 : locMasts){
//                List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1(), locTypeDto.getLocType1());
//                Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
//                for (LocMast locMast2:locMasts1){
//                    if (locMast2.getLocSts().equals("O")){
//                        locMast = locMast2;
//                        break;
//                    }else if (!locMast2.getLocSts().equals("F")){
//                        break;
//                    }
//                }
//                if (!Cools.isEmpty(locMast)){
//                    break;
//                }
//            }
//        }

        // 3.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {