Merge remote-tracking branch 'origin/master'

王佳豪

2021-04-26 6704225b102b684e6ce4e88fa897414fac06c9f1

Merge remote-tracking branch 'origin/master'

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

@@ -260,7 +260,7 @@
        // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < crn_qty) {
            if (times < rowCount) {
                times = times + 1;
                return getLocNo(1, staDescId, sourceStaNo, emptyMk, matNos, locTypeDto, oldLocType, times);
            } else {