#

lsh

2024-06-20 511e1c1754b21d14be1ef1ef5bec8e6453ef32b2

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

@@ -139,7 +139,7 @@
                    log.error("站点={} 未查询到对应的规则",sourceStaNo);
                    break;
                case 4:
                    return getLocNoRun2(whsType,staDescId,sourceStaNo,matnr,batch,grade,3,locTypeDto,0);
                    return getLocNoRun2(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0);
                case 5:
                    return getLocNoRun2(whsType,staDescId,sourceStaNo,matnr,batch,grade,3,locTypeDto,0);
                default:
@@ -536,6 +536,8 @@
            int nearbay = 0;    //相似工作档案 目标库位列
            int nearlev = 0;    //相似工作档案 目标库位层
            for (WrkMast wrkMast:wrkMasts){
                int curRowW = curRow;    //相似工作档案 最深库位排
                int nearRowW = nearRow;    //相似工作档案 最浅库位排
                if (Cools.isEmpty(wrkMast.getLocNo())){
                    continue;
                }
@@ -554,15 +556,26 @@
                    nearbay=Utils.getBay(wrkMast.getLocNo());
                    nearlev=Utils.getLev(wrkMast.getLocNo());
                }

                //获取目标库位所在巷道并排序
//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
                LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());

                for (int i = 0; i < crnNumber*2; i++) {
                    if (!(Utils.getRow(locMastGro.getLocNo())>nearRowW && Utils.getRow(locMastGro.getLocNo())<=curRowW) && !(Utils.getRow(locMastGro.getLocNo())<nearRowW && Utils.getRow(locMastGro.getLocNo())>=curRowW) ){
                        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
                        curRowW = locNecessaryParameters[1];
                        nearRowW = locNecessaryParameters[3];
                    }else {
                        break;
                    }
                }

                //获取目标库位所在巷道最浅非空库位
                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMastGro,rowLastnoType.getType().longValue());
                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());

                //目标库位所在巷道最浅非空库位存在&&非最外侧库位&&入库状态
                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRow && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))){
                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))){
                    //获取库存明细
                    WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    //判断同规格物料
@@ -570,13 +583,16 @@
                            && batch.equals(batch.isEmpty() ? "":wrkDetl.getBatch())
                            && grade.equals(grade.isEmpty()? "":wrkDetl.getBrand())){
                        int row2=0;
                        if (Utils.getRow(locMast2.getLocNo())>nearRow){
                        if (Utils.getRow(locMast2.getLocNo())>nearRowW){
                            row2=Utils.getRow(locMast2.getLocNo())-1;
                        } else {
                            row2=Utils.getRow(locMast2.getLocNo())+1;
                        }
                        String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
                        locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo));
                        locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
                        if (Cools.isEmpty(locMast)){
                            continue;
                        }
                        break;
                    }
                }