#

luxiaotao1123

2022-11-28 a8f44ab685179248cee54cb5ebc7d036743a2091

#

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

@@ -114,11 +114,11 @@
        int end = 30;
        int dualCrnNo;
        switch (sourceStaNo) {
            case 107:
            case 202:
                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);