#

LSH

2023-10-24 ce02c16c7c8cf643dda9eade8e958ab2183384b7

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

@@ -50,6 +50,7 @@

    /**
     * 生成工作号
     *
     * @param wrkMk
     * @return workNo(工作号)
     */
@@ -62,17 +63,17 @@
        int workNo = wrkLastno.getWrkNo();
        int sNo = wrkLastno.getSNo();
        int eNo = wrkLastno.getENo();
        workNo = workNo>=eNo ? sNo : workNo+1;
        workNo = workNo >= eNo ? sNo : workNo + 1;
        while (true) {
            WrkMast wrkMast = wrkMastService.selectById(workNo);
            if (null != wrkMast) {
                workNo = workNo>=eNo ? sNo : workNo+1;
                workNo = workNo >= eNo ? sNo : workNo + 1;
            } else {
                break;
            }
        }
        // 修改序号记录
        if (workNo > 0){
        if (workNo > 0) {
            wrkLastno.setWrkNo(workNo);
            wrkLastnoService.updateById(wrkLastno);
        }
@@ -80,7 +81,7 @@
        if (workNo == 0) {
            throw new CoolException("生成工作号失败，请联系管理员");
        } else {
            if (wrkMastService.selectById(workNo)!=null) {
            if (wrkMastService.selectById(workNo) != null) {
                throw new CoolException("生成工作号" + workNo + "在工作档中已存在");
            }
        }
@@ -89,22 +90,23 @@

    /**
     * 检索库位号
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径ID
     *
     * @param whsType     类型 1:双深式货架
     * @param staDescId   路径ID
     * @param sourceStaNo 源站
     * @param matnr 物料号集合
     * @param matnr       物料号集合
     * @return locNo 检索到的库位号
     */
    @Transactional
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch,String grade,LocTypeDto locTypeDto, int times) {
        if (Cools.isEmpty(matnr)){  //物料号
            matnr="";
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto, int times) {
        if (Cools.isEmpty(matnr)) {  //物料号
            matnr = "";
        }
        if (Cools.isEmpty(batch)){  //箱号
            batch="";
        if (Cools.isEmpty(batch)) {  //箱号
            batch = "";
        }
        if (Cools.isEmpty(grade)){  //备用
            grade="";
        if (Cools.isEmpty(grade)) {  //备用
            grade = "";
        }

        // 初始化参数
@@ -126,29 +128,23 @@
        // ===============>>>> 开始执行
        curRow = rowLastno.getCurrentRow();

        int[] locNecessaryParameters  = Utils.LocNecessaryParameters(whsType, curRow,crnNumber);
        rowCount=locNecessaryParameters[0];
        curRow=locNecessaryParameters[1];
        crnNo=locNecessaryParameters[2];
        nearRow=locNecessaryParameters[3];
        if (!basCrnpService.checkSiteError(crnNo,true)){  //此程序用于优化堆垛机异常时的运行时间
            times++;
            for (int i=times;i<Utils.RowCount(whsType,curRow,crnNumber);i++){
                locNecessaryParameters  = Utils.LocNecessaryParameters(whsType, curRow,crnNumber);
                rowCount=locNecessaryParameters[0];
                curRow=locNecessaryParameters[1];
                crnNo=locNecessaryParameters[2];
                nearRow=locNecessaryParameters[3];
                if (basCrnpService.checkSiteError(crnNo,true)){
                    break;
                }else {
                    times++;
                }
            }
            if (times==Utils.RowCount(whsType,curRow,crnNumber)){
                throw new CoolException("无可用堆垛机");
        //此程序用于优化堆垛机异常时的运行时间
        for (int i = times; i < crnNumber; i++) {
            int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
            curRow = locNecessaryParameters[1];
            crnNo = locNecessaryParameters[2];
            if (basCrnpService.checkSiteError(crnNo, true)) {
                rowCount =  locNecessaryParameters[0];
                nearRow = locNecessaryParameters[3];
                break;
            } else {
                times++;
            }
        }
        if (nearRow == 0) {
            throw new CoolException("无可用堆垛机");
        }


//        // 靠近摆放规则 --- 同天同规格物料 //分离版
//        if (!Cools.isEmpty(matnr) &&  (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
@@ -171,7 +167,7 @@

        // 靠近摆放规则 --- 同天同规格物料 //互通版
        if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
            List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
            List<String> locNos = locDetlService.getSameDetlToday(matnr,batch, sRow, eRow);
            for (String locNo : locNos) {
                if (Utils.isShallowLoc(slaveProperties, locNo)) {
                    continue;
@@ -215,7 +211,7 @@
                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties,  loc.getLocNo());
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
@@ -235,7 +231,7 @@
        StaDesc staDesc = null;
        BasDevp staNo = null;

        if (Utils.BooleanWhsTypeSta(whsType,staDescId)){
        if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
            // 获取目标站
            wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", staDescId)
@@ -245,18 +241,18 @@
            if (Cools.isEmpty(staDesc)) {
                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
//                throw new CoolException("入库路径不存在");
                crnNo=0;
                crnNo = 0;
            }
            staNo = basDevpService.selectById(staDesc.getCrnStn());
            if (!staNo.getAutoing().equals("Y")) {
//                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
                crnNo=0;
                crnNo = 0;
            }
            startupDto.setStaNo(staNo.getDevNo());
        }

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType,staDescId)){
        if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
            rowLastno.setCurrentRow(curRow);
            rowLastnoService.updateById(rowLastno);
        }
@@ -264,31 +260,31 @@
        // 开始查找库位 ==============================>>

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo!=0){
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
            for (LocMast locMast1:locMasts){
            for (LocMast locMast1 : locMasts) {
                if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
                }
                String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
                LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc).eq("loc_sts","O"));
                if (!Cools.isEmpty(locMast2)){
                String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
                LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
                if (!Cools.isEmpty(locMast2)) {
                    locMast = locMast2;
                    break;
                }
            }
        }

        if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo,true)){
        if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
            locMast = null;
        }

        // 递归查询
        if (Cools.isEmpty(locMast)  || !locMast.getLocSts().equals("O")) {
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < rowCount) {
                times = times + 1;
                return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, times);
                return getLocNo(1, staDescId, sourceStaNo, matnr, batch, grade, locTypeDto, times);
            }
//            // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
//            if (locTypeDto.getLocType1() < 2) {