From 680c0ced86a7d1afee70aad637b9965dde069a6e Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Sat, 2 Sep 2023 11:32:20 +0800
Subject: [PATCH] up

---
 .../Entities/BQ/BBAC_SA_SERVICE.cs            | 10 ++++----
 .../BQ/Syncs/JisBBACSeEdiCompareAppService.cs |  1 -
 .../BQ/Syncs/JisHBPOSeEdiCompareAppService.cs | 25 +------------------
 .../Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs |  1 +
 .../Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs |  1 +
 .../BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs        |  1 +
 6 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
index 6a3cc12d..d221e9bb 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
@@ -202,11 +202,11 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     [HttpPost]
     public async Task<PagedResultDto<BBAC_SA_DTO>> GetListAsync(RequestDto input)
     {
-        var businessTypeFilterConditions = input.Filters.FindAll(t => t.Column.ToLower() == "businesstype");
-        businessTypeFilterConditions.ForEach(t =>
-        {
-            t.Value = EnumBusinessType.JisBBAC.ToString();
-        });
+        //var businessTypeFilterConditions = input.Filters.FindAll(t => t.Column.ToLower() == "businesstype");
+        //businessTypeFilterConditions.ForEach(t =>
+        //{
+        //    t.Value = EnumBusinessType.JisBBAC.ToString();
+        //});
         var entities = await _bbacSaRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
         var totalCount = await _bbacSaRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
         var dtos = ObjectMapper.Map<List<BBAC_SA>, List<BBAC_SA_DTO>>(entities);
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
index a42b7b26..c75341b6 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
@@ -18,7 +18,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class JisBBACSeEdiCompareAppService : ApplicationService, IInvocable
 {
-    private readonly object _lockObj = new object();
     private readonly IServiceProvider _serviceProvider;
 
     public JisBBACSeEdiCompareAppService(IServiceProvider serviceProvider)
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
index 9f3ef0cc..290008fe 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
@@ -10,8 +10,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using SettleAccount.Domain.BQ;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Uow;
-using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 
@@ -21,32 +19,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class JisHBPOSeEdiCompareAppService : ApplicationService, IInvocable
 {
-    private readonly object _lockObj = new object();
     private readonly IServiceProvider _serviceProvider;
 
-    /// <summary>
-    /// HBPO发运数据仓储
-    /// </summary>
-    private readonly INormalEfCoreRepository<HBPO_SE_DETAIL, Guid> _hbpoSeDetailRepository;
-    /// <summary>
-    /// HBPOEDI数据仓储
-    /// </summary>
-    private readonly INormalEfCoreRepository<HBPO_SE_EDI, Guid> _hbpoSeEdiRepository;
-    /// <summary>
-    /// UnitOfWork
-    /// </summary>
-    private readonly IUnitOfWorkManager _unitOfWorkManager;
-
-    public JisHBPOSeEdiCompareAppService(
-        IServiceProvider serviceProvider,
-        INormalEfCoreRepository<HBPO_SE_DETAIL, Guid> hbpoSeDetailRepository,
-        INormalEfCoreRepository<HBPO_SE_EDI, Guid> hbpoSeEdiRepository,
-        IUnitOfWorkManager unitOfWorkManager)
+    public JisHBPOSeEdiCompareAppService(IServiceProvider serviceProvider)
     {
         _serviceProvider = serviceProvider;
-        _hbpoSeDetailRepository = hbpoSeDetailRepository;
-        _hbpoSeEdiRepository = hbpoSeEdiRepository;
-        _unitOfWorkManager = unitOfWorkManager;
     }
 
     /// <summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs
index 484e2b03..d866c643 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs
@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 
+[Table("TM_BJBMPT_JIS_RECORD")]
 public class TM_BJBMPT_JIS_RECORD
 {
     [Key]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
index 90998ba1..775a4cf7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs
@@ -8,6 +8,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 /// <summary>
 /// Jis小件
 /// </summary>
+[Table("TM_BJBMPT_JIT_RECORD")]
 public class TM_BJBMPT_JIT_RECORD
 {
     [Key]
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs
index 9c6dff17..e83a4caf 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs
@@ -8,6 +8,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 /// <summary>
 /// Jit(非Jis)
 /// </summary>
+[Table("TM_BJBMPT_OTHER_RECORD")]
 public class TM_BJBMPT_OTHER_RECORD
 {
     [Key]