#拣料盘点优化(仍有回库顺序不同堵塞问题)

lty

2025-01-07 9c699c554f021930ee3598261f43e6dfd9cccb9c

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

@@ -597,6 +597,157 @@
        return startupDto;
    }

    public StartupDto getLocNoRunPick(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        int crnNo = 1;//小车编号备用
        RowLastno rowLastno = rowLastnoService.selectById(4);
        LocMast locMast = null;     // 目标库位
        StartupDto startupDto = new StartupDto();
        int curRow = rowLastno.getCurrentRow();
        int sRow = rowLastno.getsRow();
        int eRow = rowLastno.geteRow();
        int nearRow = 8;//特殊单排
        int orbit = 7;//轨道
        // 相似工作档案 --- 同天同规格物料
        if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
            //查询相似工作档案
            List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(1, matnr, batch,null, crnNo);
            for (WrkMast wrkMast:wrkMasts){
                if (Cools.isEmpty(wrkMast.getLocNo())){
                    continue;
                }
                //目标排为轨道外排
                if (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
                    continue;
                }
                //查找此库位的浅库位是否为空
                int value = Integer.valueOf(wrkMast.getLocNo().substring(0, 2)) + 1;
                String loc="0"+value+wrkMast.getLocNo().substring(2);
                LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_no",loc)
                        .eq("loc_sts","O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                );
                if(Cools.isEmpty(locMast1)){
                    continue;
                }
                locMast=locMast1;
                break;
            }

        }

        // 靠近摆放规则 --- 同天同规格物料
        if (Cools.isEmpty(locMast)) {
            List<LocDetl> locNos = locDetlService.getSameDetlToday(matnr, batch,sRow, eRow);
            for (LocDetl locNo : locNos) {
                //目标排为最外层排
                if (Utils.getRow(locNo.getLocNo()) == nearRow || Utils.getRow(locNo.getLocNo()) == orbit){
                    continue;
                }
                LocMast locMast2=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_no",locNo.getLocNo())
                        .eq("loc_sts","F"));
                if(Cools.isEmpty(locMast2)){
                    continue;
                }
                int value = Integer.valueOf(locNo.getLocNo().substring(0, 2)) + 1;
                String loc="0"+value+locNo.getLocNo().substring(2);
                LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_no",loc)
                        .eq("loc_sts","O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                );
                if(Cools.isEmpty(locMast1)){
                    continue;
                }
                locMast=locMast1;
                break;
            }
        }

        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties,  loc.getLocNo());
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
                            continue;
                        }
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                            locMast = shallowLoc;
                            crnNo = locMast.getCrnNo();
                            break;
                        }
                    }
                }
            }
        }

        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", staDescId)
                .eq("stn_no", sourceStaNo)
                .eq("crn_no", 1);
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
            throw new CoolException("入库路径不存在");
        }
        BasDevp staNo = basDevpService.selectById(staDesc.getStnNo());
        if (!staNo.getAutoing().equals("Y")) {
            throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
        }

        // 如果没有相近物料，则按规则轮询货架
        if (null == locMast) {
            LocMast locMast1 = new LocMast();
            if(times != 0){
                locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("row1", 1)
                        .eq("loc_sts","O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .orderBy("lev1,bay1 ASC"));
            } else {
                locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("row1", 8)
                        .eq("loc_sts","O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .orderBy("lev1,bay1 ASC"));
            }
            if(!Cools.isEmpty(locMast1)){
                locMast=locMast1;
            }
        }
        // 更新库位排号
        rowLastno.setCurrentRow(curRow);
        rowLastnoService.updateById(rowLastno);

        // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
            times = times - 1;
            if (times >= 0) {
                return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
            }
            log.error("系统没有空库位！！！ 尺寸规格： {}，", JSON.toJSONString(locTypeDto));
            throw new CoolException("没有空库位");
        }
        String locNo = locMast.getLocNo();
        // 返回找到的库位
        startupDto.setWorkNo(0);
        startupDto.setCrnNo(locMast.getCrnNo());
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setLocNo(locNo);

        return startupDto;
    }

    public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        if (Cools.isEmpty(matnr)) {  //物料号
            matnr = "";