From 51f22e5c39abe7ed55a786520fcabe00f3cd1e8f Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 14 5月 2025 11:48:26 +0800 Subject: [PATCH] 命名空间修改 --- HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs index ae4d559..aa83a4a 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs @@ -1,4 +1,4 @@ -using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore; using CMS.Plugin.HIAWms.Application.Contracts.Services; using CMS.Plugin.HIAWms.Domain.WmsStores; using CMS.Plugin.HIAWms.Domain.Shared; @@ -7,6 +7,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Data; using Volo.Abp.ObjectExtending; +using CmsQueryExtensions; namespace CMS.Plugin.HIAWms.Application.Implements; @@ -31,7 +32,7 @@ } /// <inheritdoc /> - public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoresInput input) + public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoreInput input) { Check.NotNull(input, nameof(input)); @@ -41,8 +42,9 @@ } var specification = new WmsStoreSpecification(input.Name); - var count = await _wmsstoreRepository.GetCountAsync(input.Filter, specification); - var list = await _wmsstoreRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); + var store = ObjectMapper.Map<GetWmsStoreInput, WmsStore>(input); + var count = await _wmsstoreRepository.GetCountAsync(store,input.Filter, specification); + var list = await _wmsstoreRepository.GetListAsync(store,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); return new PagedResultDto<WmsStoreDto>(count, ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list)); } @@ -150,7 +152,7 @@ /// <inheritdoc /> public virtual async Task AdjustSortAsync(Guid id, int sort) { - var list = await _wmsstoreRepository.GetListAsync(nameof(WmsStore.Sort)); + var list = await _wmsstoreRepository.GetListAsync(null,nameof(WmsStore.Sort)); if (list != null && list.Any()) { var initSort = 1; @@ -273,7 +275,7 @@ } /// <inheritdoc /> - public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input) + public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoreInput input) { Check.NotNull(input, nameof(input)); @@ -283,12 +285,13 @@ } var specification = new WmsStoreSpecification(input.Name); - var list = await _wmsstoreRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); + var store = ObjectMapper.Map<GetWmsStoreInput, WmsStore>(input); + var list = await _wmsstoreRepository.GetListAsync(store, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); var result = ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list); var sheets = new Dictionary<string, object> { - ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(), + ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result), }; var fileName = result.Count > 1 ? "WmsStore鍒楄〃" : result.Count == 1 ? result.First()?.StoreCode : "WmsStore妯$増"; -- Gitblit v1.9.3