#单品找不到库位，允许尝试从混放区域中进行搜索

Junjie

2023-10-31 27ba20a0440030a72a3c43fa910b8b519385b263

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

@@ -164,7 +164,13 @@
            //找到库位，返回dto
            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }

        if(locTypeDto.getLocType1()==1){
            locTypeDto.setLocType1((short)2);
            return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0);
        }else if(locTypeDto.getLocType1()==2){
            locTypeDto.setLocType1((short)3);
            return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0);
        }
        //找不到库位，抛出异常
        throw new CoolException("没有空库位");
    }
@@ -310,6 +316,7 @@
        if (matNos.size() == 1) {
            //单品
            List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 2);//搜索单品库位

            for (LocMast mast : locMasts) {
                List<String> groupLoc = Utils.getGroupLoc(mast.getLocNo());
                if (!locMastService.checkAllLocEmpty(groupLoc)) {
@@ -337,6 +344,11 @@
                    break;
                }
            }

            if (locMast == null) {
                //单品找不到库位，允许尝试从混放区域中进行搜索
                locMast = getLocNoStepMixed(matNos, locTypeDto, 1);
            }
        }

        return locMast;