From 161669bc16a62898c18b40725ff0744887038275 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 18:16:43 +0800
Subject: [PATCH] 高级查询样式整改（其实我发现并没有什么变化啊）
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 21 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 ab291e2..c803497 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,6 +7,10 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
+using CMS.Plugin.HIAWms.Domain.WmsStores;
+using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -14,14 +18,16 @@
public class WmsAreaAppService : CMSPluginAppService, IWmsAreaAppService
{
private readonly IWmsAreaRepository _wmsareaRepository;
+ private readonly IWmsStoreRepository _wmsstoreRepository;
/// <summary>
/// Initializes a new instance of the <see cref="WmsAreaAppService"/> class.
/// </summary>
/// <param name="wmsareaRepository">The task job repository.</param>
- public WmsAreaAppService(IWmsAreaRepository wmsareaRepository)
+ public WmsAreaAppService(IWmsAreaRepository wmsareaRepository, IWmsStoreRepository wmsstoreRepository)
{
_wmsareaRepository = wmsareaRepository;
+ _wmsstoreRepository = wmsstoreRepository;
}
/// <inheritdoc />
@@ -30,8 +36,12 @@
return ObjectMapper.Map<WmsArea, WmsAreaDto>(await _wmsareaRepository.GetAsync(id));
}
- /// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input)
+ /// <summary>
+ /// 鍒嗛〉鑾峰彇浠撳簱淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreaInput input)
{
Check.NotNull(input, nameof(input));
@@ -40,11 +50,40 @@
input.Sorting = nameof(WmsArea.Sort);
}
- var specification = new WmsAreaSpecification(input.Name);
- var count = await _wmsareaRepository.GetCountAsync(input.Filter, specification);
- var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await _wmsareaRepository.GetCountAsync(whereConditions);
+ var list = await _wmsareaRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsAreaDto>(count, ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list));
+ }
+
+ /// <summary>
+ /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ /// </summary>
+ /// <param name="input">杈撳叆鍙傛暟</param>
+ /// <returns></returns>
+ private FunReturnResultModel<Expression<Func<WmsArea, bool>>> DynamicGetQueryParams(GetWmsAreaInput input)
+ {
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsArea, GetWmsAreaInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
+ //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
+ Expression<Func<WmsArea, bool>> extendExpression = a => a.IsDeleted == false;
+ // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
+ var pres = (System.Linq.Expressions.Expression<Func<WmsArea, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
}
/// <inheritdoc />
@@ -60,12 +99,16 @@
var maxSort = await _wmsareaRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmsarea = new WmsArea
+ var wmsarea = ObjectMapper.Map<WmsAreaCreateDto, WmsArea>(input);
+ wmsarea.Sort = sort;
+ var store = await _wmsstoreRepository.FindByNameAsync(input.StoreCode);
+ if (store == null)
{
+ throw new UserFriendlyException("浠撳簱淇℃伅涓嶅瓨");
+ }
- };
input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
-
+ wmsarea.StoreName = store.StoreName;
await _wmsareaRepository.InsertAsync(wmsarea);
if (input.Sort.HasValue && wmsarea.Sort != maxSort)
@@ -90,8 +133,18 @@
wmsarea.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
+ var store = await _wmsstoreRepository.FindByNameAsync(input.StoreCode);
+ if (store == null)
+ {
+ throw new UserFriendlyException("浠撳簱淇℃伅涓嶅瓨");
+ }
- wmsarea.AreaNo = input.AreaNo;
+ wmsarea.AreaName = input.AreaName;
+ wmsarea.AreaDesc = input.AreaDesc;
+ wmsarea.AreaStatus = input.AreaStatus;
+ wmsarea.AreaType = input.AreaType;
+ wmsarea.StoreCode = input.StoreCode;
+ wmsarea.StoreName = store.StoreName;
await _wmsareaRepository.UpdateAsync(wmsarea);
@@ -150,7 +203,7 @@
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmsareaRepository.GetListAsync(nameof(WmsArea.Sort));
+ var list = await _wmsareaRepository.GetListAsync(null,nameof(WmsArea.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -217,13 +270,17 @@
throw new UserFriendlyException(errorMsg);
}
- var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaName);
+ var oldWmsArea = await _wmsareaRepository.FindByNameAsync(wmsarea.AreaNo);
if (oldWmsArea != null)
{
var wmsareaUpdateDto = new WmsAreaUpdateDto
{
- AreaNo = wmsarea.AreaNo,
AreaName = wmsarea.AreaName,
+ AreaDesc = wmsarea.AreaDesc,
+ AreaStatus = wmsarea.AreaStatus,
+ AreaType = wmsarea.AreaType,
+ StoreCode = wmsarea.StoreCode,
+ StoreName = wmsarea.StoreName,
Remark = wmsarea.Remark,
};
@@ -233,8 +290,12 @@
{
var wmsareaCreateDto = new WmsAreaCreateDto
{
- AreaNo = wmsarea.AreaNo,
AreaName = wmsarea.AreaName,
+ AreaDesc = wmsarea.AreaDesc,
+ AreaStatus = wmsarea.AreaStatus,
+ AreaType = wmsarea.AreaType,
+ StoreCode = wmsarea.StoreCode,
+ StoreName = wmsarea.StoreName,
Remark = wmsarea.Remark,
};
@@ -272,8 +333,12 @@
}
}
- /// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input)
+ /// <summary>
+ /// 瀵煎嚭浠撳簱搴撳尯淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input)
{
Check.NotNull(input, nameof(input));
@@ -282,16 +347,24 @@
input.Sorting = nameof(WmsArea.Sort);
}
- var specification = new WmsAreaSpecification(input.Name);
- var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+
+ var list = await _wmsareaRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list);
var sheets = new Dictionary<string, object>
{
- ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "WmsArea鍒楄〃" : result.Count == 1 ? result.First()?.AreaName : "WmsArea妯＄増";
+ var fileName = "搴撳尯淇℃伅";
return (sheets, fileName);
}
--
Gitblit v1.9.3