From dc2aad89c80958f6c444e82ab196cea931e6addc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 06:19:24 +0800
Subject: [PATCH] 222
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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..d3451e9 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,9 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
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 Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -41,8 +42,9 @@
}
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);
+ var container = ObjectMapper.Map < GetWmsContainersInput, WmsContainer>(input);
+ var count = await _wmscontainerRepository.GetCountAsync(container,input.Filter, specification);
+ var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
return new PagedResultDto<WmsContainerDto>(count, ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list));
}
@@ -60,9 +62,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 +91,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 +160,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 +233,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 +252,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));
@@ -281,12 +309,13 @@
}
var specification = new WmsContainerSpecification(input.Name);
- var list = await _wmscontainerRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ var container = ObjectMapper.Map<GetWmsContainersInput, WmsContainer>(input);
+ var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, 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妯＄増";
--
Gitblit v1.9.3