From 671b429b3c000eccf05910452505562f06defa73 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 07:54:56 +0800
Subject: [PATCH] 222
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
index 9c7617e..8c94ab0 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
@@ -7,6 +7,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
+using CMS.Plugin.HIAWms.Domain.Shared.Util;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -31,7 +32,7 @@
}
/// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsPlaceDto>> GetListAsync(GetWmsPlacesInput input)
+ public virtual async Task<PagedResultDto<WmsPlaceDto>> GetListAsync(GetWmsMaterialInfoInput input)
{
Check.NotNull(input, nameof(input));
@@ -41,8 +42,9 @@
}
var specification = new WmsPlaceSpecification(input.Name);
- var count = await _wmsplaceRepository.GetCountAsync(input.Filter, specification);
- var list = await _wmsplaceRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+ var place = ObjectMapper.Map<GetWmsMaterialInfoInput, WmsPlace>(input);
+ var count = await _wmsplaceRepository.GetCountAsync(place,input.Filter, specification);
+ var list = await _wmsplaceRepository.GetListAsync(place, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
return new PagedResultDto<WmsPlaceDto>(count, ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(list));
}
@@ -60,12 +62,9 @@
var maxSort = await _wmsplaceRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmsplace = new WmsPlace
- {
-
- };
+ var wmsplace = ObjectMapper.Map<WmsPlaceCreateDto,WmsPlace>(input);
input.MapExtraPropertiesTo(wmsplace, MappingPropertyDefinitionChecks.None);
-
+ wmsplace.Sort = sort;
await _wmsplaceRepository.InsertAsync(wmsplace);
if (input.Sort.HasValue && wmsplace.Sort != maxSort)
@@ -91,7 +90,19 @@
wmsplace.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(wmsplace, MappingPropertyDefinitionChecks.None);
- wmsplace.PlaceNo = input.PlaceNo;
+ wmsplace.StorageTypeNo = input.StorageTypeNo;
+ wmsplace.PlaceStatus = input.PlaceStatus;
+ wmsplace.AreaCode = input.AreaCode;
+ wmsplace.Aisle = input.Aisle;
+ wmsplace.RowNo = input.RowNo;
+ wmsplace.ColumnNo = input.ColumnNo;
+ wmsplace.LayerNo = input.LayerNo;
+ wmsplace.Islock = input.Islock;
+ wmsplace.EmptyContainer = input.EmptyContainer;
+ wmsplace.RedundantField1 = input.RedundantField1;
+ wmsplace.RedundantField2 = input.RedundantField2;
+ wmsplace.RedundantField3 = input.RedundantField3;
+ wmsplace.Remark = input.Remark;
await _wmsplaceRepository.UpdateAsync(wmsplace);
@@ -151,7 +162,7 @@
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmsplaceRepository.GetListAsync(nameof(WmsPlace.Sort));
+ var list = await _wmsplaceRepository.GetListAsync(null,nameof(WmsPlace.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -274,7 +285,7 @@
}
/// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsPlacesInput input)
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInfoInput input)
{
Check.NotNull(input, nameof(input));
@@ -284,12 +295,13 @@
}
var specification = new WmsPlaceSpecification(input.Name);
- var list = await _wmsplaceRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ var place = ObjectMapper.Map<GetWmsMaterialInfoInput, WmsPlace>(input);
+ var list = await _wmsplaceRepository.GetListAsync(place, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
var result = ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(list);
var sheets = new Dictionary<string, object>
{
- ["閰嶇疆"] = result.Select(x => x.GetExportData()).ToList(),
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
var fileName = result.Count > 1 ? "WmsPlace鍒楄〃" : result.Count == 1 ? result.First()?.PlaceNo : "WmsPlace妯＄増";
--
Gitblit v1.9.3