1

ZY

2025-04-02 43af368c15fc15258cb4b1051a39392cfa18bbf1

1

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

@@ -127,11 +127,14 @@

            switch (rowLastnoType.getType()) {
                case 1:
                    List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("loc_sts", "O").eq("loc_type1", locTypeDto.getLocType1()).eq("whs_type", rowLastnoType.getType().longValue()));
                    if (locMasts != null && locMasts.size() < 8) {
                    List<LocMast> locMasts;
                    for (int i = locTypeDto.getLocType1(); i < 4; i++) {
                        locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("loc_sts", "O").eq("loc_type1", i).eq("whs_type", rowLastnoType.getType().longValue()));
                        if (i == 3 && locMasts != null && locMasts.size() < 8) {
                        throw new CoolException("没有空库位");
                    }
                    }
                    return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
                case 2:
                    log.error("站点={} 未查询到对应的规则", sourceStaNo);