#

zc

9 小时以前 56de968727bd6e871c6823dce837f8d42f30e6f8

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

@@ -146,7 +146,7 @@
    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);
        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
    }

@@ -165,10 +165,10 @@
        int row = getRow(shallowLoc);
        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
        int targetRow;
        if (remainder == 0  ) {
            targetRow = row + 1;
        } else if (remainder == 3) {
        if (remainder == 2) {
            targetRow = row - 1;
        } else if (remainder == 3) {
            targetRow = row + 1;
        } else {
            throw new RuntimeException(shallowLoc + "不是浅库位，系统繁忙");
        }
@@ -318,6 +318,8 @@
                return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //已完善
            case 7://平库  CTU库
                return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //已完善
            case 8://四向库(牛眼车)eg:光泰四向
                return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //已完善
            default:
                return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
        }
@@ -356,9 +358,6 @@
            }
        }

        //堆垛机库位从14排开始
        necessaryParameters[1] = necessaryParameters[1]+13;    //curRow   最深库位排
        necessaryParameters[3] = necessaryParameters[3]+13;    //nearRow  最浅库位排
        return necessaryParameters;
    }

@@ -531,16 +530,11 @@
        //满板正常入库
        switch (curRow){
            case 1:
                necessaryParameters[1] = 4;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 3;    //nearRow  最浅库位排
                break;
            case 4:
                necessaryParameters[1] = 5;    //curRow   最深库位排
                necessaryParameters[1] = 3;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 6;    //nearRow  最浅库位排
                break;
            case 5:
            case 3:
                necessaryParameters[1] = 8;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 8;    //nearRow  最浅库位排