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

添加出入库记录

This commit is contained in:
yangjun 2025-10-14 14:34:22 +08:00
parent 017cf551c9
commit 973dadda74
21 changed files with 486 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,4 +193,17 @@ public class ConfigMaterialInfoController extends JeecgController<ConfigMaterial
configMaterialInfoService.wlqianyi(configMaterialInfo);
return Result.OK("操作成功!");
}
@ApiOperation(value="可配置物料的列表", notes="可配置物料的列表")
@GetMapping(value = "/getConfiguredList")
public Result<IPage<ConfigMaterialInfo>> getConfiguredList(ConfigMaterialInfo configMaterialInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Page<ConfigMaterialInfo> page = new Page<ConfigMaterialInfo>(pageNo, pageSize);
IPage<ConfigMaterialInfo> pageList = configMaterialInfoService.getConfiguredList(page, configMaterialInfo);
return Result.OK(pageList);
}
}

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

@ -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;//选择物料的时候物料查询信息
}

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

@ -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<ConfigMaterialInfo> {
void editQyty(ConfigMaterialInfo configMaterialInfo);
IPage<ConfigMaterialInfo> getConfiguredList(Page<ConfigMaterialInfo> page, @Param("param") ConfigMaterialInfo configMaterialInfo);
}

17
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml
View File

@ -17,4 +17,21 @@
</if>
</where>
</update>
<select id="getConfiguredList" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo">
select * from nu_config_material_info a
where id not in ( select wl_id from nu_warehouse_material_info)
<if test="param.checkId != null and param.checkId != ''">
and id not in ( ${param.checkId} )
</if>
<if test="param.paramWlxx != null and param.paramWlxx != ''">
and (material_name like concat('%', #{param.paramWlxx} , '%') or
pinyin like concat('%', #{param.paramWlxx} , '%') or
material_no like concat('%', #{param.paramWlxx} , '%') or
specification_model like concat('%', #{param.paramWlxx} , '%')
)
</if>
</select>
</mapper>

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

@ -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<ConfigMaterialInfo> {
void wlqianyi(ConfigMaterialInfo configMaterialInfo);
IPage<ConfigMaterialInfo> getConfiguredList(Page<ConfigMaterialInfo> page, ConfigMaterialInfo configMaterialInfo);
}

7
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java
View File

@ -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<ConfigMaterialInf
}
baseMapper.updateById(configMaterialInfo);
}
@Override
public IPage<ConfigMaterialInfo> getConfiguredList(Page<ConfigMaterialInfo> page, ConfigMaterialInfo configMaterialInfo) {
return baseMapper.getConfiguredList(page,configMaterialInfo);
}
}

180
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java Normal file
View File

@ -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<NuWarehouseMaterialCrkInfo, INuWarehouseMaterialCrkInfoService> {
@Autowired
private INuWarehouseMaterialCrkInfoService nuWarehouseMaterialCrkInfoService;
/**
* 分页列表查询
*
* @param nuWarehouseMaterialCrkInfo
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "库房物料出入库信息-分页列表查询")
@ApiOperation(value="库房物料出入库信息-分页列表查询", notes="库房物料出入库信息-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NuWarehouseMaterialCrkInfo>> queryPageList(NuWarehouseMaterialCrkInfo nuWarehouseMaterialCrkInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuWarehouseMaterialCrkInfo, req.getParameterMap());
Page<NuWarehouseMaterialCrkInfo> page = new Page<NuWarehouseMaterialCrkInfo>(pageNo, pageSize);
IPage<NuWarehouseMaterialCrkInfo> 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<String> 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<String> 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<String> 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<String> 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<NuWarehouseMaterialCrkInfo> 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);
}
}

93
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java Normal file
View File

@ -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;
}

17
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuWarehouseMaterialCrkInfoMapper.java Normal file
View File

@ -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<NuWarehouseMaterialCrkInfo> {
}

5
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuWarehouseMaterialCrkInfoMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.cgd.mapper.NuWarehouseMaterialCrkInfoMapper">
</mapper>

14
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuWarehouseMaterialCrkInfoService.java Normal file
View File

@ -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<NuWarehouseMaterialCrkInfo> {
}

34
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -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<NuInvoicingCgdMai
@Autowired
private ConfigSuppliersInfoMapper gysMapper;
@Autowired
private NuWarehouseMaterialCrkInfoMapper crkInfoMapper;
@Override
public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
@ -76,6 +81,35 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
for (NuInvoicingCgdInfo nuInvoicingCgdInfo : cgdInfoList) {
nuInvoicingCgdInfo.setMainId(nuInvoicingCgdMain.getId());
cgdInfoMapper.updateById(nuInvoicingCgdInfo);
//入库数量不为空，并且大于0
if(StringUtils.isNotBlank(nuInvoicingCgdInfo.getRksl()) && Integer.parseInt(nuInvoicingCgdInfo.getRksl()) > 0){
String nuId = nuInvoicingCgdInfo.getNuId();
String wlId = nuInvoicingCgdInfo.getWlId();
QueryWrapper<BlWarehouseMaterialInfo> 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){

19
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuWarehouseMaterialCrkInfoServiceImpl.java Normal file
View File

@ -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<NuWarehouseMaterialCrkInfoMapper, NuWarehouseMaterialCrkInfo> implements INuWarehouseMaterialCrkInfoService {
}

14
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java
View File

@ -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<QgdInfo, IQgdInfoService>
nuInvoicingQgdInfoService.updateById(nuInvoicingQgdInfo);
return Result.OK("编辑成功!");
}
@AutoLog(value = "修改请购单数量")
@ApiOperation(value="修改请购单数量", notes="修改请购单数量")
@RequestMapping(value = "/editQgdInfo", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<QgdInfo> editQgdInfo(@RequestBody QgdInfo nuInvoicingQgdInfo) {
nuInvoicingQgdInfoService.updateById(nuInvoicingQgdInfo);
return Result.OK(nuInvoicingQgdInfo);
}
/**
* 通过id删除
*
@ -153,8 +162,9 @@ public class QgdInfoController extends JeecgController<QgdInfo, IQgdInfoService>
//查询请购详细信息
QueryWrapper<QgdInfo> 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<QgdInfo> page = new Page<QgdInfo>(pageNo, pageSize);
IPage<QgdInfo> pageList = nuInvoicingQgdInfoService.page(page, queryWrapper);
IPage<QgdInfo> pageList = nuInvoicingQgdInfoService.queryListByUser(page, queryWrapper);
return Result.OK(pageList);
}

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java
View File

@ -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;
}

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/QgdInfoMapper.java
View File

@ -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<QgdInfo> {
IPage<QgdInfo> queryListByUser(Page<QgdInfo> page, @Param(Constants.WRAPPER) QueryWrapper<QgdInfo> queryWrapper);
}

11
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml
View File

@ -2,4 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.qgd.mapper.QgdInfoMapper">
<select id="queryListByUser" resultType="com.nu.modules.qgd.entity.QgdInfo">
select * from (
SELECT
a.*,b.kcsl
FROM
nu_invoicing_qgd_info a
LEFT JOIN nu_warehouse_material_info b on a.wl_id = b.wl_id
) t
${ew.customSqlSegment}
</select>
</mapper>

5
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdInfoService.java
View File

@ -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<QgdInfo> {
void addList(List<QgdInfo> infoList);
IPage<QgdInfo> queryListByUser(Page<QgdInfo> page, QueryWrapper<QgdInfo> queryWrapper);
}

7
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java
View File

@ -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<QgdInfoMapper, QgdInfo> impl
}
}
@Override
public IPage<QgdInfo> queryListByUser(Page<QgdInfo> page, QueryWrapper<QgdInfo> queryWrapper) {
return baseMapper.queryListByUser(page, queryWrapper);
}
}

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

@ -72,6 +72,10 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
@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);
@ -189,4 +193,23 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
return super.importExcel(request, response, BlWarehouseMaterialInfo.class);
}
/**
* 批量添加物料库房映射
* @param
* @return
*/
@AutoLog(value = "库房物料配置信息-添加")
@ApiOperation(value="库房物料配置信息-添加", notes="库房物料配置信息-添加")
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
@PostMapping(value = "/addBatch")
public Result<String> addBatch(@RequestBody List<BlWarehouseMaterialInfo> list) {
// for( BlWarehouseMaterialInfo blWarehouseMaterialInfo : list){
// blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo);
// }
blWarehouseMaterialInfoService.saveBatch(list);
return Result.OK("添加成功！");
}
}

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

@ -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;//查询物料信息参数，可多个查询
}