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

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

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

@@ -69,6 +69,10 @@ public class ConfigMaterialInfoController extends JeecgController<ConfigMaterial
 		if(StringUtils.isNotBlank(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);
 		IPage<ConfigMaterialInfo> pageList = configMaterialInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);

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

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

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

@@ -41,139 +41,150 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: 库房物料配置信息
  * @Author: jeecg-boot
- * @Date:   2025-08-28
+ * @Date: 2025-08-28
  * @Version: V1.0
  */
-@Api(tags="库房物料配置信息")
+@Api(tags = "库房物料配置信息")
 @RestController
 @RequestMapping("/invoicing/blWarehouseMaterialInfo")
 @Slf4j
 public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehouseMaterialInfo, IBlWarehouseMaterialInfoService> {
-	@Autowired
+    @Autowired
-	private IBlWarehouseMaterialInfoService blWarehouseMaterialInfoService;
+    private IBlWarehouseMaterialInfoService blWarehouseMaterialInfoService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param blWarehouseMaterialInfo
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "库房物料配置信息-分页列表查询")
-	@ApiOperation(value="库房物料配置信息-分页列表查询", notes="库房物料配置信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<BlWarehouseMaterialInfo>> queryPageList(BlWarehouseMaterialInfo blWarehouseMaterialInfo,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-        QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(blWarehouseMaterialInfo, req.getParameterMap());
-		queryWrapper.apply(StringUtils.isNotBlank(blWarehouseMaterialInfo.getWlParamInfo()),"(material_name like concat('%', '"+blWarehouseMaterialInfo.getWlParamInfo()+"' , '%') or\n" +
-				"                pinyin like concat('%', '"+blWarehouseMaterialInfo.getWlParamInfo()+"' , '%') or\n" +
-				"                material_no like concat('%', '"+blWarehouseMaterialInfo.getWlParamInfo()+"' , '%') or\n" +
-				"                specification_model like concat('%', '"+blWarehouseMaterialInfo.getWlParamInfo()+"' , '%') )");
-		Page<BlWarehouseMaterialInfo> page = new Page<BlWarehouseMaterialInfo>(pageNo, pageSize);
-		IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param blWarehouseMaterialInfo
-	 * @return
-	 */
-	@AutoLog(value = "库房物料配置信息-添加")
-	@ApiOperation(value="库房物料配置信息-添加", notes="库房物料配置信息-添加")
-	@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
-		if(StringUtils.isNotBlank(blWarehouseMaterialInfo.getWlId())){
-			String wlIdArr[] = blWarehouseMaterialInfo.getWlId().split(",");
-			for (String wlId : wlIdArr){
-				BlWarehouseMaterialInfo blWarehouseMaterialInfo1 = new BlWarehouseMaterialInfo();
-				blWarehouseMaterialInfo1.setNuId(blWarehouseMaterialInfo.getNuId());
-				blWarehouseMaterialInfo1.setWlId(wlId);
-//				blWarehouseMaterialInfo1.setUpperLimit(blWarehouseMaterialInfo.getUpperLimit());
-//				blWarehouseMaterialInfo1.setLowerLimit(blWarehouseMaterialInfo.getLowerLimit());
-				blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo1);
-			}
-		}
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param blWarehouseMaterialInfo
-	 * @return
-	 */
-	@AutoLog(value = "库房物料配置信息-编辑")
-	@ApiOperation(value="库房物料配置信息-编辑", notes="库房物料配置信息-编辑")
-	@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
-		blWarehouseMaterialInfoService.updateById(blWarehouseMaterialInfo);
-		return Result.OK("操作成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "库房物料配置信息-通过id删除")
-	@ApiOperation(value="库房物料配置信息-通过id删除", notes="库房物料配置信息-通过id删除")
-	@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		blWarehouseMaterialInfoService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "库房物料配置信息-批量删除")
-	@ApiOperation(value="库房物料配置信息-批量删除", notes="库房物料配置信息-批量删除")
-	@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.blWarehouseMaterialInfoService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "库房物料配置信息-通过id查询")
-	@ApiOperation(value="库房物料配置信息-通过id查询", notes="库房物料配置信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<BlWarehouseMaterialInfo> queryById(@RequestParam(name="id",required=true) String id) {
-		BlWarehouseMaterialInfo blWarehouseMaterialInfo = blWarehouseMaterialInfoService.getById(id);
-		if(blWarehouseMaterialInfo==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(blWarehouseMaterialInfo);
-	}
 
     /**
-    * 导出excel
+     * 分页列表查询
-    *
+     *
-    * @param request
+     * @param blWarehouseMaterialInfo
-    * @param blWarehouseMaterialInfo
+     * @param pageNo
-    */
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "库房物料配置信息-分页列表查询")
+    @ApiOperation(value = "库房物料配置信息-分页列表查询", notes = "库房物料配置信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BlWarehouseMaterialInfo>> queryPageList(BlWarehouseMaterialInfo blWarehouseMaterialInfo,
+                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                HttpServletRequest req) {
+        QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(blWarehouseMaterialInfo, req.getParameterMap());
+        queryWrapper.apply(StringUtils.isNotBlank(blWarehouseMaterialInfo.getWlParamInfo()), "(material_name like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" +
+                "                pinyin like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" +
+                "                material_no like concat('%', '" + blWarehouseMaterialInfo.getWlParamInfo() + "' , '%') or\n" +
+                "                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);
+        IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param blWarehouseMaterialInfo
+     * @return
+     */
+    @AutoLog(value = "库房物料配置信息-添加")
+    @ApiOperation(value = "库房物料配置信息-添加", notes = "库房物料配置信息-添加")
+    @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
+        if (StringUtils.isNotBlank(blWarehouseMaterialInfo.getWlId())) {
+            String wlIdArr[] = blWarehouseMaterialInfo.getWlId().split(",");
+            for (String wlId : wlIdArr) {
+                BlWarehouseMaterialInfo blWarehouseMaterialInfo1 = new BlWarehouseMaterialInfo();
+                blWarehouseMaterialInfo1.setNuId(blWarehouseMaterialInfo.getNuId());
+                blWarehouseMaterialInfo1.setWlId(wlId);
+//				blWarehouseMaterialInfo1.setUpperLimit(blWarehouseMaterialInfo.getUpperLimit());
+//				blWarehouseMaterialInfo1.setLowerLimit(blWarehouseMaterialInfo.getLowerLimit());
+                blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo1);
+            }
+        }
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param blWarehouseMaterialInfo
+     * @return
+     */
+    @AutoLog(value = "库房物料配置信息-编辑")
+    @ApiOperation(value = "库房物料配置信息-编辑", notes = "库房物料配置信息-编辑")
+    @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
+        blWarehouseMaterialInfoService.updateById(blWarehouseMaterialInfo);
+        return Result.OK("操作成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "库房物料配置信息-通过id删除")
+    @ApiOperation(value = "库房物料配置信息-通过id删除", notes = "库房物料配置信息-通过id删除")
+    @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        blWarehouseMaterialInfoService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "库房物料配置信息-批量删除")
+    @ApiOperation(value = "库房物料配置信息-批量删除", notes = "库房物料配置信息-批量删除")
+    @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.blWarehouseMaterialInfoService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "库房物料配置信息-通过id查询")
+    @ApiOperation(value = "库房物料配置信息-通过id查询", notes = "库房物料配置信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<BlWarehouseMaterialInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        BlWarehouseMaterialInfo blWarehouseMaterialInfo = blWarehouseMaterialInfoService.getById(id);
+        if (blWarehouseMaterialInfo == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(blWarehouseMaterialInfo);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param blWarehouseMaterialInfo
+     */
     @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
@@ -181,12 +192,12 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
     }
 
     /**
-      * 通过excel导入数据
+     * 通过excel导入数据
-    *
+     *
-    * @param request
+     * @param request
-    * @param response
+     * @param response
-    * @return
+     * @return
-    */
+     */
     @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
@@ -194,22 +205,22 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
     }
 
 
-
+    /**
-	 /**
+     * 批量添加物料库房映射
-	  *   批量添加物料库房映射
+     *
-	  * @param
+     * @param
-	  * @return
+     * @return
-	  */
+     */
-	 @AutoLog(value = "库房物料配置信息-添加")
+    @AutoLog(value = "库房物料配置信息-添加")
-	 @ApiOperation(value="库房物料配置信息-添加", notes="库房物料配置信息-添加")
+    @ApiOperation(value = "库房物料配置信息-添加", notes = "库房物料配置信息-添加")
-	 @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
+    @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
-	 @PostMapping(value = "/addBatch")
+    @PostMapping(value = "/addBatch")
-	 public Result<String> addBatch(@RequestBody List<BlWarehouseMaterialInfo> list) {
+    public Result<String> addBatch(@RequestBody List<BlWarehouseMaterialInfo> list) {
 //		 for( BlWarehouseMaterialInfo blWarehouseMaterialInfo : list){
 //			 blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo);
 //		 }
-		 blWarehouseMaterialInfoService.saveBatch(list);
+        blWarehouseMaterialInfoService.saveBatch(list);
-		 return Result.OK("添加成功！");
+        return Result.OK("添加成功！");
-	 }
+    }
 
 }