#四向库入库修改

zjj

2025-02-13 64b43585fc8bed4612b32d7984729c5b1e449cf6

#四向库入库修改

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -526,27 +526,27 @@
        curRow = curRow - offset;
        //满板正常入库
        switch (curRow){
            case 1:
                necessaryParameters[1] = 4;    //curRow   最深库位排
            case 2:
                necessaryParameters[1] = 5;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 6;    //nearRow  最浅库位排
                necessaryParameters[3] = 4;    //nearRow  最浅库位排
                break;
            case 4:
                necessaryParameters[1] = 7;    //curRow   最深库位排
            case 5:
                necessaryParameters[1] = 6;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 7;    //nearRow  最浅库位排
                break;
            case 7:
                necessaryParameters[1] = 9;    //curRow   最深库位排
            case 6:
                necessaryParameters[1] = 10;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 11;    //nearRow  最浅库位排
                necessaryParameters[3] = 9;    //nearRow  最浅库位排
                break;
            case 9:
                necessaryParameters[1] = 12;    //curRow   最深库位排
            case 10:
                necessaryParameters[1] = 11;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 12;    //nearRow  最浅库位排
                break;
            case 12:
            case 11:
                necessaryParameters[1] = 14;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 14;    //nearRow  最浅库位排

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

@@ -534,57 +534,6 @@
            throw new CoolException("无可用库位");
        }


        // 相似工作档案 --- 同天同规格物料
        if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
            //查询相似工作档案
            List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
            int nearbay = 0;    //相似工作档案 目标库位列
            int nearlev = 0;    //相似工作档案 目标库位层
            for (WrkMast wrkMast:wrkMasts){
                LocMast locMastWrk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
                List<LocMast> locMasts = new ArrayList<>();
                if (locMastWrk.getBay1() >=1 && locMastWrk.getBay1()<=2){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1", true));
                }else if (locMastWrk.getBay1() >=4 && locMastWrk.getBay1()<=12){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1", false));
                }else {
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMastWrk.getGro1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1", true));
                }
                if (Cools.isEmpty(locMasts)) {
                    continue;
                }
                for (LocMast locMastGro1 : locMasts) {

                    if (locMastGro1.getBay1() == 2){ //wcs问题限制
                        continue;
                    }
                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
                        break;
                    }
                    if (locMastGro1.getLocSts().equals("O")){
                        locMast = locMastGro1;
                        break;
                    }
                }


            }

        }

        Wrapper<StaDesc> wrapper = null;
        StaDesc staDesc = null;
        BasDevp staNo = null;
@@ -619,12 +568,48 @@

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
            List<LocMast> locMasts = new ArrayList<>();
            int floor = 0;
            if (locTypeDto.getLocType1() == 1){
                int F1count = locMastService.selectCount(new EntityWrapper<LocMast>()
                        .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                        .eq("crn_no", 7)
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .eq("lev1", 1));
                if (F1count <= 10) {
                    int F2count = locMastService.selectCount(new EntityWrapper<LocMast>()
                            .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                            .eq("crn_no", 7)
                            .eq("loc_type1", locTypeDto.getLocType1())
                            .eq("lev1", 2));
                    if (F2count <= 10) {
                        throw new CoolException("库位不足");
                    }else {
                        floor = 2;
                    }
                }else {
                    floor = 1;
                }

            }else if (locTypeDto.getLocType1() == 2){
                int F3count = locMastService.selectCount(new EntityWrapper<LocMast>()
                        .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                        .eq("crn_no", 7)
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .eq("lev1", 3));
                if (F3count <= 10) {
                    throw new CoolException("库位不足");
                }
                floor = 3;
            }else {
                throw new CoolException("库位高度数据异常");
            }
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("bay1", nearRow)
                    .in("loc_sts", "O","X").eq("whs_type",rowLastnoType.getType().longValue())
                    .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                    .eq("crn_no",7)
                    .eq("loc_type1",locTypeDto.getLocType1())
                    .orderBy("lev1",true).orderBy("row1",false));//最浅库位
                    .eq("lev1",floor).orderBy("row1",false));//最浅库位

            for (LocMast locMast1 : locMasts) {
                if (locMast != null){
@@ -633,65 +618,33 @@
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
                }
                if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
                    //获取目标库位所在巷道最深空库位
//                    LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
//                    if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
//                        locMast = locMast2;
//                        break;
//                    }
                    List<LocMast> locMasts1 = null;
                    if (curRow < nearRow){
                        locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("gro1", locMast1.getGro1())
                                .eq("crn_no",7)
                                .eq("loc_type1",locTypeDto.getLocType1())
                                .orderBy("bay1",true));
                        if(locMast1.getBay1()>= 4 && locMast1.getBay1()<=12){
                            locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast1.getGro1())
                                    .eq("crn_no",7)
                                    .eq("loc_type1",locTypeDto.getLocType1())
                                    .orderBy("bay1",false));
                        }
                    }else {
                        locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("gro1", locMast1.getGro1())
                                .eq("crn_no",7)
                                .eq("loc_type1",locTypeDto.getLocType1())
                                .orderBy("bay1",false));
                    }
                    if (Cools.isEmpty(locMasts1)) {
                        continue;
                    }
                    for (LocMast locMastGro1 : locMasts1) {
                        if (mixture){ //混料只允许放 7 12 14
                            if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
                                continue;
                            }
                        }else { //不混料不允许放 7 12 14
                            if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
                                continue;
                            }
                        }
                        if (locMastGro1.getLocSts().equals("F")){
                            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
                            if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){
                                break;
                            }
                        }
                        if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
                            break;
                        }
                        if (locMastGro1.getLocSts().equals("O")){
                            locMast = locMastGro1;
                            break;
                        }
                    }



                List<LocMast> locMasts1 = null;
                if (nearRow == 2 || nearRow ==7 || nearRow == 12){
                    locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMast1.getGro1())
                            .eq("crn_no",7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1",true));
                }else {
                    locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMast1.getGro1())
                            .eq("crn_no",7)
                            .eq("loc_type1",locTypeDto.getLocType1())
                            .orderBy("bay1",false));
                }
                if (Cools.isEmpty(locMasts1)) {
                    continue;
                }
                for (LocMast locMastGro1 : locMasts1) {
                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
                        break;
                    }
                    if (locMastGro1.getLocSts().equals("O")){
                        locMast = locMastGro1;
                        break;
                    }
                }

            }
        }