#
luxiaotao1123
2021-07-01 f4156fcaa33ce0f9d9b31a59e5490c732a6af114
src/main/java/com/zy/common/service/CommonService.java
@@ -204,12 +204,25 @@
            if (Utils.isShallowLoc(slaveProperties, curRow)) {
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
            }
            if (Cools.isEmpty(locMast)) {
                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
            }
        }
        if (Cools.isEmpty(locMast)) {
            // 轻货物找轻库位为空时,可以去找重库位仓
            if (locTypeDto.getLocType1() == 1) {
                locTypeDto.setLocType1((short) 2);
                return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times);
            }
            if (times >= rowCount) {
                log.error("没有空库位");
                throw new CoolException("没有空库位");
@@ -243,4 +256,4 @@
        }
    }
}
}