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 [HttpPost] public async Task> 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>(entities); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 909759df..8a521847 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -234,10 +234,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ EndDate = itm.EndDate, }; - - entity.INVOICE_WAIT_DETAIL = wdtos; - } var s = await _sRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount); @@ -310,15 +307,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ byte[] result = null; result = await _excel.ExportAsByteArray(dtoDetails); - - - - - - - - - //switch (input.FileType) //{ // case 0: @@ -352,13 +340,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ ExcelExporter _excel = new ExcelExporter(); var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true); - - - - - - - var dtoDetails = ObjectMapper.Map, List>(entities); var invdetail= await DetailQueryAsync(input); var m = invdetail.INVOICE_MAP_GROUP; 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; - /// - /// HBPO发运数据仓储 - /// - private readonly INormalEfCoreRepository _hbpoSeDetailRepository; - /// - /// HBPOEDI数据仓储 - /// - private readonly INormalEfCoreRepository _hbpoSeEdiRepository; - /// - /// UnitOfWork - /// - private readonly IUnitOfWorkManager _unitOfWorkManager; - - public JisHBPOSeEdiCompareAppService( - IServiceProvider serviceProvider, - INormalEfCoreRepository hbpoSeDetailRepository, - INormalEfCoreRepository hbpoSeEdiRepository, - IUnitOfWorkManager unitOfWorkManager) + public JisHBPOSeEdiCompareAppService(IServiceProvider serviceProvider) { _serviceProvider = serviceProvider; - _hbpoSeDetailRepository = hbpoSeDetailRepository; - _hbpoSeEdiRepository = hbpoSeEdiRepository; - _unitOfWorkManager = unitOfWorkManager; } /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs index 08f2292a..6253ccee 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs @@ -276,7 +276,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers /// public virtual async Task> GetDetailByInbillNumAsync(List p_invs) { - return await _detailRepository.Where(p => p_invs.Contains(p.BillNum)).ToListAsync(); + return await _detailRepository.Where(p => p_invs.Contains(p.InvbillNum)).ToListAsync(); } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_CAN_SA_MNG.cs index 6513e578..1f0e22f6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_CAN_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_CAN_SA_MNG.cs @@ -274,7 +274,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers /// public virtual async Task> GetDetailByInbillNumAsync(List p_invs) { - return await _detailRepository.Where(p => p_invs.Contains(p.BillNum)).ToListAsync(); + return await _detailRepository.Where(p => p_invs.Contains(p.InvbillNum)).ToListAsync(); } } 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; /// /// Jis小件 /// +[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; /// /// Jit(非Jis) /// +[Table("TM_BJBMPT_OTHER_RECORD")] public class TM_BJBMPT_OTHER_RECORD { [Key]