发货单号

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>

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()
 
         {

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,