From 3a19961d1f7776cf0a5d4ec695478d41d4e1feba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Fri, 1 Sep 2023 17:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs             |  6 +++++-
 .../SettleAccountApplicationAutoMapperProfile.cs    | 13 +++++++++++++
 .../Entities/BQ/Managers/INV_MNG.cs                 |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
index 47080d9c..714f2f8f 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
@@ -255,7 +255,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         [Display(Name = "发票日期")]
         public DateTime? InvDate { set; get; }
 
-
+        /// <summary>
+        ///扩展字段1
+        /// </summary>
+        [Display(Name = "SA号")]
+        public string Extend1 { get; set; }
         /// <summary>
         ///发票号
         /// </summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index 7b658514..4a6aaea5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -197,6 +197,7 @@ namespace Win.Sfs.SettleAccount
 
             CreateMapPUB_PD();
             CreateMapPUB_PD_DETAIL();
+            CreateMapINVOICE_WAIT_DETAIL_EXTEND();
 
 
 
@@ -283,6 +284,18 @@ namespace Win.Sfs.SettleAccount
             CreateMap<INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL_REQ_DTO>().ReverseMap();
 
         }
+
+        private void CreateMapINVOICE_WAIT_DETAIL_EXTEND()
+
+        {
+            CreateMap<INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL_EXT_DTO>().ReverseMap();
+         
+
+        }
+
+
+
+
         private void CreateMapPUB_CAN_SA()
 
         {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
index edd4ae39..70e4ae20 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
@@ -2167,7 +2167,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
 
                     var query = from inv1 in invdetails
                                 join dto1 in dtos on
-                              new { inv1.LU,inv1.PartCode, inv1.PN } equals new { dto1.LU,dto1.PartCode, dto1.PN }
+                              new { inv1.LU,inv1.PartCode, inv1.PN,inv1.Id } equals new { dto1.LU,dto1.PartCode, dto1.PN ,dto1.Id}
                                 select new
                                 {
                                     PartCode = inv1.PartCode,