From 4a494e1b166dba516e75513b30033da09894eb48 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 16:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs       |  5 --
 .../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs       | 79 +++++++++++++++++++
 .../BQ/Syncs/PendingDeductionService.cs       |  4 +-
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
index a90939a4..d4dd2911 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs
@@ -42,8 +42,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     public class BBAC_CAN_SA_DETAIL_DTO : EntityDto<Guid>
     {
 
-    
-
         [ExporterHeader(DisplayName = "关联结算单号")]         //全部业务都有显示                    
         public string SettleBillNum { get; set; }
         [ExporterHeader(DisplayName = "发票分组号")]           //全部业务都显示  （默认）
@@ -90,9 +88,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// 金额
         /// </summary>
         public decimal Amt { get; set; }
-   
-   
-
     }
     public class BBAC_CAN_SA_DETAIL_EXP_DTO
     {
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 b7238e28..47080d9c 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
@@ -237,6 +237,85 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
     }
 
+
+
+
+    public class INVOICE_WAIT_DETAIL_EXT_DTO
+    {
+
+        /// <summary>
+        ///期间
+        /// </summary>
+        [Display(Name = "期间")]
+        public int Version { get; set; }
+        [Display(Name = "金税发票号")]
+        public string RealInvbillNum { get; set; }
+
+
+        [Display(Name = "发票日期")]
+        public DateTime? InvDate { set; get; }
+
+
+        /// <summary>
+        ///发票号
+        /// </summary>
+        [Display(Name = "发票号")]
+        public string InvbillNum { get; set; }
+        /// <summary>
+        ///发票分组号
+        /// </summary>
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        ///零件号
+        /// </summary>
+        [Display(Name = "客户零件号")]
+        public string LU { get; set; }
+
+        /// <summary>
+        ///零件号
+        /// </summary>
+        [Display(Name = "零件号")]
+        public string PartCode { get; set; }
+
+        /// <summary>
+        ///单价
+        /// </summary>
+        [Display(Name = "单价")]
+        public decimal PRICE { get; set; }
+        /// <summary>
+        ///数量
+        /// </summary>
+        [Display(Name = "数量")]
+        public decimal Qty { get; set; }
+        /// <summary>
+        ///金额
+        /// </summary>
+        [Display(Name = "金额")]
+        public decimal Amt { get; set; }
+        /// <summary>
+        ///业务分类
+        /// </summary>
+        [Display(Name = "业务分类")]
+        public string BussiessType { get; set; }
+      
+
+        /// <summary>
+        ///扩展字段3
+        /// </summary>
+        [Display(Name = "价格开始日期")]
+        public DateTime BeginDate { get; set; }
+        /// <summary>
+        ///扩展字段4
+        /// </summary>
+        [Display(Name = "价格结束日期")]
+        public DateTime EndDate { get; set; }
+
+
+    }
+
+
+
     public class INVOICE_WAIT_DETAIL_DTO 
 
     {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
index ee51b03c..7baf4b15 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
@@ -102,7 +102,9 @@ public class PendingDeductionService : ApplicationService, ITransientDependency,
     public void Sync<T>(List<T> p_ls, EnumDeliverBjBmpBillType bussinessType, bool flag=true) where T : PD_BASE,new()
     {
 
-
+         "CC001"
+         "CC171"
+         "CC004"
 
         var query = from itm in p_ls
                     select  new VmiLog()