From 57115f0d91a176b341a02686fdc4f7083efa9e59 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 23 Apr 2026 10:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 59 ++++++++- .../com/nu/entity/InvoicingPddInfoEntity.java | 61 ++++----- .../com/nu/entity/MaterialInfoEntity.java | 8 ++ .../WarehouseMaterialCrkInfoEntity.java | 4 + .../entity/WarehouseMaterialInfoEntity.java | 83 +++++++++++++ .../modules/invoicing/api/IInvoicingApi.java | 8 ++ .../mapper/ConfigMaterialInfoMapper.java | 2 + .../mapper/xml/ConfigMaterialInfoMapper.xml | 11 ++ .../entity/NuWarehouseMaterialCrkInfo.java | 6 + .../impl/NuInvoicingCgdMainServiceImpl.java | 116 ++++++++++++++++-- .../pdd/entity/NuInvoicingPddInfo.java | 48 +------- .../pdd/mapper/NuInvoicingPddInfoMapper.java | 2 + .../mapper/xml/NuInvoicingPddInfoMapper.xml | 5 + 13 files changed, 332 insertions(+), 81 deletions(-) create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialInfoEntity.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index 8c8219ee..ebcfaf3e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.entity.*; import com.nu.modules.invoicing.api.IInvoicingApi; -import com.nu.modules.order.api.IDirectiveOrderApi; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; @@ -28,8 +27,6 @@ public class InvoicingApi { @Autowired private IInvoicingApi invoicingApi; - @Autowired - private IDirectiveOrderApi directiveOrderApi; @ApiOperation(value = "采购单-查询物料信息-分页列表查询", notes = "采购单-查询物料信息-分页列表查询") @GetMapping(value = "/queryInvoicingList") @@ -553,6 +550,62 @@ public class InvoicingApi { } + /** + * 仓库-查询物料列表 + * @param materialInfoEntity + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/getCkWlList") + public Result> getCkWlList(MaterialInfoEntity materialInfoEntity, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getSuppliers()),"c.suppliers_id", materialInfoEntity.getSuppliers()); + queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"a.nu_id", materialInfoEntity.getNuId()); + queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getWlId()),"a.wl_id", materialInfoEntity.getWlId()); + queryWrapper.apply(StringUtils.isNotBlank(materialInfoEntity.getWlParamInfo()),"( b.material_name like '%"+materialInfoEntity.getWlParamInfo()+"%' or b.material_no like '%"+materialInfoEntity.getWlParamInfo()+"%' or b.pinyin like '%"+materialInfoEntity.getWlParamInfo()+"%' or b.specification_model like '%"+materialInfoEntity.getWlParamInfo()+"%' ) "); + Page page = new Page(pageNo, pageSize); + IPage pageList = invoicingApi.getCkWlList(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 盘点单-查询盘点单信息-根据库房的id查询 + * @param invoicingPddInfoEntity + * @return + */ + @GetMapping(value = "/getPddInfoById") + public Result getPddInfoById(InvoicingPddInfoEntity invoicingPddInfoEntity) { + InvoicingPddInfoEntity pageList = invoicingApi.getPddInfoById(invoicingPddInfoEntity); + return Result.OK(pageList); + } + + + + @ApiOperation(value="盘点单-添加盘点信息", notes="盘点单-添加盘点信息") + @AutoLog(value = "盘点单-添加盘点信息",clientType="app", operateType = 3) + @PostMapping(value = "/savePddInfo") + public Result savePddInfo(@RequestBody InvoicingPddInfoEntity invoicingPddInfoEntity) { + InvoicingPddInfoEntity result = invoicingApi.savePddInfo(invoicingPddInfoEntity); + return Result.OK(result); + } + + + + @ApiOperation(value="库存-修改销售价格", notes="库存-修改销售价格") + @AutoLog(value = "库存-修改销售价格",clientType="app", operateType = 3) + @PostMapping(value = "/editXsjg") + public Result editXsjg(@RequestBody WarehouseMaterialInfoEntity warehouseMaterialInfoEntity) { + invoicingApi.editXsjg(warehouseMaterialInfoEntity); + return Result.OK("操作成功"); + } + + + public static boolean toBoolean(Object obj) { if (obj != null && !(Boolean) obj) { return false; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddInfoEntity.java index 51cd294e..4dfb214f 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddInfoEntity.java @@ -1,6 +1,7 @@ package com.nu.entity; 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 com.fasterxml.jackson.annotation.JsonFormat; @@ -25,56 +26,58 @@ import java.util.Date; @Data public class InvoicingPddInfoEntity implements Serializable { - /**id*/ - private String id; + private java.lang.String id; /**createBy*/ - private String 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") - private Date createTime; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; /**updateBy*/ - private String 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") - private Date updateTime; - /**盘点单id*/ - @Dict(dictTable = "nu_invoicing_pdd_main", dicText = "pdd_no", dicCode = "id") - private String pddId; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; /**库房id*/ - private String nuId; + private java.lang.String nuId; /**物料id*/ - private String wlId; + private java.lang.String wlId; /**当前库存数量*/ - private Integer dqkcsl; + private java.lang.Double dqkcsl; /**盘点数量*/ - private Integer pdsl; + private java.lang.Double pdsl; /**差额数量*/ - private Integer cesl; - /**盘点类型 1盘盈单 2盘亏单*/ - private String pdType; + private java.lang.Double cesl; + /**盘点类型 1盘盈单 2盘亏单 3作废*/ + @Dict(dicCode = "pd_type") + private java.lang.String pdType; /**备注信息*/ - private String content; + private java.lang.String content; /**拍照图片*/ - private String picPath; + private java.lang.String picPath; /**物料类别*/ - private String categoryName; + private java.lang.String categoryName; /**物料类型*/ - private String typeName; + private java.lang.String typeName; /**用药类型*/ - private String medicationName; + private java.lang.String medicationName; /**货品名称*/ - private String materialName; + private java.lang.String materialName; /**货品编码*/ - private String materialNo; + private java.lang.String materialNo; /**规格型号*/ - private String specificationModel; + private java.lang.String specificationModel; /**物料图片*/ - private String materialImg; + private java.lang.String materialImg; /**货品单位*/ - private String materialUnits; + private java.lang.String materialUnits; + /**盘点单号*/ + private java.lang.String pddNo; + /**库存id*/ + private java.lang.String ckId; + - /**查询条件 1盘盈单 2盘亏单 3已盘点 4未盘点 */ private String paramType; + private java.lang.Integer num; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index 5e3a5f6d..c15c2c58 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -148,4 +148,12 @@ public class MaterialInfoEntity implements Serializable { private String manufacturer; /**机构价格*/ private java.math.BigDecimal orgUnitPrice; + private String ddNo; + private String cgdId; + private String cgdInfoId; + private String wlunits; + private String xsjg; + private String xsdw; + private Double arrivalPrice; + private Double procurementPrice; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialCrkInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialCrkInfoEntity.java index d749eed8..dfc4ba1e 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialCrkInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialCrkInfoEntity.java @@ -65,5 +65,9 @@ public class WarehouseMaterialCrkInfoEntity implements Serializable { @Dict(dicCode = "crk_status") private String crkStatus; private String colomnDesc; + private Double xzsl;//销账数量 + private Double gzsl;//挂账数量 + private String ddNo;//订单号 + private String cgBy;//采购人 } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialInfoEntity.java new file mode 100644 index 00000000..d25f4df5 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/WarehouseMaterialInfoEntity.java @@ -0,0 +1,83 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 库房物料配置信息 + * @Author: jeecg-boot + * @Date: 2025-08-28 + * @Version: V1.0 + */ +@Data +public class WarehouseMaterialInfoEntity implements Serializable { + + /**id*/ + private String id; + /**createBy*/ + private String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**updateBy*/ + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**库房*/ + @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") + private String nuId; + /**物料*/ + @Dict(dictTable = "nu_config_material_info", dicText = "material_name", dicCode = "id") + private String wlId; + + /**库存数量*/ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#0.00") + private Double kcsl; + + private String cgdInfoId;//采购单/退货单id + private String xsjg;//销售价格 + private String xsdw;//销售单位 + private String cgdId;//采购单主表id/退货单主表id + private String cgdType;//订单类型 1采购单 2退货单 + private String ddNo;//单号 + + /**物料类别*/ + @Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") + private String categoryId; + /**物料类型*/ + @Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") + private String typeId; + /**用药类型*/ + @Dict(dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id") + private String medicationId; + /**货品名称*/ + private String materialName; + /**货品编码*/ + private String materialNo; + /**规格型号*/ + private String specificationModel; + /**供应商*/ + @Dict(dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") + private String suppliers; + /**货品单位*/ + private String materialUnits; + /**品牌型号*/ + private String brandType; + /**生产厂家*/ + private String manufacturer; +} diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index e052b091..dde12d62 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -103,4 +103,12 @@ public interface IInvoicingApi { Map saveCgdInfo(String[] qgdIds); String querenOrZuofei(CgdMainEntity cgdMainEntityDto); + + IPage getCkWlList(Page page, QueryWrapper queryWrapper); + + InvoicingPddInfoEntity getPddInfoById(InvoicingPddInfoEntity invoicingPddInfoEntity); + + InvoicingPddInfoEntity savePddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity); + + void editXsjg(WarehouseMaterialInfoEntity warehouseMaterialInfoEntity); } 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 947965e7..a08930b9 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 @@ -50,4 +50,6 @@ public interface ConfigMaterialInfoMapper extends BaseMapper IPage getNoSuplist(Page page, @Param("params") ConfigMaterialInfo configMaterialInfo); IPage wlShoppingList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage getCkWlList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 1f85621b..2bfcb4c8 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 @@ -205,4 +205,15 @@ ) a ${ew.customSqlSegment} + + + 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 index a486450a..97f8e98d 100644 --- 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 @@ -95,6 +95,12 @@ public class NuWarehouseMaterialCrkInfo implements Serializable { private String crkStatus; private Double ddwNum;//多单位时的数量 + private Double xzsl;//销账数量 + private Double gzsl;//挂账数量 + private String ddNo;//订单号 + private String cgBy;//采购人 + private String pddType;//盘点类型 1盘盈 2盘亏 + /**物料类别名称*/ @Excel(name = "物料类别名称", width = 15) 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 a475f53c..99cb44ce 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 @@ -29,6 +29,8 @@ import com.nu.modules.invoicing.api.IPddApi; import com.nu.modules.nubaseinfo.entity.NuBaseInfo; import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper; import com.nu.modules.order.api.IDirectiveOrderApi; +import com.nu.modules.pdd.entity.NuInvoicingPddInfo; +import com.nu.modules.pdd.mapper.NuInvoicingPddInfoMapper; import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.mapper.QgdInfoMapper; import com.nu.modules.sysconfig.ISysConfigApi; @@ -126,6 +128,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl0){ - crkInfoMapper.insert(crkInfo); - } + @@ -1142,9 +1148,17 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl0){ + crkInfoMapper.insert(crkInfo); +// } + + /**单据状态 0待入库 1挂账中 2已入库 3已销账*/ //判断是否是销账操作，不是销账的话 if(StringUtils.equals("3",cgdInfo.getStatus())){ @@ -1420,10 +1434,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("wl_id",nuWarehouseMaterialCrkInfo.getWlId()); queryWrapper.eq("nu_id",nuWarehouseMaterialCrkInfo.getNuId()); + queryWrapper.eq("cgd_id",nuWarehouseMaterialCrkInfo.getCgdId()); if(StringUtils.isNotBlank(crkInfoEntity.getCrkStatus())){ queryWrapper.in("crk_status",crkInfoEntity.getCrkStatus()); - }else{ - queryWrapper.in("crk_status",1,3); +// }else{ +// queryWrapper.in("crk_status",1,3); } if(StringUtils.equals("asc",colomnDesc)){ @@ -1735,4 +1750,91 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getCkWlList(Page page, QueryWrapper queryWrapper) { + return configMaterialInfoMapper.getCkWlList(page,queryWrapper); + } + + @Override + public InvoicingPddInfoEntity getPddInfoById(InvoicingPddInfoEntity invoicingPddInfoEntity) { + return pddInfoMapper.getPddInfoById(invoicingPddInfoEntity); + } + + @Override + public InvoicingPddInfoEntity savePddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String qgdDate = new SimpleDateFormat("yyyyMMdd").format(new Date()); + String pddXlh = ""; + if(redisUtil.get("PDD"+qgdDate) != null){ + pddXlh = redisUtil.get("PDD"+qgdDate).toString(); + } + int pddXlhInt = 0; + if(StringUtils.isNotBlank(pddXlh)){ + pddXlhInt = Integer.parseInt(pddXlh); + } + NuInvoicingPddInfo pddInfo = new NuInvoicingPddInfo(); + String pddNo = "P"+sysUser.getOrgCode()+qgdDate + String.format("%03d", pddXlhInt); + pddInfo.setPddNo(pddNo); + + + BlWarehouseMaterialInfo ckInfo = mterialInfoMapper.selectById(invoicingPddInfoEntity.getCkId()); + pddInfo.setMaterialImg(ckInfo.getMaterialImg()); + pddInfo.setMaterialName(ckInfo.getMaterialName()); + pddInfo.setMaterialNo(ckInfo.getMaterialNo()); + pddInfo.setMaterialUnits(ckInfo.getMaterialUnits()); + pddInfo.setSpecificationModel(ckInfo.getSpecificationModel()); + pddInfo.setCategoryName(ckInfo.getCategoryName()); + pddInfo.setTypeName(ckInfo.getTypeName()); + pddInfo.setMedicationName(ckInfo.getMedicationName()); + pddInfo.setNuId(sysUser.getId()); + pddInfo.setWlId(ckInfo.getWlId()); + pddInfo.setDqkcsl(ckInfo.getKcsl()); + pddInfo.setPdsl(invoicingPddInfoEntity.getPdsl()); + pddInfo.setCesl(invoicingPddInfoEntity.getCesl()); + pddInfo.setPicPath(invoicingPddInfoEntity.getPicPath()); + pddInfo.setCkId(invoicingPddInfoEntity.getCkId()); + pddInfo.setContent(invoicingPddInfoEntity.getContent()); + pddInfo.setPdType(invoicingPddInfoEntity.getPdType()); + pddInfo.setNum(invoicingPddInfoEntity.getNum()); + pddInfoMapper.insert(pddInfo); + pddXlhInt++; + redisUtil.set("PDD"+qgdDate,pddXlhInt); + + //-------------------------记录出入库记录-------------------------- + NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo(); + crkInfo.setCreateBy(sysUser.getRealname()); + crkInfo.setCgdId(pddInfo.getId()); + crkInfo.setNuId(pddInfo.getNuId()); + crkInfo.setWlId(pddInfo.getWlId()); + crkInfo.setCrkType("1");//请购单类型 此处是固定的 + crkInfo.setJhPic(pddInfo.getPicPath());//拣货图片 + crkInfo.setCzqkcl(pddInfo.getDqkcsl());//操作前库存量 + crkInfo.setDdwNum(pddInfo.getPdsl());//多单位时的数量 + crkInfo.setContent("盘点单："+pddNo); + crkInfo.setMaterialCategoryName(pddInfo.getCategoryName());//物料类别名称 + crkInfo.setMaterialTypeName(pddInfo.getTypeName());//物料类型名称 + crkInfo.setMaterialMedicationName(pddInfo.getMedicationName());//物料类型名称 + crkInfo.setMaterialName(pddInfo.getMaterialName());//物料名称 + crkInfo.setMaterialUnits(pddInfo.getMaterialUnits());//物料单位 + crkInfo.setMaterialNo(pddInfo.getMaterialNo());//物料编码 + crkInfo.setSpecificationModel(pddInfo.getSpecificationModel());//规格型号 + crkInfo.setMaterialImg(pddInfo.getMaterialImg());//物料图片 + crkInfo.setSalesUnitPrice(new BigDecimal(ckInfo.getXsjg()));//销售单价 + crkInfo.setCrkNum(pddInfo.getCesl()); + crkInfo.setDdNo(pddNo); + crkInfo.setCgBy(sysUser.getRealname()); + crkInfoMapper.insert(crkInfo); + //-------------------------记录出入库记录-------------------------- + + BeanUtils.copyProperties(pddInfo, invoicingPddInfoEntity); + return invoicingPddInfoEntity; + } + + @Override + public void editXsjg(WarehouseMaterialInfoEntity warehouseMaterialInfoEntity) { + BlWarehouseMaterialInfo materialInfo = new BlWarehouseMaterialInfo(); + BeanUtils.copyProperties(warehouseMaterialInfoEntity, materialInfo); + mterialInfoMapper.updateById(materialInfo); + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddInfo.java index 7814221c..16d0aa14 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddInfo.java @@ -34,94 +34,58 @@ public class NuInvoicingPddInfo implements Serializable { /**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; - /**盘点单id*/ - @Excel(name = "盘点单id", width = 15, dictTable = "nu_invoicing_pdd_main", dicText = "pdd_no", dicCode = "id") - @Dict(dictTable = "nu_invoicing_pdd_main", dicText = "pdd_no", dicCode = "id") - @ApiModelProperty(value = "盘点单id") - private java.lang.String pddId; /**库房id*/ - @Excel(name = "库房id", width = 15) - @ApiModelProperty(value = "库房id") private java.lang.String nuId; /**物料id*/ - @Excel(name = "物料id", width = 15) - @ApiModelProperty(value = "物料id") private java.lang.String wlId; /**当前库存数量*/ - @Excel(name = "当前库存数量", width = 15) - @ApiModelProperty(value = "当前库存数量") private java.lang.Double dqkcsl; /**盘点数量*/ - @Excel(name = "盘点数量", width = 15) - @ApiModelProperty(value = "盘点数量") private java.lang.Double pdsl; /**差额数量*/ - @Excel(name = "差额数量", width = 15) - @ApiModelProperty(value = "差额数量") private java.lang.Double cesl; /**盘点类型 1盘盈单 2盘亏单 3作废*/ - @Excel(name = "盘点类型 1盘盈单 2盘亏单 3作废", width = 15) - @ApiModelProperty(value = "盘点类型 1盘盈单 2盘亏单 3作废") @Dict(dicCode = "pd_type") private java.lang.String pdType; /**备注信息*/ - @Excel(name = "备注信息", width = 15) - @ApiModelProperty(value = "备注信息") private java.lang.String content; /**拍照图片*/ - @Excel(name = "拍照图片", width = 15) - @ApiModelProperty(value = "拍照图片") private java.lang.String picPath; /**物料类别*/ - @Excel(name = "物料类别", width = 15) - @ApiModelProperty(value = "物料类别") private java.lang.String categoryName; /**物料类型*/ - @Excel(name = "物料类型", width = 15) - @ApiModelProperty(value = "物料类型") private java.lang.String typeName; /**用药类型*/ - @Excel(name = "用药类型", width = 15) - @ApiModelProperty(value = "用药类型") private java.lang.String medicationName; /**货品名称*/ - @Excel(name = "货品名称", width = 15) - @ApiModelProperty(value = "货品名称") private java.lang.String materialName; /**货品编码*/ - @Excel(name = "货品编码", width = 15) - @ApiModelProperty(value = "货品编码") private java.lang.String materialNo; /**规格型号*/ - @Excel(name = "规格型号", width = 15) - @ApiModelProperty(value = "规格型号") private java.lang.String specificationModel; /**物料图片*/ - @Excel(name = "物料图片", width = 15) - @ApiModelProperty(value = "物料图片") private java.lang.String materialImg; /**货品单位*/ - @Excel(name = "货品单位", width = 15) - @ApiModelProperty(value = "货品单位") private java.lang.String materialUnits; + /**盘点单号*/ + private java.lang.String pddNo; + /**库存id*/ + private java.lang.String ckId; + + private String pddId; @TableField(exist = false) private java.lang.Integer num; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java index 1e4a577b..b62b5c7e 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java @@ -20,4 +20,6 @@ public interface NuInvoicingPddInfoMapper extends BaseMapper List selectPydPkdList(@Param("pddId")String pddId); List queryPddStartByList(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity); + + InvoicingPddInfoEntity getPddInfoById(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml index b8667e7f..4686863b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml @@ -32,4 +32,9 @@ + + + \ No newline at end of file