From 95b43975d11890c3c8a2ae83fe7f8d5186aaa108 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 14 Jan 2026 10:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pad/invoicing/api/InvoicingApi.java       |  6 ---
 .../impl/NuInvoicingCgdMainServiceImpl.java   | 49 +++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

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 ee641d7c..fb2b38e1 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
@@ -59,12 +59,6 @@ public class InvoicingApi {
     @AutoLog(value = "采购单-采购信息-添加",clientType="app", operateType = 2)
     @PostMapping(value = "/addShoppingCartList")
     public Result<String> addShoppingCartList(@RequestBody List<QgdInfoEntity> infoList) {
-        DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
-        qgdInfoEntityDto.setBizTypeCode("CGD-CGWL");
-        qgdInfoEntityDto.setBizType("采购单添加物料信息");
-        qgdInfoEntityDto.setBizNo("");
-        qgdInfoEntityDto.setOptType("添加");
-        directiveOrderApi.addBizLog(qgdInfoEntityDto);
         Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
         if(!toBoolean(pddMap.get("success"))){
             return Result.error(pddMap.get("message").toString());
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 f0927a92..7a97fe29 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
@@ -25,6 +25,7 @@ import com.nu.modules.invoicing.api.IInvoicingApi;
 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.qgd.entity.QgdInfo;
 import com.nu.modules.qgd.mapper.QgdInfoMapper;
 import com.nu.modules.sysconfig.ISysConfigApi;
@@ -110,6 +111,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Autowired
     private IPddApi pddApi;
 
+
+    @Autowired
+    private IDirectiveOrderApi directiveOrderApi;
+
     @Override
     public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
     }
@@ -397,8 +402,20 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
                 qgdInfoMapper.deleteById(id);
             }
             redisUtil.set("qgd"+qgdDate,qgdXlhInt);
+
+
+            DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
+            qgdInfoEntityDto.setBizTypeCode("CGD");
+            qgdInfoEntityDto.setBizType("采购单");
+            qgdInfoEntityDto.setBizNo(cgdNo);
+            qgdInfoEntityDto.setOptType("生成采购单信息");
+            directiveOrderApi.addBizLog(qgdInfoEntityDto);
+
         }
         cgdMainList = BeanUtil.copyToList(mapList2,CgdMainEntity.class);
+
+
+
         return cgdMainList;
     }
 
@@ -572,6 +589,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         cgdMain.setZfBy(loginUser.getRealname());
         cgdMain.setZfTime(new Date());
         baseMapper.updateById(cgdMain);
+
+
+        DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
+        qgdInfoEntityDto.setBizTypeCode("CGD");
+        qgdInfoEntityDto.setBizType("采购单");
+        qgdInfoEntityDto.setBizNo(cgdMainPar.getCgdNo());
+        qgdInfoEntityDto.setOptType("作废采购单信息");
+        directiveOrderApi.addBizLog(qgdInfoEntityDto);
         return "1";
     }
 
@@ -894,6 +919,15 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
                 sxdMapper.insert(cgdSxd);
             }
         }
+
+
+        NuInvoicingCgdMain cgdMainPar = baseMapper.selectById(cgdSxdEntityDto.getCgdId());
+        DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
+        qgdInfoEntityDto.setBizTypeCode("CGD");// 业务类型编码（如：ql）
+        qgdInfoEntityDto.setBizType("采购单");// 业务类型名称（如：请领）
+        qgdInfoEntityDto.setBizNo(cgdMainPar.getCgdNo());//业务主表单号（如：Q10120260109001）
+        qgdInfoEntityDto.setOptType("添加随行单");//操作类型（如：提交）
+        directiveOrderApi.addBizLog(qgdInfoEntityDto);
         return "1";
     }
 
@@ -1207,6 +1241,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         result.put("cgdInfo",map);
         result.put("cgdTotalPrice",cgdMain.getTotalPrice());
 
+        DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
+        qgdInfoEntityDto.setBizTypeCode("CGD");// 业务类型编码（如：ql）
+        qgdInfoEntityDto.setBizType("采购单");// 业务类型名称（如：请领）
+        qgdInfoEntityDto.setBizNo(cgdMain.getCgdNo());//业务主表单号（如：Q10120260109001）
+        qgdInfoEntityDto.setOptType("拣货");//操作类型（如：提交）
+        directiveOrderApi.addBizLog(qgdInfoEntityDto);
+
         return result;
     }
 
@@ -1237,6 +1278,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
 
         map.put("totalPrice",totalPrice.toString());
 
+        NuInvoicingCgdMain cgdMainNo = cgdMainMapper.selectById(cgdInfo.getCgdId());
+        DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
+        qgdInfoEntityDto.setBizTypeCode("CGD");// 业务类型编码（如：ql）
+        qgdInfoEntityDto.setBizType("采购单");// 业务类型名称（如：请领）
+        qgdInfoEntityDto.setBizNo(cgdMainNo.getCgdNo());//业务主表单号（如：Q10120260109001）
+        qgdInfoEntityDto.setOptType("改价");//操作类型（如：提交）
+        directiveOrderApi.addBizLog(qgdInfoEntityDto);
+
         return map;
     }