#出库规则完成，盘点拣料出库测试完成

lty

2025-01-03 bdbf9db4113d375bb6cec9aab787db5adb14c480

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

@@ -128,7 +128,7 @@
             */
            switch (rowLastnoType.getType()) {
                case 4:
                    return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 3);
                    return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 2);
            }
        } catch (CoolException ex) {
            log.error("入库失败，错误信息: {}", ex.getMessage(), ex);
@@ -556,9 +556,15 @@
        // 如果没有相近物料，则按规则轮询货架
        if (null == locMast) {
            LocMast locMast1 = new LocMast();
            if(sourceStaNo == 101){
            if(times != 0){
                locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("row1", 1)
                        .eq("loc_sts","O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .orderBy("lev1,bay1 ASC"));
            } else {
                locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("row1", 8)
                        .eq("loc_sts","O")
                        .eq("loc_type1", locTypeDto.getLocType1())
                        .orderBy("lev1,bay1 ASC"));
@@ -573,13 +579,11 @@

        // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            times = times - 1;
            if (times >0) {
            if (times >= 0) {
                return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
            }

            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            log.error("系统没有空库位！！！ 尺寸规格： {}，", JSON.toJSONString(locTypeDto));
            throw new CoolException("没有空库位");
        }
        String locNo = locMast.getLocNo();