From 35e1de3d6bbbe65743b70d8e9f771c2efc6065d7 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 29 4月 2025 17:31:30 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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..b037ac9 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
@@ -42,7 +42,7 @@
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 list = await _wmsareaRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
return new PagedResultDto<WmsAreaDto>(count, ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list));
}
@@ -60,10 +60,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 +89,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);
@@ -222,8 +225,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 +240,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,
};
--
Gitblit v1.9.3