#bug修复

LSH

2023-08-29 1aae6f4bd840a202ee9db3efa3f6776cd10b81f9

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -16,7 +17,9 @@
import org.springframework.stereotype.Service;

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

/**
 * 货架核心功能
@@ -110,6 +113,7 @@
        int start;
        int end;
        Integer matType = null;//物料类型
        Integer crnNo  = 0;
        //根据入库站，决定搜索指定堆垛机
        ArrayList<Integer> crnNos = new ArrayList<>();
        //根据入库站，找到库位组最内侧排
@@ -118,30 +122,34 @@
            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);
                crnNo = 1;
                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);
                crnNo = 3;
                break;
            default:
                throw new CoolException("检索库位失败，请联系管理员");
@@ -153,13 +161,23 @@
        // 目标库位
        LocMast locMast = null;

        boolean sign = false;

        // 靠近摆放规则 --- 空托
        locMast = getLocNoStep1(staDescId, locTypeDto, start, end);
        if (locMast != null) {
            //找到库位，返回dto
            sign=true;
        }

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

        // 靠近摆放规则 --- 空托
        locMast = getLocNoStep1(staDescId, locTypeDto, start, end);
        if (locMast != null) {
            //找到库位，返回dto
            return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
        }

        if (matType != null) {
        if (!sign && matType != null) {
            if (matType == 1) {//单品类型入库
                locMast = getLocNoStep2(locTypeDto, matNos, rows);
                locMast = getLocNoStep2(locTypeDto, matNos, rows, crnNos);
                if (locMast != null) {
                    //找到库位，返回dto
                    return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
                    sign=true;
                } else {
                    //单品没有找到库位，找高频混放区域库位
                    locMast = getLocNoStep3(locTypeDto, crnNos);
                    if (locMast != null) {
                        //找到库位，返回dto
                        sign=true;
                    }
                }
            } else if (matType == 2) {//高频类型入最外侧库位
                locMast = getLocNoStep3(locTypeDto, crnNos);
                if (locMast == null) {
                    //高频没有找到库位，找低频混放区域库位
                    locMast = getLocNoStep4(locTypeDto, crnNos);
                }
                if (locMast != null) {
                    //找到库位，返回dto
                    return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
                    sign=true;
                }
            } else if (matType == 3) {//低频混放类型
                locMast = getLocNoStep4(locTypeDto);
                locMast = getLocNoStep4(locTypeDto, crnNos);
                if (locMast != null) {
                    //找到库位，返回dto
                    return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//返回dto
                    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
        }
        //----------------2023.06.02兼容代码end---------------------

        throw new CoolException("检索库位失败，请联系管理员");
    }
@@ -233,22 +285,61 @@
    }

    //单品类型入库
    private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows) {
    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());
            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;
                            }
                        }
                    }
                }
            }

        }

        //找内侧空库位(非最外侧库位)
        List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
        for (String locNo : locNos) {
            List<String> groupLoc = Utils.getGroupLoc(locNo);
            LocMast locMast0 = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc);
            if (null != locMast0) {
                // 浅库位符合尺寸检测
                if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                    // 浅库位对应堆垛机必须可用且无异常
                    if (true || basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                        // 因库位移转、需预留空库位
                        if (locMastService.checkEmptyCount(locMast0, 10)) {
                            locMast = locMast0;
                            break;
        if (locMast == null) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
            for (String locNo : locNos) {
                List<String> groupLoc = Utils.getGroupLoc(locNo);
                List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, null);
                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;
                            }
                        }
                    }
                }
@@ -257,7 +348,30 @@

        //未找到巷道，找一条新的空巷道
        if (locMast == null) {
            locMast = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows);//找一条新的空巷道
            //随机可用堆垛机号
            Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
            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;
                            }
                        }
                    }
                }
            }
        }

        return locMast;
@@ -266,13 +380,28 @@
    //高频类型入最外侧库位
    private LocMast getLocNoStep3(LocTypeDto locTypeDto, List<Integer> crnNos) {
        LocMast locMast = null;

        //随机可用堆垛机号
        Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
        if (randomCrnNo == null) {
            return locMast;
        }
        ArrayList<Integer> randomCrnNos = new ArrayList<>();
        randomCrnNos.add(randomCrnNo);

        //找最外侧空库位
        LocMast locMast0 = locMastService.findOutMast(locTypeDto.getLocType1(), crnNos);
        if (locMast0 != null) {
        List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), randomCrnNos);
        for (LocMast locMast0 : locMasts) {
            //检测当前库位内侧其他库位是否为D、F、X、O
            if (Utils.checkInsideLocIsDFXO(locMast0.getLocNo())) {
                //内侧其他库位不是D、F、X、O。不能选取该库位
                continue;
            }

            // 浅库位符合尺寸检测
            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                // 浅库位对应堆垛机必须可用且无异常
                if (true||basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                    // 因库位移转、需预留空库位
                    if (locMastService.checkEmptyCount(locMast0, 10)) {
                        locMast = locMast0;
@@ -285,18 +414,52 @@
    }

    //低频类型，直接找混放区域
    private LocMast getLocNoStep4(LocTypeDto locTypeDto) {
    private LocMast getLocNoStep4(LocTypeDto locTypeDto, List<Integer> crnNos) {
        LocMast locMast = null;
        LocMast locMast0 = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1());
        if (locMast0 != null) {

        //随机可用堆垛机号
        Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());

        List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1(), randomCrnNo);
        for (LocMast locMast0 : locMasts) {
            //检测当前库位内侧其他库位是否为D、F、X
            if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
                //内侧其他库位不是D、F、X。不能选取该库位
                continue;
            }

            //检测当前库位外侧库位是否为O(空库位)
            boolean flag = false;
            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)) {
                // 浅库位对应堆垛机必须可用且无异常
                if (true||basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                    // 因库位移转、需预留空库位
                    if (locMastService.checkEmptyCount(locMast0, 10)) {
                if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                    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;
                    }

                }
            }
        }
@@ -314,7 +477,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("入库路径不存在");
            }
        }

        // 检测目标站