123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -16,9 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.*;

/**
 * 货架核心功能
@@ -35,6 +33,18 @@
    public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
        add(18);add(19);add(20);
        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
@@ -100,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;//物料类型
@@ -119,6 +132,7 @@
        ArrayList<Integer> rows = new ArrayList<>();
        switch (sourceStaNo) {
            case 103://103入库站
            case 113://103入库站
                whsType = 1;
                start = 1;
                end = 14;
@@ -135,12 +149,13 @@
                crnNo = 1;
                break;
            case 203://203入库站
            case 213://203入库站
                whsType = 2;
                start = 8;
                end = 21;

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

                //分配8，14，15，21排
@@ -170,7 +185,7 @@
        }

        //3号可以入库前必须打开控制
        if (!Cools.isEmpty(matNos) && crnNo==3) {
        if (!Cools.isEmpty(matNos)) {
            for (String matNo : matNos) {
                Mat mat = matService.selectByMatnr(matNo);
                if (matType == null) {
@@ -180,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;
                }
@@ -222,35 +278,38 @@



        if (!sign){
            //----------------2023.06.02兼容代码，后期库位规则符合要求后可删除------------------------
            //如果以上都找不到库位，则强制搜索2堆垛机空库位进行入库，保障3号堆垛机库位都是符合要求的
            EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
            wrapper.eq("loc_type1", locTypeDto.getLocType1());
            wrapper.in("crn_no", "2");
            wrapper.eq("loc_sts", "O");
            List<LocMast> locMasts = locMastService.selectList(wrapper);
            for (LocMast mast : locMasts) {
                //检测当前库位内侧其他库位是否为D、F、X
                if (Utils.checkInsideLocIsDFX(mast.getLocNo())) {
                    //内侧其他库位不是D、F、X。不能选取该库位
                    continue;
                }
                if(sourceStaNo==103 && mast.getRow1()>14) continue;
                if(sourceStaNo==103 && mast.getRow1()<8) continue;
                if(sourceStaNo==203 && mast.getRow1()<15) continue;
                //找到库位，返回dto
                locMast=mast;
                sign = true;
            }
        }
//        if (!sign){
//            //----------------2023.06.02兼容代码，后期库位规则符合要求后可删除------------------------
//            //如果以上都找不到库位，则强制搜索2堆垛机空库位进行入库，保障3号堆垛机库位都是符合要求的
//            EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
//            wrapper.eq("loc_type1", locTypeDto.getLocType1());
//            wrapper.in("crn_no", "2");
//            wrapper.eq("loc_sts", "O");
//            List<LocMast> locMasts = locMastService.selectList(wrapper);
//            for (LocMast mast : locMasts) {
//                //检测当前库位内侧其他库位是否为D、F、X
//                if (Utils.checkInsideLocIsDFX(mast.getLocNo())) {
//                    //内侧其他库位不是D、F、X。不能选取该库位
//                    continue;
//                }
//                if(sourceStaNo==103 && mast.getRow1()>14) continue;
//                if(sourceStaNo==103 && mast.getRow1()<8) continue;
//                if(sourceStaNo==203 && mast.getRow1()<15) continue;
//                //找到库位，返回dto
//                locMast=mast;
//                sign = true;
//            }
//        }

        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检索库位失败，请联系管理员");
    }

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

    //单品类型入库
    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;
        //先找工作档

        List<WrkMast> wrkMasts = wrkMastService.selectSameWrkMast(matNos.get(0));
        for (WrkMast wrkMast : wrkMasts) {
            List<String> groupLoc = Utils.getGroupLoc(wrkMast.getLocNo());
            //随机可用堆垛机号
            Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
            List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, randomCrnNo);
            for (LocMast locMast0 : locMasts) {
                //检测当前库位内侧其他库位是否为D、F、X、S
                if (Utils.checkInsideLocIsDFXS(locMast0.getLocNo())) {
                    //内侧其他库位不是D、F、X、S。不能选取该库位
                    continue;
                }
            Collections.shuffle(crnNos);
            loc:
            for (Integer crnNo : crnNos) {
                List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, crnNo);
                for (LocMast locMast0 : locMasts) {
                    //检测当前库位内侧其他库位是否为D、F、X、S
                    if (Utils.checkInsideLocIsDFXS(locMast0.getLocNo())) {
                        //内侧其他库位不是D、F、X、S。不能选取该库位
                        continue;
                    }

                // 浅库位符合尺寸检测
                if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                    // 浅库位对应堆垛机必须可用且无异常
                    if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                        // 因库位移转、需预留空库位
                        if (locMastService.checkEmptyCount(locMast0, 10)) {
                            locMast = locMast0;
                            break;
                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 5)) {
                                if (!locMastList.contains(locMast0)){
                                    locMast = locMast0;
                                    break loc;
                                }
                            }
                        }
                    }
                }
            }

        }

        //找内侧空库位(非最外侧库位)
        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);
@@ -332,9 +400,11 @@
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
                                locMast = locMast0;
                                break;
                            if (locMastService.checkEmptyCount(locMast0, 5)) {
                                if (!locMastList.contains(locMast0)){
                                    locMast = locMast0;
                                    break loc;
                                }
                            }
                        }
                    }
@@ -345,25 +415,60 @@
        //未找到巷道，找一条新的空巷道
        if (locMast == null) {
            //随机可用堆垛机号
            Boolean flag = false;
            Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
            List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, randomCrnNo);//找一条新的空巷道
            for (LocMast locMast0 : locMasts) {
                //检测当前库位内侧其他库位是否为D、F、X
                if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
                    //内侧其他库位不是D、F、X。不能选取该库位
                    continue;
                }
            Collections.shuffle(crnNos);
            for (Integer crnNo : crnNos) {
                List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, crnNo);//找一条新的空巷道
                for (LocMast locMast0 : locMasts) {
                    //检测当前库位内侧其他库位是否为D、F、X
                    if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
                        //内侧其他库位不是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) && locMast0.getCrnNo()>=3) {
                            locMast = locMast0;
                            break;
                    // 浅库位符合尺寸检测
                    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;
                                }
                            }
                        }
                    }
                }
                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;
                                    }
                                }
                            }
                        }
                    }
                }
                if (flag) {
                    break;
                }
            }
        }
@@ -372,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;

        //随机可用堆垛机号
@@ -386,9 +491,9 @@
        //找最外侧空库位
        List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), randomCrnNos);
        for (LocMast locMast0 : locMasts) {
            //检测当前库位内侧其他库位是否为D、F、X
            if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
                //内侧其他库位不是D、F、X。不能选取该库位
            //检测当前库位内侧其他库位是否为D、F、X、O
            if (Utils.checkInsideLocIsDFXO(locMast0.getLocNo())) {
                //内侧其他库位不是D、F、X、O。不能选取该库位
                continue;
            }

@@ -397,10 +502,27 @@
                // 浅库位对应堆垛机必须可用且无异常
                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;
                        }
                    }
                }
            }
        }

        //剔除当前随机堆垛机元素尝试重新查找
        if (locMast == null) {
            ArrayList<Integer> crns = new ArrayList<>();
            for (int crnNo : crnNos) {
                if (randomCrnNo == crnNo) {
                    continue;
                }
                crns.add(crnNo);
            }
            if (!crns.isEmpty()) {
                return getLocNoStep3(locTypeDto, crns,locMastList);
            }
        }

@@ -408,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;

        //随机可用堆垛机号
@@ -443,11 +565,38 @@
            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                // 浅库位对应堆垛机必须可用且无异常
                if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                    // 因库位移转、需预留空库位
                    if (locMastService.checkEmptyCount(locMast0, 10)) {
                        locMast = locMast0;
                    Integer outermostRow = Utils.getOutermostRow(locMast0.getLocNo(), true);
                    LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", outermostRow).eq("bay1", locMast0.getBay1()).eq("lev1", locMast0.getLev1()));
                    if (!locMast1.getLocSts().equals("O") && !locMast0.getRow1().equals(outermostRow)){
                        // 因库位移转、需预留空库位
                        if (locMastService.checkEmptyCount0(locMast0, 5)) {
                            if (!locMastList.contains(locMast0)){
                                locMast = locMast0;
                                break;
                            }
                        }
                    }else {
                        if (!locMastList.contains(locMast0)){
                            locMast = locMast0;
                            break;
                        }
                    }

                }
            }
        }

        //剔除当前随机堆垛机元素尝试重新查找
        if (locMast == null) {
            ArrayList<Integer> crns = new ArrayList<>();
            for (int crnNo : crnNos) {
                if (randomCrnNo == crnNo) {
                    continue;
                }
                crns.add(crnNo);
            }
            if (!crns.isEmpty()) {
                return getLocNoStep4(locTypeDto, crns,locMastList);
            }
        }

@@ -464,7 +613,17 @@
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            log.error("入库路径不存在, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
            throw new CoolException("入库路径不存在");
            if (sourceStaNo==103 &&  locMast.getCrnNo()==3){
                throw new CoolException("请放到203入库口--1000");
            }else if (sourceStaNo==203 &&  locMast.getCrnNo()==1){
                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("入库路径不存在");
            }
        }

        // 检测目标站