#出入库改动

zjj

2025-03-21 abb7c67088e18f8052eeff6d35b611286eedcee5

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

@@ -33,6 +33,12 @@
    public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
        add(5);add(6);add(7);add(8);add(9);add(10);add(11);
    }};
    public static final List<Integer> FIRST_GROUP_ROW_LIST2 = new ArrayList<Integer>() {{
        add(2);add(3);add(4);
    }};
    public static final List<Integer> SECOND_GROUP_ROW_LIST10 = new ArrayList<Integer>() {{
        add(5);add(6);add(7);add(8);add(9);add(10);
    }};

    @Autowired
    private WrkMastService wrkMastService;
@@ -211,7 +217,7 @@

            List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
            if (!Cools.isEmpty(locMasts)) {
                Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
                Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
                for (LocMast one : locMasts) {
                    if (one.getRow1().equals(innermostRow)) {
                        locMast = one;
@@ -219,8 +225,30 @@
                    }
                }
            }
            // 因库位移转、需预留空库位 todo:luxiaotao
            if (!locMastService.checkEmptyCount(locMast)) {
            if (Cools.isEmpty(locMast)){
                if (rows.equals(FIRST_GROUP_ROW_LIST)){
                    rows=FIRST_GROUP_ROW_LIST2;
                }else if (rows.equals(SECOND_GROUP_ROW_LIST)){
                    rows=SECOND_GROUP_ROW_LIST10;
                }
                List<LocMast> locMasts1 = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1());
                if (!Cools.isEmpty(locMasts1)) {
                    Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
                    if (rows.equals(FIRST_GROUP_ROW_LIST2)){
                        innermostRow=innermostRow+1;
                    }else if (rows.equals(SECOND_GROUP_ROW_LIST10)){
                        innermostRow=innermostRow-1;
                    }
                    for (LocMast one : locMasts1) {
                        if (one.getRow1().equals(innermostRow)) {
                            locMast = one;
                            break;
                        }
                    }
                }
            }
            // 因库位移转、需预留空库位
            if (!locMastService.checkEmptyCount(locMast, 10)) {
                locMast = null;
            }
        }
@@ -235,10 +263,10 @@
                times = 0;
            }
            // 货物检索低库位仓失败，兼容高库位仓后继续执行
            if (locTypeDto.getLocType1() == 1) {
                locTypeDto.setLocType1((short) 2);
                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
            }
//            if (locTypeDto.getLocType1() == 1) {
//                locTypeDto.setLocType1((short) 2);
//                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
//            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }