#

luxiaotao1123

2022-12-08 6559c51b0ddc00a14a7589bc57bbfec4a01a0b2f

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

@@ -114,11 +114,11 @@
        int end = 30;
        int dualCrnNo;
        switch (sourceStaNo) {
            case 107:
            case 203:
                whsType = 1;
                dualCrnNo = 2;
                break;
            case 118:
            case 102:
                whsType = 2;
                start = 31;
                end = 32;
@@ -277,6 +277,14 @@
            if (whsType == 1) {
                List<Integer> rows = Utils.getGroupLoc(curRow);

//                Iterator<Integer> iterator = rows.iterator();
//                while (iterator.hasNext()) {
//                    Integer next = iterator.next();
//                    if (next.equals(17) || next.equals(18)) {
//                        iterator.remove();
//                    }
//                }

                List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
                if (!Cools.isEmpty(locMasts)) {
                    Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
@@ -294,8 +302,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 +310,7 @@
                }

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