Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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

@@ -29,6 +29,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string State { get; set; }
     }
 
+    /// <summary>
+    /// 查询
+    /// </summary>
+    public class PUB_SARequestDto : RequestDto
+    {
+        /// <summary>
+        /// 业务类别
+        /// </summary>
+        public EnumBusinessType BusinessType { get; set; }
+    }
+
     /// <summary>
     /// 导入
     /// </summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/MaterialRelationship/MaterialRelationshipDtoBase.cs

@@ -91,12 +91,6 @@ namespace Win.Sfs.SettleAccount.MaterialRelationships
         /// </summary>
         [Display(Name = "客户物料号")]
         public string SettleMaterialCode { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注")]
-        public string Remark { get; set; }
     }
 
     /// <summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

@@ -20,17 +20,18 @@ using Win.Sfs.SettleAccount.Entities.Prices;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.MaterialRelationships;
+using Win.Sfs.Shared.Filter;
 using Win.Sfs.Shared.RepositoryBase;
 
-namespace Win.Sfs.SettleAccount.Entities.BQ
+namespace Win.Sfs.SettleAccount.Entities.BQ;
+
+/// <summary>
+/// PUB结算
+/// </summary>
+[AllowAnonymous]
+[Route("api/settleaccount/[controller]/[action]")]
+public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
 {
-    /// <summary>
-    /// PUB结算
-    /// </summary>
-    [AllowAnonymous]
-    [Route("api/settleaccount/[controller]/[action]")]
-    public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
-    {
     /// <summary>
     /// PUB结算仓储 
     /// </summary>
@@ -114,8 +115,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     /// 获取列表
     /// </summary>
     [HttpPost]
-        public async Task<PagedResultDto<PUB_SA_DTO>> GetListAsync(RequestDto input)
+    public async Task<PagedResultDto<PUB_SA_DTO>> GetListAsync(PUB_SARequestDto input)
     {
+        input.Filters.Add(new FilterCondition("BusinessType", input.BusinessType.ToString(), EnumFilterAction.Equal, EnumFilterLogic.And));
         var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
         var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
         var dtos = ObjectMapper.Map<List<PUB_SA>, List<PUB_SA_DTO>>(entities);
@@ -333,5 +335,4 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         return ApplicationConsts.SuccessStr;
     }
     #endregion
-    }
 }