From 233b6acb22f8d93ece8a2b4932c31e2df2681f4e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 11 Dec 2025 14:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=A3=E8=B4=A7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NuInvoicingCgdMainServiceImpl.java        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 c2281a21..44b7a222 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
@@ -1022,6 +1022,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
 
         Map<String,Object> result = new HashMap<>();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(loginUser == null || StringUtils.isBlank(loginUser.getRealname())){
+            loginUser = new LoginUser();
+            loginUser.setRealname("系统管理员");
+            loginUser.setOrgCode("101");
+        }
         QueryWrapper<NuInvoicingCgdInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id",cgdInfoEntityDto.getJhId());
         //请购信息
@@ -1083,6 +1088,15 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         }
         crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量)
         crkInfo.setContent("采购单："+cgdMain.getCgdNo());
+        crkInfo.setMaterialCategoryName(dictUtils.translateDictValue("id","category_name","nu_config_material_category",mterialInfo.getCategoryId()));//物料类别名称
+        crkInfo.setMaterialTypeName(dictUtils.translateDictValue("id","type_name","nu_config_material_type",mterialInfo.getTypeId()));//物料类型名称
+        crkInfo.setMaterialMedicationName(dictUtils.translateDictValue("id","medication_name","nu_config_material_medication",mterialInfo.getMedicationId()));//物料类型名称
+        crkInfo.setMaterialName(mterialInfo.getMaterialName());//物料名称
+        crkInfo.setMaterialUnits(mterialInfo.getMaterialUnits());//物料单位
+        crkInfo.setMaterialNo(mterialInfo.getMaterialNo());//物料编码
+        crkInfo.setSpecificationModel(mterialInfo.getSpecificationModel());//规格型号
+        crkInfo.setMaterialImg(mterialInfo.getMaterialImg());//物料图片
+        crkInfo.setSalesUnitPrice(new BigDecimal(mterialInfo.getSalesUnitPrice()));//销售单价
         if(crkInfo.getCrkNum()>0){
             crkInfoMapper.insert(crkInfo);
         }