From 3ec65a96dd073e598e58c12fb0b5af31e38bc20e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 14:48:51 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
index cbbdf8e..f69b16b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.Shared;
@@ -7,8 +7,8 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
-using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CMS.Plugin.HIAWms.Domain.WmsStores;
+using CmsQueryExtensions;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -35,7 +35,7 @@
}
/// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input)
+ public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreaInput input)
{
Check.NotNull(input, nameof(input));
@@ -45,7 +45,7 @@
}
var specification = new WmsAreaSpecification(input.Name);
- var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
+ var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input);
var count = await _wmsareaRepository.GetCountAsync(area,input.Filter, specification);
var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
@@ -300,7 +300,7 @@
}
/// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input)
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input)
{
Check.NotNull(input, nameof(input));
@@ -310,7 +310,7 @@
}
var specification = new WmsAreaSpecification(input.Name);
- var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input);
+ var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input);
var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list);
--
Gitblit v1.9.3