From 84daa62f7ef6df79419dd01451cd21bb6bc7e091 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 30 4月 2025 13:58:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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..7328599 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
@@ -60,9 +60,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 +89,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);
@@ -221,7 +231,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 +250,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));
--
Gitblit v1.9.3