From 254a8bf8de41586ee00dd7d90871a604363bbaf3 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 27 Apr 2026 17:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NuInvoicingCgdMainServiceImpl.java   | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

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 60116dfe..d514a6ef 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
@@ -1779,14 +1779,26 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
 
 
         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());
+        List<String> ids = new ArrayList<>();
+        ids.add(ckInfo.getWlId());
+        List<ConfigMaterialInfo> configMaterialInfoList = configMaterialInfoMapper.queryByWlids(ids);
+
+        NuInvoicingCgdInfo cgdInfo = cgdInfoMapper.selectById(ckInfo.getCgdInfoId());
+
+        ConfigMaterialInfo configMaterialInfo = configMaterialInfoList.get(0);
+        pddInfo.setMaterialImg(configMaterialInfo.getMaterialImg());
+        pddInfo.setMaterialName(configMaterialInfo.getMaterialName());
+        pddInfo.setMaterialNo(configMaterialInfo.getMaterialNo());
+        pddInfo.setMaterialUnits(configMaterialInfo.getMaterialUnits());
+        pddInfo.setSpecificationModel(configMaterialInfo.getSpecificationModel());
+        pddInfo.setCategoryName(configMaterialInfo.getCategoryName());
+        pddInfo.setTypeName(configMaterialInfo.getTypeName());
+        pddInfo.setMedicationName(configMaterialInfo.getMedicationName());
+        pddInfo.setBrandType(configMaterialInfo.getBrandType());
+        pddInfo.setManufacturer(configMaterialInfo.getManufacturer());
+        pddInfo.setSuppliersId(cgdInfo.getSuppliersId());
+        pddInfo.setSuppliersName(cgdInfo.getSuppliersName());
+
         pddInfo.setNuId(invoicingPddInfoEntity.getNuId());
         pddInfo.setWlId(ckInfo.getWlId());
         pddInfo.setDqkcsl(ckInfo.getKcsl());
@@ -1818,14 +1830,15 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         crkInfo.setCzqkcl(pddInfo.getDqkcsl());//操作前库存量
         crkInfo.setDdwNum(pddInfo.getPdsl());//多单位时的数量
         crkInfo.setContent("盘点单："+pddNo);
-        crkInfo.setMaterialCategoryName(invoicingPddInfoEntity.getCategoryName());//物料类别名称
-        crkInfo.setMaterialTypeName(invoicingPddInfoEntity.getTypeName());//物料类型名称
-        crkInfo.setMaterialMedicationName(invoicingPddInfoEntity.getMedicationName());//物料类型名称
-        crkInfo.setMaterialName(invoicingPddInfoEntity.getMaterialName());//物料名称
-        crkInfo.setMaterialUnits(pddInfo.getMaterialUnits());//物料单位
-        crkInfo.setMaterialNo(invoicingPddInfoEntity.getMaterialNo());//物料编码
-        crkInfo.setSpecificationModel(invoicingPddInfoEntity.getSpecificationModel());//规格型号
-        crkInfo.setMaterialImg(invoicingPddInfoEntity.getMaterialImg());//物料图片
+
+        crkInfo.setMaterialCategoryName(configMaterialInfo.getCategoryName());//物料类别名称
+        crkInfo.setMaterialTypeName(configMaterialInfo.getTypeName());//物料类型名称
+        crkInfo.setMaterialMedicationName(configMaterialInfo.getMedicationName());//物料类型名称
+        crkInfo.setMaterialName(configMaterialInfo.getMaterialName());//物料名称
+        crkInfo.setMaterialUnits(ckInfo.getXsdw());//物料单位
+        crkInfo.setMaterialNo(configMaterialInfo.getMaterialNo());//物料编码
+        crkInfo.setSpecificationModel(configMaterialInfo.getSpecificationModel());//规格型号
+        crkInfo.setMaterialImg(configMaterialInfo.getMaterialImg());//物料图片
 
 //        crkInfo.setOldPrice();
         if(StringUtils.isNotBlank(ckInfo.getXsjg())){
@@ -1841,6 +1854,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         crkInfo.setCrkNum(invoicingPddInfoEntity.getCesl());
         crkInfo.setDdNo(pddNo);
         crkInfo.setCgBy(sysUser.getRealname());
+        crkInfo.setPdType(invoicingPddInfoEntity.getPdType());
         crkInfoMapper.insert(crkInfo);
         //-------------------------记录出入库记录--------------------------