From 973dadda74219a38423a8e409378e26bb2b49baf Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 14 Oct 2025 14:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterialInfoController.java | 13 ++ .../entity/ConfigMaterialInfo.java | 5 + .../mapper/ConfigMaterialInfoMapper.java | 4 + .../mapper/xml/ConfigMaterialInfoMapper.xml | 17 ++ .../service/IConfigMaterialInfoService.java | 4 + .../impl/ConfigMaterialInfoServiceImpl.java | 7 + .../NuWarehouseMaterialCrkInfoController.java | 180 ++++++++++++++++++ .../entity/NuWarehouseMaterialCrkInfo.java | 93 +++++++++ .../NuWarehouseMaterialCrkInfoMapper.java | 17 ++ .../xml/NuWarehouseMaterialCrkInfoMapper.xml | 5 + .../INuWarehouseMaterialCrkInfoService.java | 14 ++ .../impl/NuInvoicingCgdMainServiceImpl.java | 34 ++++ ...NuWarehouseMaterialCrkInfoServiceImpl.java | 19 ++ .../qgd/controller/QgdInfoController.java | 14 +- .../com/nu/modules/qgd/entity/QgdInfo.java | 6 + .../nu/modules/qgd/mapper/QgdInfoMapper.java | 6 + .../modules/qgd/mapper/xml/QgdInfoMapper.xml | 11 ++ .../modules/qgd/service/IQgdInfoService.java | 5 + .../qgd/service/impl/QgdInfoServiceImpl.java | 7 + .../BlWarehouseMaterialInfoController.java | 23 +++ .../entity/BlWarehouseMaterialInfo.java | 4 + 21 files changed, 486 insertions(+), 2 deletions(-) create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuWarehouseMaterialCrkInfoMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuWarehouseMaterialCrkInfoMapper.xml create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuWarehouseMaterialCrkInfoService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuWarehouseMaterialCrkInfoServiceImpl.java 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 c88434af..ec8bfbe0 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 @@ -193,4 +193,17 @@ public class ConfigMaterialInfoController extends JeecgController> getConfiguredList(ConfigMaterialInfo configMaterialInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // 自定义查询规则 + Page page = new Page(pageNo, pageSize); + IPage pageList = configMaterialInfoService.getConfiguredList(page, configMaterialInfo); + return Result.OK(pageList); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java index bce10063..411af6ec 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java @@ -158,4 +158,9 @@ public class ConfigMaterialInfo implements Serializable { @TableField(exist = false) private String kcsl;//库存数量 + @TableField(exist = false) + private String checkId;//当前选择的物料id，主要用于物料分配的时候当前选择的物料 + + @TableField(exist = false) + private String paramWlxx;//选择物料的时候物料查询信息 } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java index d1b1d273..d31f7f60 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java @@ -2,6 +2,8 @@ package com.nu.modules.ConfigMaterial.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; import org.apache.ibatis.annotations.Param; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; @@ -16,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface ConfigMaterialInfoMapper extends BaseMapper { void editQyty(ConfigMaterialInfo configMaterialInfo); + + IPage getConfiguredList(Page page, @Param("param") ConfigMaterialInfo configMaterialInfo); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml index 817bc902..482b0d8b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -17,4 +17,21 @@ + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java index 072095d0..d4d59e28 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java @@ -1,5 +1,7 @@ package com.nu.modules.ConfigMaterial.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; @@ -12,4 +14,6 @@ import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; public interface IConfigMaterialInfoService extends IService { void wlqianyi(ConfigMaterialInfo configMaterialInfo); + + IPage getConfiguredList(Page page, ConfigMaterialInfo configMaterialInfo); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java index 472bf6a2..4761a281 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java @@ -1,5 +1,7 @@ package com.nu.modules.ConfigMaterial.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialInfoService; @@ -27,4 +29,9 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl getConfiguredList(Page page, ConfigMaterialInfo configMaterialInfo) { + return baseMapper.getConfiguredList(page,configMaterialInfo); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java new file mode 100644 index 00000000..72a92959 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java @@ -0,0 +1,180 @@ +package com.nu.modules.cgd.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; +import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +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-10-14 + * @Version: V1.0 + */ +@Api(tags="库房物料出入库信息") +@RestController +@RequestMapping("/cgd/nuWarehouseMaterialCrkInfo") +@Slf4j +public class NuWarehouseMaterialCrkInfoController extends JeecgController { + @Autowired + private INuWarehouseMaterialCrkInfoService nuWarehouseMaterialCrkInfoService; + + /** + * 分页列表查询 + * + * @param nuWarehouseMaterialCrkInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "库房物料出入库信息-分页列表查询") + @ApiOperation(value="库房物料出入库信息-分页列表查询", notes="库房物料出入库信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuWarehouseMaterialCrkInfo nuWarehouseMaterialCrkInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuWarehouseMaterialCrkInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuWarehouseMaterialCrkInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuWarehouseMaterialCrkInfo + * @return + */ + @AutoLog(value = "库房物料出入库信息-添加") + @ApiOperation(value="库房物料出入库信息-添加", notes="库房物料出入库信息-添加") + @RequiresPermissions("cgd:nu_warehouse_material_crk_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuWarehouseMaterialCrkInfo nuWarehouseMaterialCrkInfo) { + nuWarehouseMaterialCrkInfoService.save(nuWarehouseMaterialCrkInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuWarehouseMaterialCrkInfo + * @return + */ + @AutoLog(value = "库房物料出入库信息-编辑") + @ApiOperation(value="库房物料出入库信息-编辑", notes="库房物料出入库信息-编辑") + @RequiresPermissions("cgd:nu_warehouse_material_crk_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuWarehouseMaterialCrkInfo nuWarehouseMaterialCrkInfo) { + nuWarehouseMaterialCrkInfoService.updateById(nuWarehouseMaterialCrkInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "库房物料出入库信息-通过id删除") + @ApiOperation(value="库房物料出入库信息-通过id删除", notes="库房物料出入库信息-通过id删除") + @RequiresPermissions("cgd:nu_warehouse_material_crk_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuWarehouseMaterialCrkInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "库房物料出入库信息-批量删除") + @ApiOperation(value="库房物料出入库信息-批量删除", notes="库房物料出入库信息-批量删除") + @RequiresPermissions("cgd:nu_warehouse_material_crk_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuWarehouseMaterialCrkInfoService.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) { + NuWarehouseMaterialCrkInfo nuWarehouseMaterialCrkInfo = nuWarehouseMaterialCrkInfoService.getById(id); + if(nuWarehouseMaterialCrkInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuWarehouseMaterialCrkInfo); + } + + /** + * 导出excel + * + * @param request + * @param nuWarehouseMaterialCrkInfo + */ + @RequiresPermissions("cgd:nu_warehouse_material_crk_info:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuWarehouseMaterialCrkInfo nuWarehouseMaterialCrkInfo) { + return super.exportXls(request, nuWarehouseMaterialCrkInfo, NuWarehouseMaterialCrkInfo.class, "库房物料出入库信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("cgd:nu_warehouse_material_crk_info:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuWarehouseMaterialCrkInfo.class); + } + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java new file mode 100644 index 00000000..7312b6e9 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java @@ -0,0 +1,93 @@ +package com.nu.modules.cgd.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 库房物料出入库信息 + * @Author: jeecg-boot + * @Date: 2025-10-14 + * @Version: V1.0 + */ +@Data +@TableName("nu_warehouse_material_crk_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_warehouse_material_crk_info对象", description="库房物料出入库信息") +public class NuWarehouseMaterialCrkInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**采购单*/ + @Excel(name = "采购单", width = 15, dictTable = "nu_invoicing_cgd_main", dicText = "cgd_no", dicCode = "id") + @Dict(dictTable = "nu_invoicing_cgd_main", dicText = "cgd_no", dicCode = "id") + @ApiModelProperty(value = "采购单") + private java.lang.String cgdId; + /**库房*/ + @Excel(name = "库房", width = 15, dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") + @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") + @ApiModelProperty(value = "库房") + private java.lang.String nuId; + /**物料*/ + @Excel(name = "物料", width = 15, dictTable = "nu_config_material_info", dicText = "material_name", dicCode = "id") + @Dict(dictTable = "nu_config_material_info", dicText = "material_name", dicCode = "id") + @ApiModelProperty(value = "物料") + private java.lang.String wlId; + /**出入库数量*/ + @Excel(name = "出入库数量", width = 15) + @ApiModelProperty(value = "出入库数量") + private java.lang.String crkNum; + /**出入库类型 1入库*/ + @Excel(name = "出入库类型 1入库", width = 15, dicCode = "crk_type") + @Dict(dicCode = "crk_type") + @ApiModelProperty(value = "出入库类型 1入库") + private java.lang.String crkType; + /**备注*/ + @Excel(name = "当前库存量", width = 15) + @ApiModelProperty(value = "当前库存量") + private java.lang.String dqkcl; + /**操作前库存量*/ + @Excel(name = "操作前库存量", width = 15) + @ApiModelProperty(value = "操作前库存量") + private java.lang.String czqkcl; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String content; +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuWarehouseMaterialCrkInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuWarehouseMaterialCrkInfoMapper.java new file mode 100644 index 00000000..ec088c7b --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuWarehouseMaterialCrkInfoMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.cgd.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 库房物料出入库信息 + * @Author: jeecg-boot + * @Date: 2025-10-14 + * @Version: V1.0 + */ +public interface NuWarehouseMaterialCrkInfoMapper extends BaseMapper { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuWarehouseMaterialCrkInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuWarehouseMaterialCrkInfoMapper.xml new file mode 100644 index 00000000..a963082b --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuWarehouseMaterialCrkInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuWarehouseMaterialCrkInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuWarehouseMaterialCrkInfoService.java new file mode 100644 index 00000000..22210ccf --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuWarehouseMaterialCrkInfoService.java @@ -0,0 +1,14 @@ +package com.nu.modules.cgd.service; + +import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 库房物料出入库信息 + * @Author: jeecg-boot + * @Date: 2025-10-14 + * @Version: V1.0 + */ +public interface INuWarehouseMaterialCrkInfoService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 744cc1b5..41f87e36 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -9,8 +9,10 @@ import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper; import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; +import com.nu.modules.cgd.mapper.NuWarehouseMaterialCrkInfoMapper; import com.nu.modules.cgd.service.INuInvoicingCgdMainService; import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo; import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper; @@ -68,6 +70,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl 0){ + String nuId = nuInvoicingCgdInfo.getNuId(); + String wlId = nuInvoicingCgdInfo.getWlId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("nu_id",nuId).eq("wl_id",wlId); + BlWarehouseMaterialInfo warehouseMaterialInfo = warehouseMaterialInfoMapper.selectOne(queryWrapper); + String czqkcl = warehouseMaterialInfo.getKcsl();//操作前库存量 + if(warehouseMaterialInfo != null){ + String kcsl = warehouseMaterialInfo.getKcsl(); + if(StringUtils.isNotBlank(kcsl)){ + warehouseMaterialInfo.setKcsl(String.valueOf(Integer.parseInt(kcsl) + Integer.parseInt(nuInvoicingCgdInfo.getRksl()))); + warehouseMaterialInfoMapper.updateById(warehouseMaterialInfo); + + + NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo(); + crkInfo.setCgdId(nuInvoicingCgdMain.getId()); + crkInfo.setNuId(nuId); + crkInfo.setWlId(wlId); + crkInfo.setCrkNum(nuInvoicingCgdInfo.getRksl()); + crkInfo.setCrkType("1"); + crkInfo.setContent("采购入库"); + crkInfo.setDqkcl(warehouseMaterialInfo.getKcsl()); + crkInfo.setCzqkcl(czqkcl); + crkInfoMapper.insert(crkInfo); + } + } + } + //判断是否有未入库的数量 String wrksl = nuInvoicingCgdInfo.getWrksl(); if(StringUtils.isNotBlank(wrksl) && Integer.parseInt(wrksl) > 0){ diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuWarehouseMaterialCrkInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuWarehouseMaterialCrkInfoServiceImpl.java new file mode 100644 index 00000000..770cbf20 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuWarehouseMaterialCrkInfoServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.cgd.service.impl; + +import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; +import com.nu.modules.cgd.mapper.NuWarehouseMaterialCrkInfoMapper; +import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 库房物料出入库信息 + * @Author: jeecg-boot + * @Date: 2025-10-14 + * @Version: V1.0 + */ +@Service +public class NuWarehouseMaterialCrkInfoServiceImpl extends ServiceImpl implements INuWarehouseMaterialCrkInfoService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java index 71e402a2..5c9d62b8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java @@ -9,6 +9,7 @@ import com.nu.modules.cgd.service.INuInvoicingCgdInfoService; import com.nu.modules.cgd.service.INuInvoicingCgdMainService; import com.nu.modules.qgd.entity.QgdMain; import com.nu.modules.qgd.service.IQgdMainService; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; @@ -87,7 +88,15 @@ public class QgdInfoController extends JeecgController nuInvoicingQgdInfoService.updateById(nuInvoicingQgdInfo); return Result.OK("编辑成功!"); } - + + + @AutoLog(value = "修改请购单数量") + @ApiOperation(value="修改请购单数量", notes="修改请购单数量") + @RequestMapping(value = "/editQgdInfo", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result editQgdInfo(@RequestBody QgdInfo nuInvoicingQgdInfo) { + nuInvoicingQgdInfoService.updateById(nuInvoicingQgdInfo); + return Result.OK(nuInvoicingQgdInfo); + } /** * 通过id删除 * @@ -153,8 +162,9 @@ public class QgdInfoController extends JeecgController //查询请购详细信息 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdInfo, req.getParameterMap()); queryWrapper.eq("main_id",qgdMain.getId()); + queryWrapper.apply(StringUtils.isNotBlank(nuInvoicingQgdInfo.getWlParamInfo()),"( wl_name like '%"+nuInvoicingQgdInfo.getWlParamInfo()+"%' or wl_material_no like '%"+nuInvoicingQgdInfo.getWlParamInfo()+"%' or wl_units like '%"+nuInvoicingQgdInfo.getWlParamInfo()+"%' or wl_specification_model like '%"+nuInvoicingQgdInfo.getWlParamInfo()+"%' ) "); Page page = new Page(pageNo, pageSize); - IPage pageList = nuInvoicingQgdInfoService.page(page, queryWrapper); + IPage pageList = nuInvoicingQgdInfoService.queryListByUser(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java index 7d886464..e92a597b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java @@ -3,6 +3,7 @@ package com.nu.modules.qgd.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -113,4 +114,9 @@ public class QgdInfo implements Serializable { /**参考单价*/ private java.lang.String referenceUnitPrice; + @TableField(exist = false) + private String kcsl; + @TableField(exist = false) + private String wlParamInfo; + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java index a63d3128..2045df32 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java @@ -1,7 +1,12 @@ package com.nu.modules.qgd.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.qgd.entity.QgdInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 请购单-请购信息 @@ -11,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface QgdInfoMapper extends BaseMapper { + IPage queryListByUser(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml index ca19ff23..1547aaad 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml @@ -2,4 +2,15 @@ + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java index 640af763..3d1af342 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java @@ -1,5 +1,8 @@ package com.nu.modules.qgd.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.qgd.entity.QgdInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -14,4 +17,6 @@ import java.util.List; public interface IQgdInfoService extends IService { void addList(List infoList); + + IPage queryListByUser(Page page, QueryWrapper queryWrapper); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java index dcaafeae..8e581a7f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.nu.modules.qgd.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.entity.QgdMain; @@ -91,4 +93,9 @@ public class QgdInfoServiceImpl extends ServiceImpl impl } } + + @Override + public IPage queryListByUser(Page page, QueryWrapper queryWrapper) { + return baseMapper.queryListByUser(page, queryWrapper); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java index 9675f3af..4abf519a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java @@ -72,6 +72,10 @@ public class BlWarehouseMaterialInfoController extends JeecgController 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); @@ -189,4 +193,23 @@ public class BlWarehouseMaterialInfoController extends JeecgController addBatch(@RequestBody List list) { +// for( BlWarehouseMaterialInfo blWarehouseMaterialInfo : list){ +// blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo); +// } + blWarehouseMaterialInfoService.saveBatch(list); + return Result.OK("添加成功！"); + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java index 46a45480..406eb2a0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java @@ -169,4 +169,8 @@ public class BlWarehouseMaterialInfo implements Serializable { @Excel(name = "多单位采购默认使用", width = 15) @ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级") private java.lang.String multiUnitType; + + + @TableField(exist = false) + private java.lang.String wlParamInfo;//查询物料信息参数，可多个查询 }