From 6be4dc69a73560ab2e08e68d5dbfdf95ae62d5b4 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 15:14:37 +0800
Subject: [PATCH] 托盘高级查询
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 15 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
index 2027e02..04a0f69 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
@@ -1,8 +1,11 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
+using CMS.Plugin.HIAWms.Domain.WmsContainers;
+using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -31,7 +34,7 @@
}
/// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainersInput input)
+ public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainerInput input)
{
Check.NotNull(input, nameof(input));
@@ -40,11 +43,40 @@
input.Sorting = nameof(WmsContainer.Sort);
}
- var specification = new WmsContainerSpecification(input.Name);
- var count = await _wmscontainerRepository.GetCountAsync(input.Filter, specification);
- var list = await _wmscontainerRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await _wmscontainerRepository.GetCountAsync(whereConditions);
+ var list = await _wmscontainerRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsContainerDto>(count, ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list));
+ }
+
+ /// <summary>
+ /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ /// </summary>
+ /// <param name="input">杈撳叆鍙傛暟</param>
+ /// <returns></returns>
+ private FunReturnResultModel<Expression<Func<WmsContainer, bool>>> DynamicGetQueryParams(GetWmsContainerInput input)
+ {
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsContainer, GetWmsContainerInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
+ //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
+ Expression<Func<WmsContainer, bool>> extendExpression = a => a.IsDeleted == false;
+ // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
+ var pres = (System.Linq.Expressions.Expression<Func<WmsContainer, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
}
/// <inheritdoc />
@@ -60,9 +92,9 @@
var maxSort = await _wmscontainerRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmscontainer = new WmsContainer { Id = GuidGenerator.Create(), ContainerNo = input.ContainerNo, Remark = input.Remark };
+ var wmscontainer = ObjectMapper.Map<WmsContainerCreateDto,WmsContainer>(input);
input.MapExtraPropertiesTo(wmscontainer, MappingPropertyDefinitionChecks.None);
-
+ wmscontainer.Sort = sort;
await _wmscontainerRepository.InsertAsync(wmscontainer);
if (input.Sort.HasValue && wmscontainer.Sort != maxSort)
@@ -89,6 +121,16 @@
input.MapExtraPropertiesTo(wmscontainer, MappingPropertyDefinitionChecks.None);
wmscontainer.ContainerStatus = input.ContainerStatus;
+ wmscontainer.ContainerType = input.ContainerType;
+ wmscontainer.SpecLength = input.SpecLength;
+ wmscontainer.SpecWidth = input.SpecWidth;
+ wmscontainer.SpecHeight = input.SpecHeight;
+ wmscontainer.LimitLength = input.LimitLength;
+ wmscontainer.LimitWidth = input.LimitWidth;
+ wmscontainer.LimitHeight = input.LimitHeight;
+ wmscontainer.MaxWeight = input.MaxWeight;
+ wmscontainer.MaterialNumber = input.MaterialNumber;
+ wmscontainer.ExceptionNumber = input.ExceptionNumber;
await _wmscontainerRepository.UpdateAsync(wmscontainer);
@@ -148,7 +190,7 @@
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmscontainerRepository.GetListAsync(nameof(WmsContainer.Sort));
+ var list = await _wmscontainerRepository.GetListAsync(null,nameof(WmsContainer.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -221,7 +263,15 @@
var wmscontainerUpdateDto = new WmsContainerUpdateDto
{
ContainerNo = wmscontainer.ContainerNo,
+ ContainerType = wmscontainer.ContainerType,
ContainerStatus = wmscontainer.ContainerStatus,
+ SpecLength = wmscontainer.SpecLength,
+ SpecWidth = wmscontainer.SpecWidth,
+ SpecHeight = wmscontainer.SpecHeight,
+ LimitLength = wmscontainer.LimitLength,
+ LimitWidth = wmscontainer.LimitWidth,
+ LimitHeight = wmscontainer.LimitHeight,
+ MaxWeight = wmscontainer.MaxWeight,
Remark = wmscontainer.Remark,
};
@@ -232,8 +282,16 @@
var wmscontainerCreateDto = new WmsContainerCreateDto
{
ContainerNo = wmscontainer.ContainerNo,
+ ContainerType = wmscontainer.ContainerType,
ContainerStatus = wmscontainer.ContainerStatus,
- Remark = wmscontainer.Remark,
+ SpecLength = wmscontainer.SpecLength,
+ SpecWidth = wmscontainer.SpecWidth,
+ SpecHeight = wmscontainer.SpecHeight,
+ LimitLength = wmscontainer.LimitLength,
+ LimitWidth = wmscontainer.LimitWidth,
+ LimitHeight = wmscontainer.LimitHeight,
+ MaxWeight = wmscontainer.MaxWeight,
+ Remark = wmscontainer.Remark
};
wmscontainerCreateDtos.Add((wmscontainer.RowIndex, wmscontainerCreateDto));
@@ -271,7 +329,12 @@
}
/// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input)
+ /// <summary>
+ /// 瀵煎嚭鎵樼洏绠＄悊
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainerInput input)
{
Check.NotNull(input, nameof(input));
@@ -280,16 +343,22 @@
input.Sorting = nameof(WmsContainer.Sort);
}
- var specification = new WmsContainerSpecification(input.Name);
- var list = await _wmscontainerRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var list = await _wmscontainerRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list);
var sheets = new Dictionary<string, object>
{
- ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "WmsContainer鍒楄〃" : result.Count == 1 ? result.First()?.ContainerNo : "WmsContainer妯＄増";
+ var fileName = "鎵樼洏绠＄悊";
return (sheets, fileName);
}
--
Gitblit v1.9.3