#1

lsh

2 天以前 6c00757e63a69b8d527f1b978859b17c8db136f6

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

@@ -160,7 +160,7 @@
            throw new CoolException("数据异常，请联系管理员");
        }
        // ===============>>>> 开始执行
        if (sourceStaNo == 118 || sourceStaNo == 122){
        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
            curRow = rowLastno.getCurrentRow1();
        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
            curRow = rowLastno.getCurrentRow2();
@@ -230,7 +230,7 @@
                        if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){
                            continue;
                        }
                        if (sourceStaNo == 118 || sourceStaNo == 122){
                        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
                            if (locMast2.getCrnNo()>3){
                                continue;
                            }
@@ -262,7 +262,7 @@
                        if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
                            continue;
                        }
                        if (sourceStaNo == 118 || sourceStaNo == 122){
                        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
                            if (shallowLoc.getCrnNo()>3){
                                continue;
                            }
@@ -355,7 +355,7 @@

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            if (sourceStaNo == 118 || sourceStaNo == 122){
            if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
                rowLastno.setCurrentRow1(curRow);
            } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                rowLastno.setCurrentRow2(curRow);
@@ -423,7 +423,7 @@
        // 递归查询
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < rowCount) {
            if (times < rowCount*4) {
                times = times + 1;
                return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
            }
@@ -491,7 +491,7 @@
            throw new CoolException("数据异常，请联系管理员");
        }
        // ===============>>>> 开始执行
        if (sourceStaNo == 118 || sourceStaNo == 122){
        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
            curRow = rowLastno.getCurrentRow1();
        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
            curRow = rowLastno.getCurrentRow2();
@@ -671,7 +671,7 @@

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            if (sourceStaNo == 118 || sourceStaNo == 122){
            if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
                rowLastno.setCurrentRow1(curRow);
            } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                rowLastno.setCurrentRow2(curRow);
@@ -739,7 +739,7 @@
        // 递归查询
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < rowCount) {
            if (times < rowCount*4) {
                times = times + 1;
                return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times,rgvNo);
            }