From ec56115b895e46dc50c38889670ca169cd9b3b3b Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 11 Dec 2025 13:51:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E5=8D=95-=E5=85=A5=E5=BA=93=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BA=93=E6=88=BF=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=202=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E8=AF=B7?= =?UTF-8?q?=E9=A2=86=E5=8D=95-=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BA=93=E6=88=BF?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/NuWarehouseMaterialCrkInfo.java | 37 +++++++++++++++++++ .../qld/service/impl/QingLingServiceImpl.java | 10 +++++ .../thd/service/impl/ThdServiceImpl.java | 10 +++++ 3 files changed, 57 insertions(+) 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 451146c0..071cf590 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 @@ -96,6 +96,43 @@ public class NuWarehouseMaterialCrkInfo implements Serializable { private Integer ddwNum;//多单位时的数量 + /**物料类别名称*/ + @Excel(name = "物料类别名称", width = 15) + @ApiModelProperty(value = "物料类别名称") + private java.lang.String materialCategoryName; + /**物料类型名称*/ + @Excel(name = "物料类型名称", width = 15) + @ApiModelProperty(value = "物料类型名称") + private java.lang.String materialTypeName; + /**用药类型名称*/ + @Excel(name = "用药类型名称", width = 15) + @ApiModelProperty(value = "用药类型名称") + private java.lang.String materialMedicationName; + /**物料名称*/ + @Excel(name = "物料名称", width = 15) + @ApiModelProperty(value = "物料名称") + private java.lang.String materialName; + /**物料单位*/ + @Excel(name = "物料单位", width = 15) + @ApiModelProperty(value = "物料单位") + private java.lang.String materialUnits; + /**物料编码*/ + @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.math.BigDecimal salesUnitPrice; + @TableField(exist = false) private String paramDate; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 2dfe65a7..e09177e1 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -732,6 +732,16 @@ public class QingLingServiceImpl implements IQinglingApi { kfCrkLog.setDqkcl((Integer.parseInt(kfWlSlMap.get(item.getKfId()).get(item.getWlId())) - item.getQlNum()) + "");//当前库存量 kfCrkLog.setCrkStatus("3");//出入库状态 3出库 kfCrkLog.setContent("请领单：" + dto.getQldNo());//备注 + + kfCrkLog.setMaterialCategoryName(item.getMaterialCategoryName());//物料类别名称 + kfCrkLog.setMaterialTypeName(item.getMaterialTypeName());//物料类型名称 + kfCrkLog.setMaterialMedicationName(item.getMaterialMedicationName());//物料类型名称 + kfCrkLog.setMaterialName(item.getMaterialName());//物料名称 + kfCrkLog.setMaterialUnits(item.getMaterialUnits());//物料单位 + kfCrkLog.setMaterialNo(item.getMaterialNo());//物料编码 + kfCrkLog.setSpecificationModel(item.getSpecificationModel());//规格型号 + kfCrkLog.setMaterialImg(item.getMaterialImg());//物料图片 + kfCrkLog.setSalesUnitPrice(item.getSalesUnitPrice());//物料销售单价 kfCrkLogList.add(kfCrkLog); }); warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index ddf5012c..2045eeb0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -398,6 +398,16 @@ public class ThdServiceImpl implements ITuiHuoApi { kfCrkLog.setDqkcl((Integer.parseInt(kfWlSlMap.get(item.getKfId()).get(item.getWlId())) + item.getThNum()) + "");//当前库存量 kfCrkLog.setCrkStatus("1");//出入库状态 1入库 kfCrkLog.setContent("退货单：" + thdNo);//备注 + + kfCrkLog.setMaterialCategoryName(item.getMaterialCategoryName());//物料类别名称 + kfCrkLog.setMaterialTypeName(item.getMaterialTypeName());//物料类型名称 + kfCrkLog.setMaterialMedicationName(item.getMaterialMedicationName());//物料类型名称 + kfCrkLog.setMaterialName(item.getMaterialName());//物料名称 + kfCrkLog.setMaterialUnits(item.getMaterialUnits());//物料单位 + kfCrkLog.setMaterialNo(item.getMaterialNo());//物料编码 + kfCrkLog.setSpecificationModel(item.getSpecificationModel());//规格型号 + kfCrkLog.setMaterialImg(item.getMaterialImg());//物料图片 + kfCrkLog.setSalesUnitPrice(item.getSalesUnitPrice());//物料销售单价 kfCrkLogList.add(kfCrkLog); } warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList);