From fcec2807ef737a14a7a4685eec17bd6b92aeac48 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 27 Oct 2025 14:50:40 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BF=9B=E9=94=80=E5=AD=98-=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=EF=BC=9A=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E3=80=81=E4=BA=8C=E7=BA=A7=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E3=80=81=E4=B8=89=E7=BA=A7=E5=88=86=E7=B1=BB=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=202=E3=80=81=E8=BF=9B=E9=94=80?= =?UTF-8?q?=E5=AD=98-=E5=BA=93=E6=88=BF=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E7=89=A9=E6=96=99=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E3=80=81=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E4=B8=89=E7=BA=A7=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterialInfoController.java | 14 +- .../entity/ConfigMaterialInfo.java | 4 + .../BlWarehouseMaterialInfoController.java | 297 +++++++++--------- 3 files changed, 167 insertions(+), 148 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java index ec8bfbe..0502155 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java @@ -69,11 +69,15 @@ public class ConfigMaterialInfoController extends JeecgController c.like("material_name", value).or().like("pinyin", value).or().like("material_no", value)); + } Page page = new Page(pageNo, pageSize); IPage pageList = configMaterialInfoService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -92,7 +96,7 @@ public class ConfigMaterialInfoController extends JeecgController { - @Autowired - private IBlWarehouseMaterialInfoService blWarehouseMaterialInfoService; - - /** - * 分页列表查询 - * - * @param blWarehouseMaterialInfo - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "库房物料配置信息-分页列表查询") - @ApiOperation(value="库房物料配置信息-分页列表查询", notes="库房物料配置信息-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(BlWarehouseMaterialInfo blWarehouseMaterialInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper 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 page = new Page(pageNo, pageSize); - IPage 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 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 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 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 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 queryById(@RequestParam(name="id",required=true) String id) { - BlWarehouseMaterialInfo blWarehouseMaterialInfo = blWarehouseMaterialInfoService.getById(id); - if(blWarehouseMaterialInfo==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(blWarehouseMaterialInfo); - } + @Autowired + private IBlWarehouseMaterialInfoService blWarehouseMaterialInfoService; /** - * 导出excel - * - * @param request - * @param blWarehouseMaterialInfo - */ + * 分页列表查询 + * + * @param blWarehouseMaterialInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "库房物料配置信息-分页列表查询") + @ApiOperation(value = "库房物料配置信息-分页列表查询", notes = "库房物料配置信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BlWarehouseMaterialInfo blWarehouseMaterialInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper 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 page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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 importExcel(HttpServletRequest request, HttpServletResponse response) { @@ -194,22 +205,22 @@ public class BlWarehouseMaterialInfoController extends JeecgController addBatch(@RequestBody List list) { + /** + * 批量添加物料库房映射 + * + * @param + * @return + */ + @AutoLog(value = "库房物料配置信息-添加") + @ApiOperation(value = "库房物料配置信息-添加", notes = "库房物料配置信息-添加") + @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add") + @PostMapping(value = "/addBatch") + public Result addBatch(@RequestBody List list) { // for( BlWarehouseMaterialInfo blWarehouseMaterialInfo : list){ // blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo); // } - blWarehouseMaterialInfoService.saveBatch(list); - return Result.OK("添加成功！"); - } + blWarehouseMaterialInfoService.saveBatch(list); + return Result.OK("添加成功！"); + } }