123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -35,6 +35,18 @@
        add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
    }};

    public static final List<String> HARD_LOC_NO = new ArrayList<String>() {{
        add("0200104");add("0200704");add("0201404");add("0202004");
        add("0600201");add("0600202");add("0600203");add("0600204");
        add("0600301");add("0600302");add("0600303");add("0600304");
        add("0600701");add("0600702");
        add("0601401");add("0601402");
        add("0602001");add("0602002");
        add("2000704");add("2001404");add("2002004");
        add("1600701");add("1601401");add("1602001");
        add("1600702");add("1601402");add("1602002");
    }};

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
@@ -98,15 +110,18 @@
        return workNo;
    }

    /**
     * 检索库位号
     * @param whsType     类型 1:双深式货架
     * @param staDescId   路径ID
     * @param sourceStaNo 源站
     * @param matNos      物料号集合
     * @return locNo 检索到的库位号
     */
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, Integer matTypeIn) {
        return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,new ArrayList<>());
    }
        /**
         * 检索库位号
         * @param whsType     类型 1:双深式货架
         * @param staDescId   路径ID
         * @param sourceStaNo 源站
         * @param matNos      物料号集合
         * @return locNo 检索到的库位号
         */
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, Integer matTypeIn,List<LocMast> locMastList) {
        int start;
        int end;
        Integer matType = null;//物料类型
@@ -117,6 +132,7 @@
        ArrayList<Integer> rows = new ArrayList<>();
        switch (sourceStaNo) {
            case 103://103入库站
            case 113://103入库站
                whsType = 1;
                start = 1;
                end = 14;
@@ -133,6 +149,7 @@
                crnNo = 1;
                break;
            case 203://203入库站
            case 213://203入库站
                whsType = 2;
                start = 8;
                end = 21;
@@ -178,40 +195,81 @@
                    throw new CoolException("混放物料类型不一致");
                }
            }

            if (matNos.size() > 1 && matType == 1) {
                //物料为单品类型，且物料种类超过1(实际为高频混放)，则禁止入库
                throw new CoolException("物料类型和实际种类不一致");
            if (!Cools.isEmpty(matTypeIn)) {
                if (!matTypeIn.equals(0)) {
                    matType = matTypeIn;
                }
            }

//            if (matNos.size() > 1 && matType == 1) {
//                //物料为单品类型，且物料种类超过1(实际为高频混放)，则禁止入库
//                throw new CoolException("物料类型和实际种类不一致");
//            }
        }

        if (!sign && matType != null) {
            if (matType == 1) {//单品类型入库
                locMast = getLocNoStep2(locTypeDto, matNos, rows, crnNos);
                locMast = getLocNoStep2(locTypeDto, matNos, rows, crnNos,locMastList);
                if (locMast != null) {
                    locMastList.add(locMast);
                    Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                            .eq("type_no", staDescId)
                            .eq("stn_no", sourceStaNo)
                            .eq("crn_no", locMast.getCrnNo());
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    if (Cools.isEmpty(staDesc)) {
                        return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
                    }
                    //找到库位，返回dto
                    sign=true;
                } else {
                    //单品没有找到库位，找高频混放区域库位
                    locMast = getLocNoStep3(locTypeDto, crnNos);
                    locMast = getLocNoStep3(locTypeDto, crnNos,locMastList);
                    if (locMast != null) {
                        locMastList.add(locMast);
                        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                                .eq("type_no", staDescId)
                                .eq("stn_no", sourceStaNo)
                                .eq("crn_no", locMast.getCrnNo());
                        StaDesc staDesc = staDescService.selectOne(wrapper);
                        if (Cools.isEmpty(staDesc)) {
                            return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
                        }
                        //找到库位，返回dto
                        sign=true;
                    }
                }
            } else if (matType == 2) {//高频类型入最外侧库位
                locMast = getLocNoStep3(locTypeDto, crnNos);
                locMast = getLocNoStep3(locTypeDto, crnNos,locMastList);
                if (locMast == null) {
                    //高频没有找到库位，找低频混放区域库位
                    locMast = getLocNoStep4(locTypeDto, crnNos);
                    locMast = getLocNoStep4(locTypeDto, crnNos,locMastList);
                }
                if (locMast != null) {
                    locMastList.add(locMast);
                    Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                            .eq("type_no", staDescId)
                            .eq("stn_no", sourceStaNo)
                            .eq("crn_no", locMast.getCrnNo());
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    if (Cools.isEmpty(staDesc)) {
                        return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
                    }
                    //找到库位，返回dto
                    sign=true;
                }
            } else if (matType == 3) {//低频混放类型
                locMast = getLocNoStep4(locTypeDto, crnNos);
                locMast = getLocNoStep4(locTypeDto, crnNos,locMastList);
                if (locMast != null) {
                    locMastList.add(locMast);
                    Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                            .eq("type_no", staDescId)
                            .eq("stn_no", sourceStaNo)
                            .eq("crn_no", locMast.getCrnNo());
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    if (Cools.isEmpty(staDesc)) {
                        return getLocNo(whsType,staDescId,sourceStaNo,matNos,locTypeDto,matTypeIn,locMastList);
                    }
                    //找到库位，返回dto
                    sign=true;
                }
@@ -246,9 +304,12 @@
        if (sign){
            return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
        }
        if (!locMastList.isEmpty()){
            return getLocNoFinalStep(staDescId, sourceStaNo, locMastList.get(0));//返回dto
        }
        //----------------2023.06.02兼容代码end---------------------

        throw new CoolException("检索库位失败，请联系管理员");
        throw new CoolException("800检索库位失败，请联系管理员");
    }

    // 靠近摆放规则 --- 空托
@@ -267,7 +328,7 @@
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                // 因库位移转、需预留空库位
                                if (locMastService.checkEmptyCount(locMast0, 10)) {
                                if (locMastService.checkEmptyCount(locMast0, 5)) {
                                    locMast = locMast0;
                                    break;
                                }
@@ -282,7 +343,7 @@
    }

    //单品类型入库
    private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows, List<Integer> crnNos) {
    private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows, List<Integer> crnNos,List<LocMast> locMastList) {
        LocMast locMast = null;
        //先找工作档

@@ -292,6 +353,7 @@
            //随机可用堆垛机号
            Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
            Collections.shuffle(crnNos);
            loc:
            for (Integer crnNo : crnNos) {
                List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, crnNo);
                for (LocMast locMast0 : locMasts) {
@@ -306,9 +368,11 @@
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10)) {
                                locMast = locMast0;
                                break;
                            if (locMastService.checkEmptyCount(locMast0, 5)) {
                                if (!locMastList.contains(locMast0)){
                                    locMast = locMast0;
                                    break loc;
                                }
                            }
                        }
                    }
@@ -320,6 +384,7 @@
        //找内侧空库位(非最外侧库位)
        if (locMast == null) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
            loc:
            for (String locNo : locNos) {
                List<String> groupLoc = Utils.getGroupLoc(locNo);
                List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, null);
@@ -335,9 +400,11 @@
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10)) {
                                locMast = locMast0;
                                break;
                            if (locMastService.checkEmptyCount(locMast0, 5)) {
                                if (!locMastList.contains(locMast0)){
                                    locMast = locMast0;
                                    break loc;
                                }
                            }
                        }
                    }
@@ -359,16 +426,43 @@
                        //内侧其他库位不是D、F、X。不能选取该库位
                        continue;
                    }
                    //检测当前库位内侧其他库位是否为D、F、X
                    if (!Utils.checkOutsideLocIsDFX(locMast0.getLocNo())) {
                        //内侧其他库位不是D、F、X。不能选取该库位
                        continue;
                    }

                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10)) {
                                locMast = locMast0;
                                flag = true;
                                break;
                            if (locMastService.checkEmptyCount(locMast0, 5)) {
                                if (!locMastList.contains(locMast0)){
                                    locMast = locMast0;
                                    flag = true;
                                    break;
                                }
                            }
                        }
                    }
                }
                if (!flag) {
                    List<LocMast> locMastsNew = locMastService.findInEmptyLocMastNew(locTypeDto.getLocType1(), HARD_LOC_NO, crnNo);//找一条新的空巷道
                    for (LocMast locMast0 : locMastsNew) {
                        //检测当前库位内侧其他库位是否为D、F、X
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                // 因库位移转、需预留空库位
                                if (locMastService.checkEmptyCount(locMast0, 5)) {
                                    if (!locMastList.contains(locMast0)){
                                        locMast = locMast0;
                                        flag = true;
                                        break;
                                    }
                                }
                            }
                        }
                    }
@@ -383,7 +477,7 @@
    }

    //高频类型入最外侧库位
    private LocMast getLocNoStep3(LocTypeDto locTypeDto, List<Integer> crnNos) {
    private LocMast getLocNoStep3(LocTypeDto locTypeDto, List<Integer> crnNos,List<LocMast> locMastList) {
        LocMast locMast = null;

        //随机可用堆垛机号
@@ -408,8 +502,11 @@
                // 浅库位对应堆垛机必须可用且无异常
                if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                    // 因库位移转、需预留空库位
                    if (locMastService.checkEmptyCount(locMast0, 10)) {
                        locMast = locMast0;
                    if (locMastService.checkEmptyCount(locMast0, 5)) {
                        if (!locMastList.contains(locMast0)){
                            locMast = locMast0;
                            break;
                        }
                    }
                }
            }
@@ -425,7 +522,7 @@
                crns.add(crnNo);
            }
            if (!crns.isEmpty()) {
                return getLocNoStep3(locTypeDto, crns);
                return getLocNoStep3(locTypeDto, crns,locMastList);
            }
        }

@@ -433,7 +530,7 @@
    }

    //低频类型，直接找混放区域
    private LocMast getLocNoStep4(LocTypeDto locTypeDto, List<Integer> crnNos) {
    private LocMast getLocNoStep4(LocTypeDto locTypeDto, List<Integer> crnNos,List<LocMast> locMastList) {
        LocMast locMast = null;

        //随机可用堆垛机号
@@ -473,10 +570,16 @@
                    if (!locMast1.getLocSts().equals("O") && !locMast0.getRow1().equals(outermostRow)){
                        // 因库位移转、需预留空库位
                        if (locMastService.checkEmptyCount0(locMast0, 5)) {
                            locMast = locMast0;
                            if (!locMastList.contains(locMast0)){
                                locMast = locMast0;
                                break;
                            }
                        }
                    }else {
                        locMast = locMast0;
                        if (!locMastList.contains(locMast0)){
                            locMast = locMast0;
                            break;
                        }
                    }

                }
@@ -493,7 +596,7 @@
                crns.add(crnNo);
            }
            if (!crns.isEmpty()) {
                return getLocNoStep4(locTypeDto, crns);
                return getLocNoStep4(locTypeDto, crns,locMastList);
            }
        }

@@ -511,9 +614,13 @@
        if (Cools.isEmpty(staDesc)) {
            log.error("入库路径不存在, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
            if (sourceStaNo==103 &&  locMast.getCrnNo()==3){
                throw new CoolException("请放到203入库口");
                throw new CoolException("请放到203入库口--1000");
            }else if (sourceStaNo==203 &&  locMast.getCrnNo()==1){
                throw new CoolException("请放到103入库口");
                throw new CoolException("请放到103入库口--1000");
            }else if (sourceStaNo==113 &&  locMast.getCrnNo()==3){
                throw new CoolException("请放到213入库口--1000");
            }else if (sourceStaNo==213 &&  locMast.getCrnNo()==1){
                throw new CoolException("请放到113入库口--1000");
            }else {
                throw new CoolException("入库路径不存在");
            }