From 1a421b5e803a6f795ab5538c332ed1f47738698c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 8 Dec 2025 08:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java    | 2 ++
 .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java      | 5 +++--
 .../entity/BlWarehouseMaterialInfo.java                      | 2 ++
 .../mapper/xml/BlWarehouseMaterialInfoMapper.xml             | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

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 12ba7427..451146c0 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
@@ -94,6 +94,8 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
     @Dict(dicCode = "crk_status")
     private String crkStatus;
 
+    private Integer ddwNum;//多单位时的数量
+
     @TableField(exist = false)
     private String paramDate;
 }
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 b4665220..54820020 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
@@ -1059,6 +1059,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         crkInfo.setOldPrice(procurementPrice);//原来的价格（最开始的采购价格）
         crkInfo.setNewPrice(price);//新的价格
         crkInfo.setCzqkcl(kcsl);//操作前库存量
+        crkInfo.setDdwNum(jhNum);//多单位时的数量
         String dqkcl = kcsl;
 
         if(jhNum > cgsl - rksl - xzsl){
@@ -1082,7 +1083,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         }
         crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量)
         crkInfo.setContent("采购单："+cgdMain.getCgdNo());
-        if(crkInfo.getCrkNum()>0 && StringUtils.equals("0",jhType)){
+        if(crkInfo.getCrkNum()>0){
             crkInfoMapper.insert(crkInfo);
         }
 
@@ -1154,7 +1155,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             //计算一下采购单的实际进货价格
             BigDecimal zjhjg = new BigDecimal("0");
             for (NuWarehouseMaterialCrkInfo info : crkInfoList){
-                zjhjg = zjhjg.add(info.getNewPrice().multiply(new BigDecimal(info.getCrkNum())));
+                zjhjg = zjhjg.add(info.getNewPrice().multiply(new BigDecimal(info.getDdwNum())));
             }
             cgdMain.setTotalPrice(zjhjg);
 
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
index 29c5cf03..86d16204 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
@@ -208,4 +208,6 @@ public class BlWarehouseMaterialInfo implements Serializable {
     private Integer gwcNum;//购物车的采购数量
     @TableField(exist = false)
     private Integer ljkcsl;//累计库存数量
+    @TableField(exist = false)
+    private String nuName;//累计库存数量
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
index 9a50ce3b..98e6ff4c 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
@@ -30,11 +30,13 @@
                 b.reference_unit_price,
                 b.material_img,
                 c.item_text as tagName,
-                if(d.wl_id is null, '0', '1') as isAdd
+                if(d.wl_id is null, '0', '1') as isAdd,
+                kf.nu_name
             from nu_warehouse_material_info a
             left join nu_config_material_info b on a.wl_id = b.id
             left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id
             left join sys_dict_item c on  b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
+            left join nu_base_info kf on kf.nu_id = a.nu_id
         ) a
         ${ew.customSqlSegment}