#

whycq

2023-09-05 e9f4a368fd3845a38eb54d3d18d77e96e5767b61

 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.*;

/**
 * 货架核心功能
@@ -112,6 +110,7 @@
        int start;
        int end;
        Integer matType = null;//物料类型
        Integer crnNo  = 0;
        //根据入库站，决定搜索指定堆垛机
        ArrayList<Integer> crnNos = new ArrayList<>();
        //根据入库站，找到库位组最内侧排
@@ -131,6 +130,7 @@
                rows.add(7);
                rows.add(8);
                rows.add(14);
                crnNo = 1;
                break;
            case 203://203入库站
                whsType = 2;
@@ -146,6 +146,7 @@
                rows.add(14);
                rows.add(15);
                rows.add(21);
                crnNo = 3;
                break;
            default:
                throw new CoolException("检索库位失败，请联系管理员");
@@ -166,12 +167,37 @@
            sign=true;
        }

        //3号可以入库前必须打开控制
        if (!Cools.isEmpty(matNos)) {
            for (String matNo : matNos) {
                Mat mat = matService.selectByMatnr(matNo);
                if (matType == null) {
                    matType = mat.getMatType();
                }
                if (!matType.equals(mat.getMatType())) {
                    throw new CoolException("混放物料类型不一致");
                }
            }

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

        if (!sign && matType != null) {
            if (matType == 1) {//单品类型入库
                locMast = getLocNoStep2(locTypeDto, matNos, rows, crnNos);
                if (locMast != null) {
                    //找到库位，返回dto
                    sign=true;
                } else {
                    //单品没有找到库位，找高频混放区域库位
                    locMast = getLocNoStep3(locTypeDto, crnNos);
                    if (locMast != null) {
                        //找到库位，返回dto
                        sign=true;
                    }
                }
            } else if (matType == 2) {//高频类型入最外侧库位
                locMast = getLocNoStep3(locTypeDto, crnNos);
@@ -194,52 +220,30 @@



        if (!sign){
            //----------------2023.06.02兼容代码，后期库位规则符合要求后可删除------------------------
            //如果以上都找不到库位，则强制搜索1、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()>7)
                {
                    continue;
                }
                if(sourceStaNo==203 && mast.getRow1()<8)
                {
                    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){
            //3号可以入库前必须打开控制
            if (!Cools.isEmpty(matNos) && locMast.getCrnNo()==3) {
                for (String matNo : matNos) {
                    Mat mat = matService.selectByMatnr(matNo);
                    if (matType == null) {
                        matType = mat.getMatType();
                    }
                    if (!matType.equals(mat.getMatType())) {
                        throw new CoolException("混放物料类型不一致");
                    }
                }

                if (matNos.size() > 1 && matType == 1) {
                    //物料为单品类型，且物料种类超过1(实际为高频混放)，则禁止入库
                    throw new CoolException("物料类型和实际种类不一致");
                }
            }
            return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
        }
        //----------------2023.06.02兼容代码end---------------------
@@ -281,31 +285,35 @@
    private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows, List<Integer> crnNos) {
        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;
                }
            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, 10)) {
                                locMast = locMast0;
                                break;
                            }
                        }
                    }
                }
            }

        }

        //找内侧空库位(非最外侧库位)
@@ -339,25 +347,33 @@
        //未找到巷道，找一条新的空巷道
        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;
                    }

                // 浅库位符合尺寸检测
                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, 10)) {
                                locMast = locMast0;
                                flag = true;
                                break;
                            }
                        }
                    }
                }
                if (flag) {
                    break;
                }
            }
        }
@@ -380,9 +396,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;
            }

@@ -395,6 +411,20 @@
                        locMast = locMast0;
                    }
                }
            }
        }

        //剔除当前随机堆垛机元素尝试重新查找
        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);
            }
        }

@@ -437,11 +467,32 @@
            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                // 浅库位对应堆垛机必须可用且无异常
                if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                    // 因库位移转、需预留空库位
                    if (locMastService.checkEmptyCount(locMast0, 10)) {
                    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)) {
                            locMast = locMast0;
                        }
                    }else {
                        locMast = locMast0;
                    }

                }
            }
        }

        //剔除当前随机堆垛机元素尝试重新查找
        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);
            }
        }

@@ -458,7 +509,13 @@
        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入库口");
            }else if (sourceStaNo==203 &&  locMast.getCrnNo()==1){
                throw new CoolException("请放到103入库口");
            }else {
                throw new CoolException("入库路径不存在");
            }
        }

        // 检测目标站