yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、进销存-物料信息：增加一级分类、二级分类、三级分类搜索条件 

2、进销存-库房物料信息-物料：增加一级分类、二级分类、三级分类搜索条件
This commit is contained in:
1378012178@qq.com 2025-10-27 14:50:40 +08:00
parent 0e70d6cb35
commit fcec2807ef
3 changed files with 167 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java
View File

@ -69,6 +69,10 @@ public class ConfigMaterialInfoController extends JeecgController<ConfigMaterial
if(StringUtils.isNotBlank(configMaterialInfo.getTreeId())){ if(StringUtils.isNotBlank(configMaterialInfo.getTreeId())){
queryWrapper.apply(" (category_id = '"+configMaterialInfo.getTreeId()+"' or type_id = '"+configMaterialInfo.getTreeId()+"' or medication_id = '"+configMaterialInfo.getTreeId()+"' )"); queryWrapper.apply(" (category_id = '"+configMaterialInfo.getTreeId()+"' or type_id = '"+configMaterialInfo.getTreeId()+"' or medication_id = '"+configMaterialInfo.getTreeId()+"' )");
} }
if (StringUtils.isNotBlank(configMaterialInfo.getKeyWord())) {
String value = configMaterialInfo.getKeyWord();
queryWrapper.and(c -> c.like("material_name", value).or().like("pinyin", value).or().like("material_no", value));
}
Page<ConfigMaterialInfo> page = new Page<ConfigMaterialInfo>(pageNo, pageSize); Page<ConfigMaterialInfo> page = new Page<ConfigMaterialInfo>(pageNo, pageSize);
IPage<ConfigMaterialInfo> pageList = configMaterialInfoService.page(page, queryWrapper); IPage<ConfigMaterialInfo> pageList = configMaterialInfoService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java
View File

@ -188,4 +188,8 @@ public class ConfigMaterialInfo implements Serializable {
private String medicationName; private String medicationName;
@TableField(exist = false) @TableField(exist = false)
private String tagName; private String tagName;
//综合搜索
@TableField(exist = false)
private String keyWord;
} }

13
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
View File

@ -76,6 +76,17 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
" pinyin like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" + " pinyin like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" +
" material_no like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" + " material_no like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" +
" specification_model like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') )"); " specification_model like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') )");
if (StringUtils.isNotBlank(blWarehouseMaterialInfo.getCategoryId())) {
queryWrapper.apply("a.category_id = {0}", blWarehouseMaterialInfo.getCategoryId());
}
if (StringUtils.isNotBlank(blWarehouseMaterialInfo.getTypeId())) {
queryWrapper.apply("a.type_id = {0}", blWarehouseMaterialInfo.getTypeId());
}
if (StringUtils.isNotBlank(blWarehouseMaterialInfo.getMedicationId())) {
queryWrapper.apply("a.medication_id = {0}", blWarehouseMaterialInfo.getMedicationId());
}
Page<BlWarehouseMaterialInfo> page = new Page<BlWarehouseMaterialInfo>(pageNo, pageSize); Page<BlWarehouseMaterialInfo> page = new Page<BlWarehouseMaterialInfo>(pageNo, pageSize);
IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper); IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
@ -194,9 +205,9 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
} }
/** /**
* 批量添加物料库房映射 * 批量添加物料库房映射
*
* @param * @param
* @return * @return
*/ */