#

luxiaotao1123

2022-11-01 8fb016ac62d06cf1cbc02efc5552eee971c38a9b

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

@@ -294,8 +294,7 @@
            } else {
                if (Utils.isShallowLoc(slaveProperties, curRow)) {
                    Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                    locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
                    // todo:luxiaotao 如果用浅排找到的深库位，那么则需要判断这个深库位对应的浅库位是否有货（F、X、D）
                    locMast = locMastService.queryFreeLocMast0(deepRow, locTypeDto.getLocType1());
                    // 因库位移转、需预留空库位
                    if (locMast !=null && !locMastService.checkEmptyCount(locMast)) {
                        locMast = null;
@@ -303,7 +302,7 @@
                }

                if (Cools.isEmpty(locMast)) {
                    locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
                    locMast = locMastService.queryFreeLocMast0(curRow, locTypeDto.getLocType1());
                    // 因库位移转、需预留空库位
                    if (!locMastService.checkEmptyCount(locMast)) {
                        locMast = null;