#1

dubin

4 天以前 864c18c46c2db1ae92220181e40b291b3b0d9446

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

@@ -122,7 +122,8 @@
    public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
        int row = getRow(deepLoc);
        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
        int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
//        int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
        int shallowRow = row;
        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
    }

@@ -241,7 +242,7 @@
    }

    public static boolean BooleanWhsTypeStaIoType(Integer whsType) {  //查询相似物料开关
        if (whsType == 1 || whsType==3 || whsType==4) {
        if (whsType == 1 ||whsType==2 || whsType==3 || whsType==4) {
            return true;
        }
        return false;
@@ -350,45 +351,78 @@
        return necessaryParameters;
    }

    //经典单伸库位
//    //经典单伸库位
//    public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, Integer curRow, Integer crnNumber) {
//        int[] necessaryParameters = new int[]{0, 0, 0, 0};
//        RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
//        RowLastno rowLastno = rowLastnoService.selectById(whsType);
//        Integer sRow = rowLastno.getsRow();
//        Integer sCrnNo = rowLastno.getsCrnNo();
//        if (BooleanWhsTypeSta(whsType)) {
//            necessaryParameters[0] = crnNumber; // 轮询次数
//            //满板正常入库
//            if (curRow.equals(crnNumber * 2 + sRow - 1)) {
//                necessaryParameters[1] = sRow;    //curRow   最深库位排
//                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
//                necessaryParameters[3] = sRow;    //nearRow  最浅库位排
//            } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
//                necessaryParameters[1] = sRow+1;    //curRow   最深库位排
//                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
//                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
//            } else {
//                curRow = curRow + 2;
//                if (curRow <  sRow || curRow > (crnNumber * 2 + sRow - 1)) {
//                    throw new CoolException("库位排号异常：排号：" + curRow);
//                }
//                if ((curRow - sRow) % 2 == 0) {
//                    necessaryParameters[1] = curRow;    //curRow   最深库位排
//                    necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ;     //crnNo     堆垛机号
//                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
//                } else if ((curRow - sRow + 1) % 2 == 0) {
//                    necessaryParameters[1] = curRow;    //curRow   最深库位排
//                    necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo;     //crnNo     堆垛机号
//                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
//                } else {
//                    throw new CoolException("库位排号异常：排号：" + curRow);
//                }
//            }
//        }
//        return necessaryParameters;
//    }

    // 经典单伸库位
    public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};
        RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        Integer sRow = rowLastno.getsRow();
        Integer eRow = rowLastno.geteRow();
        Integer sCrnNo = rowLastno.getsCrnNo();

        // 判断仓库类型是否满足要求
        if (BooleanWhsTypeSta(whsType)) {
            necessaryParameters[0] = crnNumber; // 轮询次数
            //满板正常入库
            if (curRow.equals(crnNumber * 2 + sRow - 1)) {
                necessaryParameters[1] = sRow;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow;    //nearRow  最浅库位排
            } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
                necessaryParameters[1] = sRow+1;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
            } else {
                curRow = curRow + 2;
                if (curRow <  sRow || curRow > (crnNumber * 2 + sRow - 1)) {
                    throw new CoolException("库位排号异常：排号：" + curRow);
                }
                if ((curRow - sRow) % 2 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
                } else if ((curRow - sRow + 1) % 2 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
                } else {
                    throw new CoolException("库位排号异常：排号：" + curRow);
                }

            // 计算最深库位排和最浅库位排
            int minRow = sRow;  // 起始排号
            int maxRow = eRow;  //

            // 检查排号范围是否合法
            if (curRow < minRow || curRow > maxRow) {
                throw new CoolException("库位排号异常：排号：" + curRow);
            }

            // 计算堆垛机号和对应排号
            int crnOffset = (curRow - minRow) / 2;  // 计算当前堆垛机偏移量
            necessaryParameters[1] = curRow;        // curRow: 当前货架排号
            necessaryParameters[2] = sCrnNo + crnOffset;  // crnNo: 堆垛机号
            necessaryParameters[3] = curRow;        // nearRow: 当前货架排号
        }

        return necessaryParameters;
    }


    //经典单双伸库位  左单右双(小单大双)
    public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};