#

zjj

2024-08-31 1f1c652c027fd86407d33640e2ac5e91d6a776b6

#

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -425,14 +425,16 @@
    @RequestMapping("/ddd/ddd")
    @ManagerAuth()
    public R ddd() {
        int w = 164;
        for (int i = 17; i <= 27; i++) {
        for (int j = 1;j<=21;j++){
        int w = 64;
        for (int i = 17; i <= 37; i++) {
        for (int j = 1;j<=14;j++){
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
//            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));

            if (locMast.getGro1() == 999){
                continue;
            }
//            locMast.setGro1(w);
            locMast2.setGro1(locMast.getGro1()+100);
            locMast3.setGro1(locMast.getGro1()+200);
@@ -444,6 +446,21 @@
            w++;
        }
        }
//        for (int i = 17; i <=37; i++) {
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
////            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
////            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
////            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
//            locMast.setGro1(w);
////            locMast2.setGro1(w);
////            locMast3.setGro1(w);
////            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
////            locMastService.updateById(locMast2);
////            locMastService.updateById(locMast3);
////            locMastService.updateById(locMast4);
//            w++;
//        }
        return R.ok();

    }

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -33,6 +33,8 @@

    LocMast selectLocByLocStsPakInF1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);

    LocMast selectLocByLocStsPakInShuttleF1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);

    /*
     * 获取目标库位所在巷道最浅非空库位  深<浅
     * */
@@ -40,6 +42,8 @@

    LocMast selectLocByLocStsPakInF2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);

    LocMast selectLocByLocStsPakInShuttleF2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);

    /*
     * 获取目标库位所在巷道最深空库位  深>浅
     * */

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -54,6 +54,7 @@
//    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);

    LocMast selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
    /*
     * 获取目标库位所在巷道最深空库位
     * */

 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

@@ -95,6 +95,14 @@
        return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    }

    @Override
    public LocMast selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
        if (curRow>nearRow){
            return this.baseMapper.selectLocByLocStsPakInShuttleF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
        }
        return this.baseMapper.selectLocByLocStsPakInShuttleF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
    }

    /*
     * 获取目标库位所在巷道最深空库位
     * */

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

@@ -493,28 +493,28 @@
    public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};
        Integer sRow = rowLastno.getsRow();//起始排号
        Integer offset = 16;//起始排号
        Integer offset = 0;//起始排号
        Integer sCrnNo = rowLastno.getsCrnNo();//起始堆垛机号
        necessaryParameters[0] = crnNumber; // 轮询次数
        curRow = curRow - offset;
        //满板正常入库
        switch (curRow){
            case 1:
                necessaryParameters[1] = 3;    //curRow   最深库位排
                necessaryParameters[1] = 4;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 6;    //nearRow  最浅库位排
                necessaryParameters[3] = 7;    //nearRow  最浅库位排
                break;
            case 3:
                necessaryParameters[1] = 7;    //curRow   最深库位排
            case 4:
                necessaryParameters[1] = 9;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 10;    //nearRow  最浅库位排
                necessaryParameters[3] = 12;    //nearRow  最浅库位排
                break;
            case 7:
                necessaryParameters[1] = 11;    //curRow   最深库位排
            case 9:
                necessaryParameters[1] = 14;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 11;    //nearRow  最浅库位排
                necessaryParameters[3] = 14;    //nearRow  最浅库位排
                break;
            case 11:
            case 14:
                necessaryParameters[1] = 1;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 2;    //nearRow  最浅库位排

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

@@ -569,7 +569,7 @@
                }

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

                //目标库位所在巷道最浅非空库位存在&&非最外侧库位&&入库状态
                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))){
@@ -579,13 +579,13 @@
                    if (!Cools.isEmpty(wrkDetl) && matnr.equals(wrkDetl.getMatnr())
                            && batch.equals(batch.isEmpty() ? "":wrkDetl.getBatch())
                            && grade.equals(grade.isEmpty()? "":wrkDetl.getBrand())){
                        int row2=0;
                        if (Utils.getRow(locMast2.getLocNo())>nearRowW){
                            row2=Utils.getRow(locMast2.getLocNo())-1;
                        int bay2=0;
                        if (Utils.getBay(locMast2.getLocNo())>nearRowW){
                            bay2=Utils.getBay(locMast2.getLocNo())-1;
                        } else {
                            row2=Utils.getRow(locMast2.getLocNo())+1;
                            bay2=Utils.getBay(locMast2.getLocNo())+1;
                        }
                        String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
                        String targetLocNo = locMast2.getLocNo().substring(0,2)  +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
                        locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
                        if (Cools.isEmpty(locMast)){
                            continue;
@@ -634,16 +634,16 @@
                    }
                }

                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
                LocMast locMast2 = locMastService.selectLocByLocStsPakInShuttleF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());

                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
                    int row2=0;
                    if (Utils.getRow(locMast2.getLocNo())>nearRowW){
                        row2=Utils.getRow(locMast2.getLocNo())-1;
                    }else {
                        row2=Utils.getRow(locMast2.getLocNo())+1;
                    int bay2=0;
                    if (Utils.getBay(locMast2.getLocNo())>nearRowW){
                        bay2=Utils.getBay(locMast2.getLocNo())-1;
                    } else {
                        bay2=Utils.getBay(locMast2.getLocNo())+1;
                    }
                    String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
                    String targetLocNo = locMast2.getLocNo().substring(0,2)  +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
                    if (Cools.isEmpty(locMast)){
                        continue;
@@ -652,113 +652,6 @@
                }
            }
        }

        boolean signRule1 = false;
        boolean signRule2 = false;


        if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
            // 靠近摆放规则 --- 同天同规格物料 //分离版
            if (!Cools.isEmpty(matnr) &&  staDescId == 1){
//                signRule1 = true;
            }
            // 靠近摆放规则 --- 同天同规格物料 //互通版
            if (!Cools.isEmpty(matnr) && staDescId == 1) {
                signRule2 = true;
            }

            if (!Cools.isEmpty(matnr) &&  (staDescId == 11 || staDescId == 111)) {
                signRule1 = true;
            }
        }

        if (signRule1){
            if (nearRow!=curRow){
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
                for (LocMast locMast1:locMasts){
                    //获取巷道
//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
                    //获取目标库位所在巷道最浅非空库位
                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
                        if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())
                                && batch.equals(batch.isEmpty() ? "" : locDetl.getBatch())
                                && grade.equals(grade.isEmpty() ? "" : locDetl.getBrand())) {
                            //获取目标库位所在巷道最深空库位
                            locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
                            break;
                        }
                    }
                }
            }
        }else if (signRule2){
            List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
            int nearbay = 0;
            int nearlev = 0;
            for (String locNo : locNos) {
                int curRowW = curRow;    //相似工作档案 最深库位排
                int nearRowW = nearRow;    //相似工作档案 最浅库位排
                if (Cools.isEmpty(locNo)){
                    continue;
                }
                if (Utils.getRow(locNo)==nearRow){
                    continue;
                }
                if (Utils.getBay(locNo)==nearbay && Utils.getLev(locNo)==nearlev){
                    continue;
                }else {
                    nearbay=Utils.getBay(locNo);
                    nearlev=Utils.getLev(locNo);
                }
//                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
                LocMast locMastGro = locMastService.selectById(locNo);

                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(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());

                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
                    int row2=0;
                    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).eq("loc_sts","O"));
                    if (Cools.isEmpty(locMast)){
                        continue;
                    }
                    break;
                }
            }
        }

//        // 靠近摆放规则 --- 空托  //分离版
//        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
//            for (LocMast locMast1:locMasts){
//                //获取巷道
////                List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
//                //获取目标库位所在巷道最浅非空库位
//                LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
//                if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("D")){
//                    //获取目标库位所在巷道最浅非空库位
//                    locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
//                    break;
//                }
//            }
//        }

        // 靠近摆放规则 --- 空托 //互通版
        if (staDescId == 10  && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
@@ -793,16 +686,16 @@
                    }
                }

                LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());
                LocMast locMast2 = locMastService.selectLocByLocStsPakInShuttleF(curRowW,nearRowW,locMastGro,rowLastnoType.getType().longValue());

                if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRowW && locMast2.getLocSts().equals("S")){
                    int row2=0;
                    if (Utils.getRow(locMast2.getLocNo())>nearRowW){
                        row2=Utils.getRow(locMast2.getLocNo())-1;
                    }else {
                        row2=Utils.getRow(locMast2.getLocNo())+1;
                    int bay2=0;
                    if (Utils.getBay(locMast2.getLocNo())>nearRowW){
                        bay2=Utils.getBay(locMast2.getLocNo())-1;
                    } else {
                        bay2=Utils.getBay(locMast2.getLocNo())+1;
                    }
                    String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
                    String targetLocNo = locMast2.getLocNo().substring(0,2)  +zerofill(String.valueOf(bay2), 3) + locMast2.getLocNo().substring(5);
                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo).eq("loc_sts","O"));
                    if (Cools.isEmpty(locMast)){
                        continue;
@@ -847,9 +740,9 @@
        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("bay1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                    .orderBy("lev1",true).orderBy("bay1",true));//最浅库位
                    .orderBy("lev1",true).orderBy("row1",false));//最浅库位
            for (LocMast locMast1 : locMasts) {
                if (locMast != null){
                    break;
@@ -868,16 +761,16 @@
                    if (curRow < nearRow){
                        locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("gro1", locMast1.getGro1())
                                .orderBy("row1",true));
                                .orderBy("bay1",true));
                        if(locMasts1.size() == 3  || (curRow>20 && locMasts1.size() == 2)){
                            locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast1.getGro1())
                                    .orderBy("row1",false));
                                    .orderBy("bay1",false));
                        }
                    }else {
                        locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("gro1", locMast1.getGro1())
                                .orderBy("row1",false));
                                .orderBy("bay1",false));
                    }
                    if (Cools.isEmpty(locMasts1)) {
                        continue;

 src/main/resources/mapper/LocMastMapper.xml

@@ -126,6 +126,18 @@
        AND loc_sts not in ('O') order by row1
    </select>

    <select id="selectLocByLocStsPakInShuttleF1" resultMap="BaseResultMap">
        SELECT top 1 *
        FROM [dbo].[asr_loc_mast]
        WHERE 1=1
          and whs_type=#{whsType}
          and crn_no=#{crnNo}
          and bay1 = #{bay}
          and lev1 = #{lev}
          and gro1 = #{gro}
          AND loc_sts not in ('O') order by bay1
    </select>

<!--    <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">-->
<!--        SELECT top 1 *-->
<!--        FROM [dbo].[asr_loc_mast]-->
@@ -148,6 +160,18 @@
        and gro1 = #{gro}
        AND loc_sts not in ('O') order by row1 desc
    </select>

    <select id="selectLocByLocStsPakInShuttleF2" resultMap="BaseResultMap">
        SELECT top 1 *
        FROM [dbo].[asr_loc_mast]
        WHERE 1=1
          and whs_type=#{whsType}
          and crn_no=#{crnNo}
          and bay1 = #{bay}
          and lev1 = #{lev}
          and gro1 = #{gro}
          AND loc_sts not in ('O') order by bay1 desc
    </select>
<!--    <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">-->
<!--        SELECT top 1 *-->
<!--        FROM [dbo].[asr_loc_mast]-->