root/nd_hh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 物料选择产品牌号筛选

Browse Source
This commit is contained in:
周俊杰
2024-01-18 14:47:34 +08:00
parent 3add95ac30
commit b104b83279
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
View File

@@ -50,12 +50,15 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
? whereJson.get("material_spec").toString() : null; ? whereJson.get("material_spec").toString() : null;
String material_model = ObjectUtil.isNotEmpty(whereJson.get("material_model")) String material_model = ObjectUtil.isNotEmpty(whereJson.get("material_model"))
? whereJson.get("material_model").toString() : null; ? whereJson.get("material_model").toString() : null;
String material_code=ObjectUtil.isNotEmpty(whereJson.get("material_code"))
? whereJson.get("material_code").toString() :null;
LambdaQueryWrapper<MdBaseMaterial> lam = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MdBaseMaterial> lam = new LambdaQueryWrapper<>();
lam.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_code, blurry) lam.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_code, blurry)
.or(ObjectUtil.isNotEmpty(blurry), .or(ObjectUtil.isNotEmpty(blurry),
l -> l.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_name, blurry)) l -> l.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_name, blurry))
.like(ObjectUtil.isNotEmpty(material_spec), MdBaseMaterial::getMaterial_spec, material_spec) .like(ObjectUtil.isNotEmpty(material_spec), MdBaseMaterial::getMaterial_spec, material_spec)
.like(ObjectUtil.isNotEmpty(material_model), MdBaseMaterial::getMaterial_model, material_model) .like(ObjectUtil.isNotEmpty(material_model), MdBaseMaterial::getMaterial_model, material_model)
.like(ObjectUtil.isNotEmpty(material_code),MdBaseMaterial::getMaterial_code,material_code)
.eq(ObjectUtil.isNotEmpty(is_used), MdBaseMaterial::getIs_used, is_used) .eq(ObjectUtil.isNotEmpty(is_used), MdBaseMaterial::getIs_used, is_used)
.eq(ObjectUtil.isNotEmpty(workshop_code), MdBaseMaterial::getWorkshop_code, workshop_code); .eq(ObjectUtil.isNotEmpty(workshop_code), MdBaseMaterial::getWorkshop_code, workshop_code);
IPage<MdBaseMaterial> pages = new Page<>(page.getPage() + 1, page.getSize()); IPage<MdBaseMaterial> pages = new Page<>(page.getPage() + 1, page.getSize());