From ed8fc204b96456f5b43f8cf860de6c91f504f97b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 30 4月 2025 20:22:12 +0800
Subject: [PATCH] 库区库位后端代码
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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..e9c095e 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.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;
@@ -41,8 +42,9 @@
}
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);
+ var area = ObjectMapper.Map<GetWmsAreasInput, 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);
return new PagedResultDto<WmsAreaDto>(count, ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list));
}
@@ -60,10 +62,8 @@
var maxSort = await _wmsareaRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmsarea = new WmsArea
- {
-
- };
+ var wmsarea = ObjectMapper.Map<WmsAreaCreateDto, WmsArea>(input);
+ wmsarea.Sort = sort;
input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
await _wmsareaRepository.InsertAsync(wmsarea);
@@ -91,7 +91,12 @@
wmsarea.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(wmsarea, MappingPropertyDefinitionChecks.None);
- 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 = input.StoreName;
await _wmsareaRepository.UpdateAsync(wmsarea);
@@ -150,7 +155,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;
@@ -222,8 +227,12 @@
{
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 +242,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,
};
@@ -283,12 +296,13 @@
}
var specification = new WmsAreaSpecification(input.Name);
- var list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ var area = ObjectMapper.Map<GetWmsAreasInput, 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);
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妯＄増";
--
Gitblit v1.9.3