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 b14adec0..6b74291e 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
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -167,7 +168,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     //        public DateTime CreationTime { get; set; }
     //        public string ConcurrencyStamp { get; set; }
     //    }
-    public class BBAC_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
+    public class BBAC_CAN_SA_REQ_DTO : RequestInputBase
     {
         [Display(Name = "期间")]
         public int Version { get; set; }
@@ -179,7 +180,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string State { get; set; }
     }
 
-    public class BBAC_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    public class BBAC_CAN_SA_DETAIL_REQ_DTO : RequestInputBase
     {
 
         [Display(Name = "关联结算单号")]
@@ -213,7 +214,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         [Display(Name = "结算分组号")]
         public string GroupNum { get; set; }
-        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+     
     }
 
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs
index eacf57a5..825c4afc 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -108,7 +109,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string GroupNum { get; set; }
         
     }
-    public class BBAC_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    public class BBAC_NOT_SA_DETAIL_REQ_DTO : RequestInputBase
     {
 
         [Display(Name = "关联结算单号")]
@@ -142,7 +143,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         [Display(Name = "结算分组号")]
         public string GroupNum { get; set; }
-        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+      
     }
 
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs
index 53ec4d34..c5586aba 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_CAN_SA_DTO.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -133,8 +134,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         
     }
     
-    public class HBPO_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
-        {
+    public class HBPO_CAN_SA_REQ_DTO : RequestInputBase
+    {
             [Display(Name = "期间")]
             public int Version { get; set; }
             [Display(Name = "结算单据")]
@@ -145,7 +146,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             public string State { get; set; }
         }
 
-    public class HBPO_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    public class HBPO_CAN_SA_DETAIL_REQ_DTO : RequestInputBase
     {
 
         [Display(Name = "关联结算单号")]
@@ -179,7 +180,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         [Display(Name = "结算分组号")]
         public string GroupNum { get; set; }
-        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+ 
     }
 
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs
index a9e699a0..3c85479d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -105,7 +106,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string GroupNum { get; set; }
         
     }
-    public class HBPO_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    public class HBPO_NOT_SA_DETAIL_REQ_DTO : RequestInputBase
     {
 
         [Display(Name = "关联结算单号")]
@@ -139,7 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
         [Display(Name = "结算分组号")]
         public string GroupNum { get; set; }
-        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+     
     }
 
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs
index 520a20e2..5f675910 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_CAN_SA_DTO.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -45,7 +46,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             public string InvGroupNum { get; set; }
            
         }
-        public class PUB_CAN_SA_REQ_DTO : PagedAndSortedResultRequestDto
+        public class PUB_CAN_SA_REQ_DTO : RequestInputBase
         {
 
             [Display(Name = "期间")]
@@ -61,7 +62,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             [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>
         {
@@ -154,9 +155,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
 
 
-        public class PUB_CAN_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+        public class PUB_CAN_SA_DETAIL_REQ_DTO : RequestInputBase
 
-        {
+    {
 
             /// <summary>
             ///关联结算单号
@@ -188,7 +189,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
             [Display(Name = "发货单号、交付单号")]
             public string PN { get; set; }
 
-            public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+         
 
         }
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs
index 5a6fd758..29988b1e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.Shared.Filter;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
@@ -136,7 +137,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
 
 
 
-    public class PUB_NOT_SA_DETAIL_REQ_DTO : PagedAndSortedResultRequestDto
+    public class PUB_NOT_SA_DETAIL_REQ_DTO : RequestInputBase
 
     {
 
@@ -155,7 +156,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
      
         public string GroupNum { get; set; }
        
-        public virtual List<FilterCondition> Filters { get; set; } = new List<FilterCondition>();
+       
     }
 
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs
index 206cd4a6..78db7e18 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs
@@ -24,7 +24,7 @@ using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Bases
 {
-    public class CAN_SA_SERVICE<TEntity, TEntityDto, TEntityDetail, TEntityDetailDto, TRequestMainInput, TRequestDetailInput, TEntityDetailExportDto> :ApplicationService
+    public abstract class CAN_SA_SERVICE<TEntity, TEntityDto, TEntityDetail, TEntityDetailDto, TRequestMainInput, TRequestDetailInput, TEntityDetailExportDto> :ApplicationService
         where TEntity : class, IEntity<Guid>
         where TEntityDetail:SA_CAN_BASE
         where TEntityDto : class, IEntityDto<Guid>, new()
@@ -100,7 +100,7 @@ namespace Win.Sfs.SettleAccount.Bases
         }
         [HttpPost]
         //[Route("generateinvoice")]
-        public Task<bool> GenerateInvoice(TRequestMainInput input)
+        public virtual async Task<bool> GenerateInvoice(TRequestMainInput input)
         {
             throw new NotImplementedException();
         }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs
index f1b76d6c..1a639963 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs
@@ -21,9 +21,9 @@ using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Bases
 {
-    internal class NOT_SA_SERVICE<TEntityDetail, TEntityDetailDto, TRequestDetailInput, TEntityDetailExportDto> : ApplicationService
+    public abstract class NOT_SA_SERVICE<TEntityDetail, TEntityDetailDto, TRequestDetailInput, TEntityDetailExportDto> : ApplicationService
 
-        where TEntityDetail : SA_CAN_BASE
+        where TEntityDetail : SA_NOT_BASE
 
         where TEntityDetailDto : class, IEntityDto<Guid>, new()
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
index c40095d8..8f289cd4 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
@@ -2,6 +2,7 @@
 
 using Microsoft.AspNetCore.Mvc;
 using NPOI.SS.Formula.Functions;
+using SettleAccount.Domain.BQ;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +10,10 @@ using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
@@ -17,23 +21,25 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
-    public class BBAC_CAN_SA_SERVICE : ApplicationService, IBBAC_CAN_SA_SERVICE
+    public class BBAC_CAN_SA_SERVICE : CAN_SA_SERVICE
+        <
+        BBAC_CAN_SA,
+        BBAC_CAN_SA_DTO,
+        BBAC_CAN_SA_DETAIL,
+        BBAC_CAN_SA_DETAIL_DTO,
+        BBAC_CAN_SA_REQ_DTO,
+        BBAC_CAN_SA_DETAIL_REQ_DTO,
+        BBAC_CAN_SA_DETAIL_EXP_DTO
+        >
     {
-        [HttpPost]
-        //[Route("detailquery")]
-        public Task<PagedResultDto<BBAC_CAN_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_CAN_SA_DETAIL_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        [Route("export")]
-        public Task<string> ExportAsync(BBAC_CAN_SA_REQ_DTO input)
+        protected BBAC_CAN_SA_SERVICE(INormalEfCoreRepository<BBAC_CAN_SA, Guid> repository, IExcelImportAppService excelImportService, INormalEfCoreRepository<BBAC_CAN_SA_DETAIL, Guid> detailRepository) : base(repository, excelImportService, detailRepository)
         {
-            throw new NotImplementedException();
         }
+
+
         [HttpPost]
         //[Route("generateinvoice")]
-        public Task<bool> GenerateInvoice(BBAC_CAN_SA_REQ_DTO input)
+        public async override Task<bool> GenerateInvoice(BBAC_CAN_SA_REQ_DTO input)
         {
             List<BBAC_CAN_SA_DETAIL_DTO> _ls = new List<BBAC_CAN_SA_DETAIL_DTO>();
             var _query= _ls.GroupBy(p => new { p.GroupNum }).Select(p =>new  {GroupNum=p.Key.GroupNum, Qty=p.Sum(itm=>itm.Price)});
@@ -85,11 +91,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             // return true;
 
         }
-        [HttpPost]
-        //[Route("mainquery")]
-        public Task<PagedResultDto<BBAC_CAN_SA_DTO>> MainQueryAsync(BBAC_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
+       
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs
index ffdb6fb8..fd424f27 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 
 using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,31 +9,23 @@ using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
-    public class BBAC_NOT_SA_SERVICE : ApplicationService, IBBAC_NOT_SA_SERVICE
+    public class BBAC_NOT_SA_SERVICE : NOT_SA_SERVICE
+        <BBAC_NOT_SA_DETAIL,
+        BBAC_NOT_SA_DETAIL_DTO,
+        BBAC_NOT_SA_DETAIL_REQ_DTO,
+        BBAC_NOT_SA_DETAIL_EXP_DTO>
     {
-        [HttpPost]
-        //[Route("detailquery")]
-        public Task<PagedResultDto<BBAC_NOT_SA_DETAIL_DTO>> DetailQueryAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input)
+        public BBAC_NOT_SA_SERVICE(IExcelImportAppService excelImportService, INormalEfCoreRepository<BBAC_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
         {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("export")]
-        public Task<string> ExportAsync(BBAC_NOT_SA_DETAIL_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("generatesettlementorder")]
-        public Task<bool> GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input)
-        {
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
index 75a3932b..f587f5b7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 
 using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,37 +9,28 @@ using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
-    public class HBPO_CAN_SA_SERVICE : ApplicationService, IHBPO_CAN_SA_SERVICE
+    public class HBPO_CAN_SA_SERVICE : CAN_SA_SERVICE
+        <
+        HBPO_CAN_SA,
+        HBPO_CAN_SA_DTO,
+        HBPO_CAN_SA_DETAIL,
+        HBPO_CAN_SA_DETAIL_DTO,
+        HBPO_CAN_SA_REQ_DTO,
+        HBPO_CAN_SA_DETAIL_REQ_DTO,
+        HBPO_CAN_SA_DETAIL_EXP_DTO
+        >
     {
-        [HttpPost]
-        //[Route("detailquery")]
-        public Task<PagedResultDto<HBPO_CAN_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input)
+        protected HBPO_CAN_SA_SERVICE(INormalEfCoreRepository<HBPO_CAN_SA, Guid> repository, IExcelImportAppService excelImportService, INormalEfCoreRepository<HBPO_CAN_SA_DETAIL, Guid> detailRepository) : base(repository, excelImportService, detailRepository)
         {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("export")]
-        public Task<string> ExportAsync(HBPO_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("generateinvoice")]
-        public Task<bool> GenerateInvoice(HBPO_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("mainquery")]
-        public Task<PagedResultDto<HBPO_CAN_SA_DTO>> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs
index a6e7d9f9..f00a159e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 
 using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,31 +9,23 @@ using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
-    public class HBPO_NOT_SA_SERVICE : ApplicationService, IHBPO_NOT_SA_SERVICE
+    public class HBPO_NOT_SA_SERVICE : NOT_SA_SERVICE
+        <HBPO_NOT_SA_DETAIL,
+        HBPO_NOT_SA_DETAIL_DTO,
+        HBPO_NOT_SA_DETAIL_REQ_DTO,
+        HBPO_NOT_SA_DETAIL_EXP_DTO>
     {
-        [HttpPost]
-        //[Route("detailquery")]
-        public Task<PagedResultDto<HBPO_NOT_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input)
+        public HBPO_NOT_SA_SERVICE(IExcelImportAppService excelImportService, INormalEfCoreRepository<HBPO_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
         {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("export")]
-        public Task<string> ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input )
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("generatesettlementorder")]
-        public Task<bool> GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input)
-        {
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
index f82164e7..d64b7c6a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 
 using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,37 +9,28 @@ using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
-    public class PUB_CAN_SA_SERVICE : ApplicationService, IPUB_CAN_SA_SERVICE
+    public class PUB_CAN_SA_SERVICE : CAN_SA_SERVICE
+        <
+        PUB_CAN_SA,
+        PUB_CAN_SA_DTO,
+        PUB_CAN_SA_DETAIL,
+        PUB_CAN_SA_DETAIL_DTO,
+        PUB_CAN_SA_REQ_DTO,
+        PUB_CAN_SA_DETAIL_REQ_DTO,
+        PUB_CAN_SA_DETAIL_EXP_DTO
+        >
     {
-        [HttpPost]
-        //[Route("detailquery")]
-        public Task<PagedResultDto<PUB_CAN_SA_DETAIL_DTO>> DetailQueryAsync(HBPO_CAN_SA_DETAIL_REQ_DTO input)
+        protected PUB_CAN_SA_SERVICE(INormalEfCoreRepository<PUB_CAN_SA, Guid> repository, IExcelImportAppService excelImportService, INormalEfCoreRepository<PUB_CAN_SA_DETAIL, Guid> detailRepository) : base(repository, excelImportService, detailRepository)
         {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("export")]
-        public Task<string> ExportAsync(PUB_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("generateInvoice")]
-        public Task<bool> GenerateInvoice(PUB_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("mainquery")]
-        public Task<PagedResultDto<PUB_CAN_SA_DTO>> MainQueryAsync(HBPO_CAN_SA_REQ_DTO input)
-        {
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs
index 16e29a2e..b32f22fd 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 
 using Microsoft.AspNetCore.Mvc;
+using SettleAccount.Domain.BQ;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,31 +9,23 @@ using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Win.Sfs.SettleAccount.Bases;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
-    public class PUB_NOT_SA_SERVICE : ApplicationService, IPUB_NOT_SA_SERVICE
+    public class PUB_NOT_SA_SERVICE : NOT_SA_SERVICE
+        <PUB_NOT_SA_DETAIL,
+        PUB_NOT_SA_DETAIL_DTO,
+        PUB_NOT_SA_DETAIL_REQ_DTO,
+        PUB_NOT_SA_DETAIL_EXP_DTO>
     {
-        [HttpPost]
-        //[Route("detailquery")]
-        public Task<PagedResultDto<PUB_NOT_SA_DETAIL_DTO>> DetailQueryAsync(PUB_NOT_SA_DETAIL_REQ_DTO input)
+        public PUB_NOT_SA_SERVICE(IExcelImportAppService excelImportService, INormalEfCoreRepository<PUB_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
         {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("export")]
-        public Task<string> ExportAsync(PUB_NOT_SA_DETAIL_REQ_DTO input)
-        {
-            throw new NotImplementedException();
-        }
-        [HttpPost]
-        //[Route("generatesettlementorder")]
-        public Task<bool> GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input)
-        {
-            throw new NotImplementedException();
         }
     }
 }