From 5ba449cc004173aa7044cad7caa6786c80e2201e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 27 Nov 2025 17:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=90=8E=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NuInvoicingCgdMainServiceImpl.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 d5e4e52..7883922 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
@@ -31,6 +31,7 @@ import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
 import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
 import com.nu.utils.DictUtils;
 import io.swagger.models.auth.In;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -58,6 +59,7 @@ import java.util.*;
  * @Version: V1.0
  */
 @Service
+@Slf4j
 public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMainMapper, NuInvoicingCgdMain> implements INuInvoicingCgdMainService, IInvoicingApi {
 
     @Autowired
@@ -449,6 +451,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             cgdMain.setCgdNo(cgdNo);
             cgdMain.setIzNew("Y");
             List<NuInvoicingCgdInfo> cgdInfoList = cgdMain.getCgdInfoList();
+            cgdMainMapper.insert(cgdMain);
             for (NuInvoicingCgdInfo cgdInfo : cgdInfoList){
                 cgdInfo.setCgdId(cgdMain.getId());
 
@@ -456,12 +459,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
                 queryWrapper.eq("wl_id",cgdInfo.getWlId());
                 queryWrapper.eq("suppliers_id",cgdInfo.getSuppliersId());
                 List<QgdInfo> qgdInfoList =qgdInfoMapper.selectList(queryWrapper);
-                if(qgdInfoList == null || qgdInfoList.size() > 1){
-                    throw new RuntimeException("购物车数据不是最新的，请重新查询后再进行请购");
+                log.info("------------qgdInfoList--------1-----"+qgdInfoList.size());
+                if(qgdInfoList == null || qgdInfoList.size() == 0){
+                    log.info("------------qgdInfoList----2---------");
+                    throw new IllegalArgumentException("购物车数据不是最新的，请重新查询后再进行请购");
                 }
                 cgdInfoMapper.insert(cgdInfo);
             }
-            cgdMainMapper.insert(cgdMain);
             String qgdId = cgdMain.getQgdId();
             for(String id : qgdId.split(",")){
                 qgdInfoMapper.deleteById(id);