上报逻辑调整

ZY

2024-12-18 184a0722e53f64f40ddb2c88f11f26941f565a8c

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

@@ -144,6 +144,13 @@
            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }

        //存货分类编码规则
        locMast = getLocNoCodeStepRule(matNos, locTypeDto);
        if (locMast != null) {
            //找到库位，返回dto
            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }

        // 靠近摆放规则 --- 相同订单号, 同天同规格物料
        locMast = getLocNoStep3(staDescId, matNos, locTypeDto);
        if (locMast != null) {
@@ -195,12 +202,8 @@
                }

                List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
                for (LocMast locMast0 : locMasts) {
                    //预留空库位
                    if (locMastService.checkEmptyCount(locMast0, 10)) {
                        return locMast0;
                    }
                }
                locMast = locFilter(locMasts, matNos,locTypeDto);

            }

            if (locRules.get(0).getKeepGo() == 0) {
@@ -209,6 +212,46 @@
                throw new CoolException("规则区域没有空库位");
            }
        }

        return locMast;
    }

    /**
     * 库位编码规则
     */
    private LocMast getLocNoCodeStepRule(List<String> matNos, LocTypeDto locTypeDto) {
        LocMast locMast = null;

        //库位编码规则只能在相同编码货物中生效
        String matnr = "";
        for(String matNo : matNos){
            if("".equals(matnr)){
                matnr = matNo.substring(0, 4);
            }
            if(!matnr.equals(matNo.substring(0, 4))){
                return null;
            }
        }

        // 库区锁定
        List<LocRule> locRules = locRuleService.findCode(Cools.isEmpty(matNos) ? null : matNos.get(0),null);
        if (locRules == null || locRules.isEmpty()) {
            return null;//没有库位规则，跳出当前任务
        }

        for (LocRule locRule : locRules) {
            if (locRule == null) {
                continue;
            }
            List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
            locMast = locFilter(locMasts, matNos,locTypeDto);
        }

//            if (locRules.get(0).getKeepGo() == 0) {
//                //找不到空库位，且禁止继续寻找其他非混载区域库位
//                //找不到库位，抛出异常
//                throw new CoolException("规则区域没有空库位");
//            }

        return locMast;
    }
@@ -232,7 +275,7 @@
                //再判断库存明细档，料号相同的明细库位
                List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
                for (String locNo : locNos) {
                    LocMast locMast0 = locMastService.findNearloc(locNo);
                    LocMast locMast0 = locMastService.findInnerLoc(locNo);
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
@@ -344,11 +387,91 @@
                    break;
                }
            }

            if (locMast == null) {
                //单品找不到库位，允许尝试从混放区域中进行搜索
                List<LocMast> locMasts2 = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 1);//搜索单品库位
                //混放区域直接取第一个即可
                for (LocMast mast : locMasts2) {
                    //预留空库位
                    if (locMastService.checkEmptyCount(mast, 10)) {
                        locMast = mast;
                        break;
                    }
                }
            }
        }

        return locMast;
    }

    /*
    库存规则搜索到的库位确认
     */
    private LocMast locFilter(List<LocMast> locMasts,List<String> matNos,LocTypeDto locTypeDto){
        for (LocMast locMast0 : locMasts) {
            if(!VersionUtils.checkLocType(locMast0,locTypeDto)){
                continue;
            }
            //单品物料
            if (matNos.size() == 1) {
                //如果不是深浅，则直接返回当前库位
                if(Cools.isEmpty(Utils.getGroupDeepLoc(locMast0.getLocNo()))){
                    return locMast0;
                }else{
                    List<String> groupInnerLoc = Utils.getGroupInnerLoc(locMast0.getLocNo());
                    //如果是深浅库位，但是内测无库位的情况下，则直接返回当前库位
                    if (Cools.isEmpty(groupInnerLoc)) {
                        return locMast0;
                    }else {
                        //获取最深的库位
                        String loc = groupInnerLoc.get(groupInnerLoc.size() - 1);
                        LocMast locMast1 = locMastService.selectByLoc(loc);
                        //如果最深测库位为空库位，则直接返回最深库位
                        if("O".equals(locMast1.getLocSts())){
                            return locMast1;
                        }else {
                            //如果最深库位状态不为F或者O，则跳出当前的深浅库位查找
                            if(!"F".equals(locMast1.getLocSts())){
                                continue;
                            }
                            List<LocDetl> locDetls = locDetlService.selectByLocNo(loc);
                            //如果当前深库位物料与入库物料不相符，则跳出当前深浅库位查找
                            if(!Cools.eq(locDetls.get(0).getMatnr(),matNos.get(0))){
                                continue;
                            }
                            //从里往外依次遍历该组深浅库位
                            for (int i=groupInnerLoc.size()-1; i>=0 ;i--){
                                LocMast locMast2 = locMastService.selectByLoc(groupInnerLoc.get(i));
                                if("O".equals(locMast2.getLocSts())){
                                    //如果深库位中含有0状态的库位，则直接返回该库位
                                    return locMast2;
                                }else if("F".equals(locMast2.getLocSts())){
                                    //如果对于locaMast0最近的一个库位也为F状态，则返回locaMastO
                                    if(i==0){
                                        return locMast0;
                                    }else {
                                        //如果该组深浅库位中含有既不为F也不为O的库位，则跳出当前深浅库位查找
                                        continue;
                                    }
                                }else {
                                    break;
                                }
                            }
                        }

                    }
                }
            }else {
                if(Cools.isEmpty(Utils.getGroupDeepLoc(locMast0.getLocNo()))){
                    return locMast0;
                }
            }

        }
        return null;
    }

    //返回dto
    private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
        StartupDto startupDto = new StartupDto();
@@ -380,4 +503,215 @@
        return startupDto;
    }

    /**
     * 四向库获取库位
     */
    public StartupDto getShuttleLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
        RowLastno rowLastno = rowLastnoService.selectOne(new EntityWrapper<RowLastno>().eq("whs_type", 1));
        //起始层
        Integer startLev = rowLastno.getCurrentRow();
        return getShuttleLocNo(staDescId, sourceStaNo, matNos, locTypeDto, startLev, 0);
    }

    public StartupDto getShuttleLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int startLev, int times) {
        RowLastno rowLastno = rowLastnoService.selectOne(new EntityWrapper<RowLastno>().eq("whs_type", 1));
        //起始层
        Integer currentLev = rowLastno.getCurrentRow();
        if (times > 0 && startLev == currentLev) {
            throw new CoolException("未找到可用库位");
        }
        rowLastno.setCurrentRow(currentLev >= rowLastno.geteRow() ? rowLastno.getsRow() : currentLev + 1);//更新楼层
        rowLastnoService.updateById(rowLastno);

        // 目标库位
        LocMast locMast = null;

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

        //单品物料 靠近摆放规则 --- 相同订单号, 同天同规格物料
        locMast = getShuttleSingleLocNo(matNos, locTypeDto, currentLev);
        if (locMast != null) {
            //找到库位，返回dto
            return getShuttleLocStartupDto(staDescId, sourceStaNo, locMast);//返回dto
        }

        // 靠近摆放规则 --- 相同订单号, 同天同规格物料
        locMast = getShuttleMixedLocNo(matNos, locTypeDto, currentLev);
        if (locMast != null) {
            //找到库位，返回dto
            return getShuttleLocStartupDto(staDescId, sourceStaNo, locMast);//返回dto
        }

        return getShuttleLocNo(staDescId, sourceStaNo, matNos, locTypeDto, startLev, times + 1);
    }

    //搜索空货架库位
    private LocMast getShuttleEmptyLocNo(Integer staDescId, LocTypeDto locTypeDto, int lev) {
        LocMast locMast = null;
        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            //先判断工作档，查找主档IOType=1， wrkSts < 10的工作明细，料号相同的明细库位
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10));
            for (WrkMast wrkMast : wrkMasts) {
                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                        locMast = locMast0;
                        break;
                    }
                }
            }
            if (Cools.isEmpty(locMast)) {
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("loc_sts", "O").eq("lev1", lev).orderBy("row1,bay1,lev1"));
                if (!locMasts.isEmpty()) {
                    for (LocMast loc : locMasts) {
                        LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
                        if (null != locMast0) {
                            // 浅库位符合尺寸检测
                            if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                                locMast = locMast0;
                                break;
                            }
                        }
                    }
                }
            }
        }

        return locMast;
    }

    //混放物料
    private LocMast getShuttleMixedLocNo(List<String> matNos, LocTypeDto locTypeDto, Integer lev) {
        LocMast locMast = null;
        if (matNos.size() > 1) {
            List<LocMast> locMasts = locMastService.selectAreaEmptyByLev(locTypeDto.getLocType1(), 1, lev);//搜索混放库位
            //混放区域直接取第一个即可
            for (LocMast mast : locMasts) {
                // 浅库位符合尺寸检测
                if (VersionUtils.checkLocType(mast, locTypeDto)) {
                    locMast = mast;
                    break;
                }
            }
        }
        return locMast;
    }

    //单品物料 靠近摆放规则 --- 相同订单号, 同天同规格物料
    private LocMast getShuttleSingleLocNo(List<String> matNos, LocTypeDto locTypeDto, int lev) {
        LocMast locMast = null;
        if (matNos.size() == 1) {
            String matNo = matNos.get(0);//物料号
            //先判断工作档，查找主档IOType=1， wrkSts < 10的工作明细，料号相同的明细库位
            List<WrkMast> wrkMasts = wrkMastService.selectSameLevMatnrs(matNo, lev);
            for (WrkMast wrkMast : wrkMasts) {
                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                        locMast = locMast0;
                    }
                }
            }
            if (Cools.isEmpty(locMast)) {
                //再判断库存明细档，料号相同的明细库位
                List<String> locNos = locDetlService.getSameLevDetl(matNo, lev);
                for (String locNo : locNos) {
                    LocMast locMast0 = locMastService.findInnerLoc(locNo);
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
                            locMast = locMast0;
                            break;
                        }
                    }
                }
            }
            if (Cools.isEmpty(locMast)) {
                //找新库位
                List<LocMast> locMasts = locMastService.selectAreaEmptyByLev(locTypeDto.getLocType1(), 2, lev);//搜索单品库位
                for (LocMast mast : locMasts) {
                    List<String> groupLoc = Utils.getGroupLoc(mast.getLocNo());
                    if (!locMastService.checkAllLocEmpty(groupLoc)) {
                        continue;
                    }

                    LocMast tmp = null;
                    for (String loc : groupLoc) {
                        LocMast locMast1 = locMastService.selectByLoc(loc);
                        if (locMast1 == null) {
                            continue;
                        }

                        if (!locMast1.getLocSts().equals("O")) {
                            continue;
                        }

                        // 浅库位符合尺寸检测
                        if (VersionUtils.checkLocType(locMast1, locTypeDto)) {
                            tmp = locMast1;
                            break;
                        }
                    }
                    if (!Cools.isEmpty(tmp)) {
                        locMast = tmp;
                        break;
                    }
                }
            }
            if (Cools.isEmpty(locMast)) {
                //单品找不到库位，允许尝试从混放区域中进行搜索
                List<LocMast> locMasts2 = locMastService.selectAreaEmptyByLev(locTypeDto.getLocType1(), 1, lev);//搜索混放库位
                //混放区域直接取第一个即可
                for (LocMast mast : locMasts2) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.checkLocType(mast, locTypeDto)) {
                        locMast = mast;
                        break;
                    }
                }
            }
        }
        return locMast;
    }

    //返回dto
    private StartupDto getShuttleLocStartupDto(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
        StartupDto startupDto = new StartupDto();
        String locNo = locMast.getLocNo();
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", staDescId)
                .eq("stn_no", sourceStaNo)
                .eq("crn_no",Utils.stnNoToLiftNo(sourceStaNo));//借用堆垛机号字段充当提升机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            log.error("入库路径不存在, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
            throw new CoolException("入库路径不存在");
        }

        // 检测目标站
        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
        if (!staNo.getAutoing().equals("Y")) {
            throw new CoolException("目标站" + staDesc.getCrnStn() + "不可用");
        }

        // 生成工作号
        int workNo = getWorkNo(0);
        // 返回dto
        startupDto.setWorkNo(workNo);
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setStaNo(staNo.getDevNo());
        startupDto.setLocNo(locMast.getLocNo());
        return startupDto;
    }

}