更新DTO

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs

@@ -0,0 +1,221 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    public class BBAC_CAN_SA_DTO : EntityDto<Guid>
+    {
+        /// <summary>
+        ///期间
+        /// </summary>
+        [Display(Name = "期间")]
+        public int Version { get; set; }
+        /// <summary>
+        ///结算单据
+        /// </summary>
+        [Display(Name = "结算单据")]
+        public string BillNum { get; set; }
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///状态
+        /// </summary>
+        [Display(Name = "状态")]
+        public string State { get; set; }
+        /// <summary>
+        ///明细记录行数
+        /// </summary>
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+    }
+    public class BBAC_CAN_SA_DETAIL_DTO : EntityDto<Guid>
+    {
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        
+        public string Site { get; set; }       
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public int Version { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { get; set; }
+        /// <summary>
+        /// 结算单号（发票分组号）
+        /// </summary>
+        public string BillNum { get; set; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { get; set; }
+        /// <summary>
+        ///发票组号
+        /// </summary>
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生产号
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 结算数量
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
+        public string GroupNum { get; set; }
+
+    }
+    public class BBAC_CAN_SA_DETAIL_EXP_DTO
+    {
+
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        [ExporterHeader(DisplayName = "工厂地点")]
+        public string Site { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        [ExporterHeader(DisplayName = "业务类别")]
+        public string Category { get; set; }
+        /// <summary>
+        ///是否退货
+        /// </summary>
+        [ExporterHeader(DisplayName = "是否退货")]
+        public string IsReturn { get; set; }
+        [ExporterHeader(DisplayName = "是否退货")]
+        public int Version { get; set; }
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string BillNum { get; set; }
+        [ExporterHeader(DisplayName = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [ExporterHeader(DisplayName = "LU")]
+        public string LU { get; set; }
+
+        [ExporterHeader(DisplayName = "生产码")]
+        public string PN { get; set; }
+        public string KeyCode { get; set; }
+        [ExporterHeader(DisplayName = "结算数量")]
+        public decimal Qty { get; set; }
+        [ExporterHeader(DisplayName = "结算分组号")]
+        public string GroupNum { get; set; }
+        
+    }
+    //public class BBAC_CAN_SA_EXP_DTO
+
+    //    {
+
+    //        /// <summary>
+    //        ///期间
+    //        /// </summary>
+    //        [ExporterHeader(DisplayName = "期间")]
+    //        public int Version { get; set; }
+    //        /// <summary>
+    //        ///结算单据
+    //        /// </summary>
+    //        [ExporterHeader(DisplayName = "结算单据")]
+    //        public string BillNum { get; set; }
+    //        /// <summary>
+    //        ///关联结算单号
+    //        /// </summary>
+    //        [ExporterHeader(DisplayName = "关联结算单号")]
+    //        public string SettleBillNum { get; set; }
+    //        /// <summary>
+    //        ///状态
+    //        /// </summary>
+    //        [ExporterHeader(DisplayName = "状态")]
+    //        public string State { get; set; }
+    //        /// <summary>
+    //        ///明细记录行数
+    //        /// </summary>
+    //        [ExporterHeader(DisplayName = "明细记录行数")]
+    //        public string InvGroupNum { get; set; }
+    //        public bool IsDeleted { get; set; }
+    //        public DateTime? DeletionTime { get; set; }
+    //        public DateTime? LastModificationTime { get; set; }
+    //        public DateTime CreationTime { get; set; }
+    //        public string ConcurrencyStamp { get; set; }
+    //    }
+    public class BBAC_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
+        {
+            [Display(Name = "期间")]
+            public int Version { get; set; }
+            [Display(Name = "结算单据")]
+            public string BillNum { get; set; }
+            [Display(Name = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            [Display(Name = "状态")]
+            public string State { get; set; }
+        }
+
+    public class BBAC_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    {
+
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        
+        //[Display(Name = "业务类别")]
+        //public string Category { get; set; }
+        //[Display(Name = "是否退货")]
+        //public string IsReturn { get; set; }
+        [Display(Name = "版本号")]
+        public int Version { get; set; }
+        //[Display(Name = "单价")]
+        //public decimal Price { get; set; }
+        [Display(Name = "发票分组号")]
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BillNum { get; set; }
+        [Display(Name = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [Display(Name = "LU")]
+        public string LU { get; set; }
+        [Display(Name = "生产码")]
+        public string PN { get; set; }
+        //[Display(Name = "键值")]
+        //public string KeyCode { get; set; }
+        [Display(Name = "结算数量")]
+        public decimal Qty { get; set; }
+
+        [Display(Name = "结算分组号")]
+        public string GroupNum { get; set; }
+        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+    }
+
+
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs

@@ -0,0 +1,147 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    
+    public class BBAC_NOT_SA_DETAIL_DTO : EntityDto<Guid>
+    {
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        
+        public string Site { get; set; }       
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public int Version { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { get; set; }
+        /// <summary>
+        /// 结算单号（发票分组号）
+        /// </summary>
+        public string BillNum { get; set; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { get; set; }
+        /// <summary>
+        ///发票组号
+        /// </summary>
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生产号
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 结算数量
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
+        public string GroupNum { get; set; }
+
+    }
+    public class BBAC_NOT_SA_DETAIL_EXP_DTO
+    {
+
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        [ExporterHeader(DisplayName = "工厂地点")]
+        public string Site { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        [ExporterHeader(DisplayName = "业务类别")]
+        public string Category { get; set; }
+        /// <summary>
+        ///是否退货
+        /// </summary>
+        [ExporterHeader(DisplayName = "是否退货")]
+        public string IsReturn { get; set; }
+        [ExporterHeader(DisplayName = "是否退货")]
+        public int Version { get; set; }
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string BillNum { get; set; }
+        [ExporterHeader(DisplayName = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [ExporterHeader(DisplayName = "LU")]
+        public string LU { get; set; }
+
+        [ExporterHeader(DisplayName = "生产码")]
+        public string PN { get; set; }
+        public string KeyCode { get; set; }
+        [ExporterHeader(DisplayName = "结算数量")]
+        public decimal Qty { get; set; }
+        [ExporterHeader(DisplayName = "结算分组号")]
+        public string GroupNum { get; set; }
+        
+    }
+    public class BBAC_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    {
+
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        
+        //[Display(Name = "业务类别")]
+        //public string Category { get; set; }
+        //[Display(Name = "是否退货")]
+        //public string IsReturn { get; set; }
+        [Display(Name = "版本号")]
+        public int Version { get; set; }
+        //[Display(Name = "单价")]
+        //public decimal Price { get; set; }
+        [Display(Name = "发票分组号")]
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BillNum { get; set; }
+        [Display(Name = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [Display(Name = "LU")]
+        public string LU { get; set; }
+        [Display(Name = "生产码")]
+        public string PN { get; set; }
+        //[Display(Name = "键值")]
+        //public string KeyCode { get; set; }
+        [Display(Name = "结算数量")]
+        public decimal Qty { get; set; }
+
+        [Display(Name = "结算分组号")]
+        public string GroupNum { get; set; }
+        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+    }
+
+
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs

@@ -0,0 +1,219 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    public class HBPO_CAN_SA_DTO : EntityDto<Guid>
+    {
+        /// <summary>
+        ///期间
+        /// </summary>
+        [Display(Name = "期间")]
+        public int Version { get; set; }
+        /// <summary>
+        ///结算单据
+        /// </summary>
+        [Display(Name = "结算单据")]
+        public string BillNum { get; set; }
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///状态
+        /// </summary>
+        [Display(Name = "状态")]
+        public string State { get; set; }
+        /// <summary>
+        ///明细记录行数
+        /// </summary>
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+    }
+    public class HBPO_CAN_SA_DETAIL_DTO : EntityDto<Guid>
+    {
+       
+
+
+
+
+
+
+
+
+
+
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        
+        public string Site { get; set; }       
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public int Version { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { get; set; }
+        /// <summary>
+        /// 结算单号（发票分组号）
+        /// </summary>
+        public string BillNum { get; set; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { get; set; }
+        /// <summary>
+        ///发票组号
+        /// </summary>
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生产号
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 结算数量
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
+        public string GroupNum { get; set; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    }
+    public class HBPO_CAN_SA_DETAIL_EXP_DTO
+    {
+
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        [ExporterHeader(DisplayName = "工厂地点")]
+        public string Site { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        //[ExporterHeader(DisplayName = "业务类别")]
+        //public string Category { get; set; }
+        /// <summary>
+        ///是否退货
+        /// </summary>
+        //[ExporterHeader(DisplayName = "是否退货")]
+        //public string IsReturn { get; set; }
+        [ExporterHeader(DisplayName = "是否退货")]
+        public int Version { get; set; }
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string BillNum { get; set; }
+        [ExporterHeader(DisplayName = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [ExporterHeader(DisplayName = "LU")]
+        public string LU { get; set; }
+
+        [ExporterHeader(DisplayName = "生产码")]
+        public string PN { get; set; }
+        public string KeyCode { get; set; }
+        [ExporterHeader(DisplayName = "结算数量")]
+        public decimal Qty { get; set; }
+        [ExporterHeader(DisplayName = "结算分组号")]
+        public string GroupNum { get; set; }
+        
+    }
+    
+    public class HBPO_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
+        {
+            [Display(Name = "期间")]
+            public int Version { get; set; }
+            [Display(Name = "结算单据")]
+            public string BillNum { get; set; }
+            [Display(Name = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            [Display(Name = "状态")]
+            public string State { get; set; }
+        }
+
+    public class HBPO_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    {
+
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        
+        //[Display(Name = "业务类别")]
+        //public string Category { get; set; }
+        //[Display(Name = "是否退货")]
+        //public string IsReturn { get; set; }
+        [Display(Name = "版本号")]
+        public int Version { get; set; }
+        //[Display(Name = "单价")]
+        //public decimal Price { get; set; }
+        [Display(Name = "发票分组号")]
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BillNum { get; set; }
+        [Display(Name = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [Display(Name = "LU")]
+        public string LU { get; set; }
+        [Display(Name = "生产码")]
+        public string PN { get; set; }
+        //[Display(Name = "键值")]
+        //public string KeyCode { get; set; }
+        [Display(Name = "结算数量")]
+        public decimal Qty { get; set; }
+
+        [Display(Name = "结算分组号")]
+        public string GroupNum { get; set; }
+        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+    }
+
+
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs

@@ -0,0 +1,147 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    
+    public class HBPO_NOT_SA_DETAIL_DTO : EntityDto<Guid>
+    {
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        
+        public string Site { get; set; }       
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public int Version { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { get; set; }
+        /// <summary>
+        /// 结算单号（发票分组号）
+        /// </summary>
+        public string BillNum { get; set; }
+        /// <summary>
+        /// 结算日期
+        /// </summary>
+        public DateTime SettleDate { get; set; }
+        /// <summary>
+        ///发票组号
+        /// </summary>
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string LU { get; set; }
+        /// <summary>
+        /// 生产号
+        /// </summary>
+        public string PN { get; set; }
+        /// <summary>
+        /// 结算数量
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 结算分组号
+        /// </summary>
+        public string GroupNum { get; set; }
+
+    }
+    public class HBPO_NOT_SA_DETAIL_EXP_DTO
+    {
+
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        [ExporterHeader(DisplayName = "工厂地点")]
+        public string Site { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        //[ExporterHeader(DisplayName = "业务类别")]
+        //public string Category { get; set; }
+        /// <summary>
+        ///是否退货
+        /// </summary>
+        //[ExporterHeader(DisplayName = "是否退货")]
+        //public string IsReturn { get; set; }
+        [ExporterHeader(DisplayName = "期间")]
+        public int Version { get; set; }
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string BillNum { get; set; }
+        [ExporterHeader(DisplayName = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [ExporterHeader(DisplayName = "LU")]
+        public string LU { get; set; }
+
+        [ExporterHeader(DisplayName = "生产码")]
+        public string PN { get; set; }
+        public string KeyCode { get; set; }
+        [ExporterHeader(DisplayName = "结算数量")]
+        public decimal Qty { get; set; }
+        [ExporterHeader(DisplayName = "结算分组号")]
+        public string GroupNum { get; set; }
+        
+    }
+    public class HBPO_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    {
+
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        
+        //[Display(Name = "业务类别")]
+        //public string Category { get; set; }
+        //[Display(Name = "是否退货")]
+        //public string IsReturn { get; set; }
+        [Display(Name = "版本号")]
+        public int Version { get; set; }
+        //[Display(Name = "单价")]
+        //public decimal Price { get; set; }
+        [Display(Name = "发票分组号")]
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BillNum { get; set; }
+        [Display(Name = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [Display(Name = "LU")]
+        public string LU { get; set; }
+        [Display(Name = "生产码")]
+        public string PN { get; set; }
+        //[Display(Name = "键值")]
+        //public string KeyCode { get; set; }
+        [Display(Name = "结算数量")]
+        public decimal Qty { get; set; }
+
+        [Display(Name = "结算分组号")]
+        public string GroupNum { get; set; }
+        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+    }
+
+
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs

@@ -0,0 +1,253 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+
+
+
+    public class INVOICE_GRP_DTO : EntityDto<Guid>
+
+    {
+        [Display(Name = "期间")]
+        public int Version { set; get; }
+
+        /// <summary>
+        ///实际纸质发票号
+        /// </summary>
+        [Display(Name = "实际纸质发票号")]
+        public string RealnvBillNum { get; set; }
+        /// <summary>
+        ///系统生成发票号
+        /// </summary>
+        [Display(Name = "系统生成发票号")]
+        public string InvbillNum { get; set; }
+        /// <summary>
+        ///未税金额
+        /// </summary>
+        [Display(Name = "未税金额")]
+        public decimal Amt { get; set; }
+        /// <summary>
+        ///税后金额
+        /// </summary>
+        [Display(Name = "税后金额")]
+        public decimal TaxAmt { get; set; }
+        /// <summary>
+        ///发票分组号
+        /// </summary>
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        ///开票Excel文件
+        /// </summary>
+        [Display(Name = "开票Excel文件")]
+        public string FileName { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        [Display(Name = "业务类别")]
+        public string BusinessType { get; set; }
+
+    }
+
+
+
+    public class INVOICE_GRP_EXPORT_DTO
+
+    {
+
+        /// <summary>
+        ///实际纸质发票号
+        /// </summary>
+        [ExporterHeader(DisplayName = "实际纸质发票号")]
+        public string RealnvBillNum { get; set; }
+        /// <summary>
+        ///系统生成发票号
+        /// </summary>
+        [ExporterHeader(DisplayName = "系统生成发票号")]
+        public string InvbillNum { get; set; }
+        /// <summary>
+        ///未税金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "未税金额")]
+        public decimal Amt { get; set; }
+        /// <summary>
+        ///税后金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "税后金额")]
+        public decimal TaxAmt { get; set; }
+        /// <summary>
+        ///发票分组号
+        /// </summary>
+        [ExporterHeader(DisplayName = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        /// <summary>
+        ///开票Excel文件
+        /// </summary>
+        [ExporterHeader(DisplayName = "开票Excel文件")]
+        public string FileName { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        [ExporterHeader(DisplayName = "业务类别")]
+        public string BusinessType { get; set; }
+
+    }
+
+    public class INVOICE_GRP_IMP_DTO
+    {
+
+        /// <summary>
+        ///实际纸质发票号
+        /// </summary>
+        [ImporterHeader(Name = "实际纸质发票号")]
+        public string RealnvBillNum { get; set; }
+        /// <summary>
+        ///系统生成发票号
+        /// </summary>
+        [ImporterHeader(Name = "系统生成发票号")]
+        public string InvbillNum { get; set; }
+        
+        
+    }
+
+
+
+
+
+
+
+
+
+
+    public class INVOICE_GRP_REQ_DTO : PagedAndSortedResultRequestDto
+
+    {
+
+        [Display(Name = "实际纸质发票号")]
+        public string RealnvBillNum { get; set; }
+        [Display(Name = "系统生成发票号")]
+        public decimal TaxAmt { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        
+
+        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+    }
+
+
+
+
+    namespace SettleAccount.Domain.BQ
+    {
+        public class INVOICE_WAIT_DETAIL_DTO : EntityDto<Guid>
+
+        {
+
+            /// <summary>
+            ///期间
+            /// </summary>
+            [Display(Name = "期间")]
+            public int Version { get; set; }
+            /// <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 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>
+            ///扩展字段1
+            /// </summary>
+            [Display(Name = "扩展字段1")]
+            public string Extend1 { get; set; }
+            /// <summary>
+            ///扩展字段2
+            /// </summary>
+            [Display(Name = "扩展字段2")]
+            public string Extend2 { get; set; }
+            /// <summary>
+            ///扩展字段3
+            /// </summary>
+            [Display(Name = "扩展字段3")]
+            public string Extend3 { get; set; }
+            /// <summary>
+            ///扩展字段4
+            /// </summary>
+            [Display(Name = "扩展字段4")]
+            public string Extend4 { get; set; }
+         
+        }
+        public class INVOICE_WAIT_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+        {  
+            [Display(Name = "发票号")]
+            public string InvbillNum { get; set; }
+            [Display(Name = "发票分组号")]
+            public string InvGroupNum { get; set; }
+            [Display(Name = "零件号")]
+            public string LU { get; set; }
+            public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+        }
+
+
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+
+

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs

@@ -0,0 +1,202 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    namespace SettleAccount.Domain.BQ
+    {
+        public class PUB_CAN_SA_DTO : EntityDto<Guid>
+        {
+            /// <summary>
+            ///期间
+            /// </summary>
+            [Display(Name = "期间")]
+            public int Version { get; set; }
+            /// <summary>
+            ///关联结算单号
+            /// </summary>
+            [Display(Name = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            /// <summary>
+            ///结算单据
+            /// </summary>
+            [Display(Name = "结算单据")]
+            public string BillNum { get; set; }
+            /// <summary>
+            ///状态
+            /// </summary>
+            [Display(Name = "状态")]
+            public int State { get; set; }
+            /// <summary>
+            ///业务分类
+            /// </summary>
+            [Display(Name = "业务分类")]
+            public string BusinessType { get; set; }
+            /// <summary>
+            ///明细记录行数
+            /// </summary>
+            [Display(Name = "明细记录行数")]
+            public string InvGroupNum { get; set; }
+           
+        }
+        public class PUB_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
+
+        {
+
+            [Display(Name = "期间")]
+            public int Version { get; set; }
+            [Display(Name = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            [Display(Name = "发票分组号")]
+            public string BillNum { get; set; }
+            [Display(Name = "状态")]
+            public int State { get; set; }
+            [Display(Name = "业务分类")]
+            public string BusinessType { get; set; }
+            [Display(Name = "发票分组号")]
+            public string InvGroupNum { get; set; }
+           
+            public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+        }
+        public class PUB_CAN_SA_DETAIL_DTO : EntityDto<Guid>
+        {
+
+            /// <summary>
+            ///关联结算单号
+            /// </summary>
+            [Display(Name = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            /// <summary>
+            ///工厂地点
+            /// </summary>
+            [Display(Name = "工厂地点")]
+            public string Site { get; set; }
+            /// <summary>
+            ///业务类别
+            /// </summary>
+            [Display(Name = "业务类别")]
+            public string BusinessType { get; set; }
+            [Display(Name ="期间")]
+            public int Version { get; set; }
+            [Display(Name = "价格")]
+            public decimal Price { get; set; }
+            [Display(Name = "发票分组号")]
+            public string BillNum { get; set; }
+            [Display(Name = "下线日期")]
+            public DateTime SettleDate { get; set; }
+            [Display(Name = "发票分组号")]
+            public string InvGroupNum { get; set; }
+            [Display(Name = "发票分组号")]
+            public string LU { get; set; }
+            [Display(Name = "发货单号、交付识别号")]
+            public string PN { get; set; }
+            [Display(Name = "键值")]
+            public string KeyCode { get; set; }
+            [Display(Name = "结算数量")]
+            public decimal Qty { get; set; }
+            [Display(Name = "结算分组号")]
+            public string GroupNum { get; set; }
+           
+        }
+
+
+
+        public class PUB_CAN_SA_DETAIL_EXP_DTO
+        {
+
+            [ExporterHeader(DisplayName = "期间")]
+            public int Version { get; set; }
+            /// <summary>
+            ///关联结算单号
+            /// </summary>
+            [ExporterHeader(DisplayName = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            /// <summary>
+            ///工厂地点
+            /// </summary>
+            [ExporterHeader(DisplayName = "工厂地点")]
+            public string Site { get; set; }
+            /// <summary>
+            ///业务类别
+            /// </summary>
+            [ExporterHeader(DisplayName = "业务类别")]
+            public string BusinessType { get; set; }
+           
+            [ExporterHeader(DisplayName = "单价")]
+            public decimal Price { get; set; }
+            [ExporterHeader(DisplayName = "发票分组号")]
+            public string BillNum { get; set; }
+            [ExporterHeader(DisplayName = "下线日期")]
+            public DateTime SettleDate { get; set; }
+            [ExporterHeader(DisplayName = "发票分组号")]
+            public string InvGroupNum { get; set; }
+            [ExporterHeader(DisplayName = "LU")]
+            public string LU { get; set; }
+            [ExporterHeader(DisplayName = "发货单号、交付单号")]
+            public string PN { get; set; }
+
+            [ExporterHeader(DisplayName = "结算数量")]
+            public decimal Qty { get; set; }
+
+            [ExporterHeader(DisplayName = "结算分组号")]
+            public string GroupNum { get; set; }
+         
+        }
+
+
+
+      
+
+
+
+        public class PUB_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+
+        {
+
+            /// <summary>
+            ///关联结算单号
+            /// </summary>
+            [Display(Name = "关联结算单号")]
+            public string SettleBillNum { get; set; }
+            /// <summary>
+            ///工厂地点
+            /// </summary>
+            [Display(Name = "工厂地点")]
+            public string Site { get; set; }
+            /// <summary>
+            ///业务类别
+            /// </summary>
+            [Display(Name = "业务类别")]
+            public string BusinessType { get; set; }
+           
+            [Display(Name = "发票分组号")]
+            public string BillNum { get; set; }
+            [Display(Name = "下线日期")]
+            public DateTime SettleDate { get; set; }
+            [Display(Name = "发票分组号")]
+            public string InvGroupNum { get; set; }
+            [Display(Name = "LU")]
+            public string LU { get; set; }
+            [Display(Name = "发货单号、交付单号")]
+            public string PN { get; set; }
+
+            public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+
+        }
+
+
+
+    }
+
+}
+
+
+
+

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs

@@ -0,0 +1,169 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.Shared.Filter;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+{
+    public class PUB_NOT_SA_DETAIL_DTO : EntityDto<Guid>
+    {
+
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        [Display(Name = "工厂地点")]
+        public string Site { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        [Display(Name = "业务类别")]
+        public string BusinessType { get; set; }
+        [Display(Name = "期间")]
+        public int Version { get; set; }
+        [Display(Name = "价格")]
+        public decimal Price { get; set; }
+        [Display(Name = "发票分组号")]
+        public string BillNum { get; set; }
+        [Display(Name = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [Display(Name = "发票分组号")]
+        public string LU { get; set; }
+        [Display(Name = "发货单号、交付识别号")]
+        public string PN { get; set; }
+        [Display(Name = "键值")]
+        public string KeyCode { get; set; }
+        [Display(Name = "结算数量")]
+        public decimal Qty { get; set; }
+        [Display(Name = "结算分组号")]
+        public string GroupNum { get; set; }
+
+        /// <summary>
+        ///扩展1
+        /// </summary>
+        [Display(Name = "扩展1")]
+        public string Extend1 { get; set; }
+        /// <summary>
+        ///扩展2
+        /// </summary>
+        [Display(Name = "扩展2")]
+        public string Extend2 { get; set; }
+        /// <summary>
+        ///扩展3
+        /// </summary>
+        [Display(Name = "扩展3")]
+        public string Extend3 { get; set; }
+        /// <summary>
+        ///业务分类
+        /// </summary>
+       
+       
+    }
+
+
+
+    public class PUB_NOT_SA_DETAIL_EXP_DTO
+
+    {
+        /// <summary>
+        ///关联结算单号
+        /// </summary>
+        [Display(Name = "关联结算单号")]
+        public string SettleBillNum { get; set; }
+        /// <summary>
+        ///工厂地点
+        /// </summary>
+        [Display(Name = "工厂地点")]
+        public string Site { get; set; }
+        /// <summary>
+        ///业务类别
+        /// </summary>
+        [Display(Name = "业务类别")]
+        public string BusinessType { get; set; }
+        [Display(Name = "期间")]
+        public int Version { get; set; }
+        [Display(Name = "价格")]
+        public decimal Price { get; set; }
+        [Display(Name = "发票分组号")]
+        public string BillNum { get; set; }
+        [Display(Name = "下线日期")]
+        public DateTime SettleDate { get; set; }
+        [Display(Name = "发票分组号")]
+        public string InvGroupNum { get; set; }
+        [Display(Name = "发票分组号")]
+        public string LU { get; set; }
+        [Display(Name = "发货单号、交付识别号")]
+        public string PN { get; set; }
+        [Display(Name = "键值")]
+        public string KeyCode { get; set; }
+        [Display(Name = "结算数量")]
+        public decimal Qty { get; set; }
+        [Display(Name = "结算分组号")]
+        public string GroupNum { get; set; }
+        /// <summary>
+        ///扩展1
+        /// </summary>
+        [ExporterHeader(DisplayName = "扩展1")]
+        public string Extend1 { get; set; }
+        /// <summary>
+        ///扩展2
+        /// </summary>
+        [ExporterHeader(DisplayName = "扩展2")]
+        public string Extend2 { get; set; }
+        /// <summary>
+        ///扩展3
+        /// </summary>
+        [ExporterHeader(DisplayName = "扩展3")]
+        public string Extend3 { get; set; }
+       
+       
+    }
+
+
+
+    
+
+
+
+    public class PUB_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+
+    {
+
+        [Display(Name = "工厂地点")]
+        public string Site { get; set; }
+       
+        [Display(Name = "业务分类")]
+        public string BusinessType { get; set; }
+       
+        public int Version { get; set; }
+        public string SettleBillNum { get; set; }
+    
+        public string InvGroupNum { get; set; }
+        public string LU { get; set; }
+        public string PN { get; set; }
+     
+        public string GroupNum { get; set; }
+       
+        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+    }
+
+}
+
+
+
+
+
+
+
+

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_BA_SERVICE.cs

@@ -3,10 +3,20 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Boms;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IBBAC_BA_SERVICE
     {
+
+       
+
+
+     
+
+
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_CAN_SA_SERVICE.cs

@@ -3,10 +3,20 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
-    public interface IBBAC_CAN_SA_SERVICE
+    public interface IBBAC_CAN_SA_SERVICE:ITransientDependency
     {
+        Task<bool> GenerateInvoice(BBAC_CAN_SA_REQ_DTO input);
+        Task<PagedResultDto<BBAC_CAN_SA_DTO>> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input);
+        Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input);
+
+
+
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_NOT_SA_SERVICE.cs

@@ -3,10 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IBBAC_NOT_SA_SERVICE
     {
+        Task<bool> GenerateSettlementOrder(BBAC_CAN_SA_DETAIL_REQ_DTO input);
+        Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input);
+
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IBBAC_PD_SERVICE.cs

@@ -3,10 +3,27 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IBBAC_PD_SERVICE
     {
+
+
+        //Task<bool> GenerateInvoice(BBAC_CAN_SA_REQ_DTO input);
+        //Task<PagedResultDto<BBAC_CAN_SA_DTO>> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input);
+        //Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input);
+
+        //Task<bool> RejectAsync(BBAC_CAN_SA_REQ_DTO input);
+
+        //Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input);
+
+
+     
+
+
+
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_CAN_SA_SERVICE.cs

@@ -3,10 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IHBPO_CAN_SA_SERVICE
     {
+        Task<bool> GenerateInvoice(HBPO_CAN_SA_REQ_DTO input);
+        Task<PagedResultDto<HBPO_CAN_SA_DTO>> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input);
+        Task<PagedResultDto<HBPO_CAN_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(HBPO_CAN_SA_REQ_DTO input);
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/IHBPO_NOT_SA_SERVICE.cs

@@ -3,10 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     public interface IHBPO_NOT_SA_SERVICE
     {
+        Task<bool> GenerateSettlementOrder(BBAC_CAN_SA_DETAIL_REQ_DTO input);
+        Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input);
+        Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input);
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />