高频入库找不到库位后找低频库位

Junjie

2023-05-26 b1786c43535c920c905c2ed7a1d3d2f78b48e4a5

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

@@ -118,27 +118,29 @@
            case 103://103入库站
                whsType = 1;
                start = 1;
                end = 11;
                end = 14;

                //103站分配1，2堆垛机
                crnNos.add(1);
                crnNos.add(2);

                //分配1，7，8排
                //分配1，7，8，14排
                rows.add(1);
                rows.add(7);
                rows.add(8);
                rows.add(14);
                break;
            case 203://203入库站
                whsType = 2;
                start = 12;
                start = 8;
                end = 21;

                //203站分配3，4堆垛机
                //203站分配2，3堆垛机
                crnNos.add(2);
                crnNos.add(3);
                crnNos.add(4);

                //分配14，15，21排
                //分配8，14，15，21排
                rows.add(8);
                rows.add(14);
                rows.add(15);
                rows.add(21);
@@ -186,6 +188,9 @@
                }
            } else if (matType == 2) {//高频类型入最外侧库位
                locMast = getLocNoStep3(locTypeDto, crnNos);
                if (locMast == null) {
                    locMast = getLocNoStep4(locTypeDto);
                }
                if (locMast != null) {
                    //找到库位，返回dto
                    return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
@@ -267,8 +272,27 @@
    private LocMast getLocNoStep3(LocTypeDto locTypeDto, List<Integer> crnNos) {
        LocMast locMast = null;
        //找最外侧空库位
        LocMast locMast0 = locMastService.findOutMast(locTypeDto.getLocType1(), crnNos);
        if (locMast0 != null) {
        List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), crnNos);
        for (LocMast locMast0 : locMasts) {
            //检测当前库位内侧其他库位是否为D、F、X
            boolean flag = false;
            List<String> insideLoc = Utils.getGroupInsideLoc(locMast0.getLocNo());
            if (insideLoc.size() > 0) {
                List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
                for (LocMast mast : insideLocMast) {
                    if (!mast.getLocSts().equals("D")
                            && !mast.getLocSts().equals("F")
                            && !mast.getLocSts().equals("X")) {
                        //D、F、X(不能选定这个外侧库位)
                        flag = true;
                        break;
                    }
                }
            }
            if (flag) {
                continue;
            }

            // 浅库位符合尺寸检测
            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                // 浅库位对应堆垛机必须可用且无异常
@@ -287,8 +311,39 @@
    //低频类型，直接找混放区域
    private LocMast getLocNoStep4(LocTypeDto locTypeDto) {
        LocMast locMast = null;
        LocMast locMast0 = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1());
        if (locMast0 != null) {
        List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1());
        for (LocMast locMast0 : locMasts) {
            //检测当前库位内侧其他库位是否为D、F、X
            boolean flag = false;
            List<String> insideLoc = Utils.getGroupInsideLoc(locMast0.getLocNo());
            if (insideLoc.size() > 0) {
                List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
                for (LocMast mast : insideLocMast) {
                    if (!mast.getLocSts().equals("D")
                            && !mast.getLocSts().equals("F")
                            && !mast.getLocSts().equals("X")) {
                        //D、F、X(不能选定这个外侧库位)
                        flag = true;
                        break;
                    }
                }
            }
            //检测当前库位外侧库位是否为O(空库位)
            List<String> outerLoc = Utils.getGroupOuterLoc(locMast0.getLocNo());
            if (outerLoc.size() > 0) {
                List<LocMast> outerLocMast = locMastService.selectByLocNos(outerLoc);
                for (LocMast mast : outerLocMast) {
                    if (!mast.getLocSts().equals("O")) {
                        //不是空库位，找下一个
                        flag = true;
                        break;
                    }
                }
            }
            if (flag) {
                continue;
            }

            // 浅库位符合尺寸检测
            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                // 浅库位对应堆垛机必须可用且无异常