#

luxiaotao1123

2023-02-06 e77de9f405ea5cf8f50126d64a58fbf47c4a3350

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

@@ -314,19 +314,42 @@
        if (locMast == null) {

            // 库区锁定
            LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null);
            LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
            if (!Cools.isEmpty(locRule)) {
                List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
                List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
                // plan first
//                List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
//                List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
//                        , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
//                if (!Cools.isEmpty(locMasts)) {
//                    Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
//                    for (LocMast one : locMasts) {
//                        if (one.getRow1().equals(innermostRow)) {
//                            locMast = one;
//                            crnNo = locMast.getCrnNo();
//                            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("入库路径不存在, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
//                                throw new CoolException("入库路径不存在");
//                            }
//                            // 检测目标站
//                            staNo = basDevpService.selectById(staDesc.getCrnStn());
//                            if (!staNo.getAutoing().equals("Y")) {
//                                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
//                            }
//                            break;
//                        }
//                    }
//                }

                // plan second
                List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1()
                        , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
                if (!Cools.isEmpty(locMasts)) {
                    Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
                    for (LocMast one : locMasts) {
                        if (one.getRow1().equals(innermostRow)) {
                            locMast = one;
                            break;
                        }
                    }
                for (LocMast one : locMasts) {

                }
            }

@@ -354,26 +377,62 @@
        }

        // 2.无库位时，无视区域锁定，重新查找库位
        if (Cools.isEmpty(locMast)){
            List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow);
            for (LocMast locMast1 : locMasts){
                List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
                Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
                for (LocMast locMast2:locMasts1){
                    if (locMast2.getLocSts().equals("O")){
                        if (locMast2.getRow1().equals(innermostRow)) {
                            locMast = locMast2;
                            break;


        if (Cools.isEmpty(locMast)) {
            int sign = curRow;
            while (sign != 0 && Cools.isEmpty(locMast)) {
                List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
                for (LocMast loc : locMasts) {
                    // 同库位组对应其钱库位是否为 O.空库位
                    boolean success = true;
                    List<String> outerLoc = Utils.getGroupOuterLoc(loc.getLocNo());
                    for (String outerLocNo : outerLoc) {
                        if (!locMastService.selectById(outerLocNo).getLocSts().equals("O")) {
                            success = false; break;
                        }
                    }else if (!locMast2.getLocSts().equals("F")){
                    }
                    if (success) {
                        locMast = loc;
                        break;
                    }
                }
                if (!Cools.isEmpty(locMast)){
                    break;
                }
                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)) {
@@ -417,4 +476,28 @@
        }
    }

    public int getCurRow(int curRow){
        switch (curRow){
            case 1:
            case 2:
            case 8:
            case 9:
            case 10:
            case 15:
            case 16:
            case 17:
                return curRow+1;
            case 5:
            case 6:
            case 7:
            case 13:
            case 14:
            case 20:
            case 21:
                return curRow-1;
            default:
                return 0;
        }
    }

}