#

zjj

2025-05-10 be7bdf82d63d64f96c4ae2e06514dda4b990122b

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

@@ -127,14 +127,6 @@

            switch (rowLastnoType.getType()) {
                case 1:
                    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);
@@ -442,6 +434,14 @@
                }
            }
        }
        //查询当前库位类型空库位 小于5个则locmast = null
        List<LocMast> locTypeLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                .eq("loc_sts", "O").eq("crn_no", crnNo).eq("loc_type1", locTypeDto.getLocType1())
                        .eq("whs_type", rowLastnoType.getType().longValue())
                );
        if (null !=locTypeLocMasts && locTypeLocMasts.size()<=5){
            locMast = null;
        }

        if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
            locMast = null;