From 27ba504441037666e787ded85b4af2f65be65c17 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 29 4月 2025 18:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
index 1fbe564..201c2cb 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -60,10 +60,9 @@
var maxSort = await _wmsmaterialRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmsmaterial = new WmsMaterial
- {
- };
+ var wmsmaterial = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
+ wmsmaterial.Sort = sort;
input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);
await _wmsmaterialRepository.InsertAsync(wmsmaterial);
@@ -91,7 +90,18 @@
wmsmaterial.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);
- wmsmaterial.MaterialCode = input.MaterialCode;
+ wmsmaterial.MaterialName = input.MaterialName;
+ wmsmaterial.PurchaseType = input.PurchaseType;
+ wmsmaterial.MaterialType = input.MaterialType;
+ wmsmaterial.PrimaryUnit = input.PrimaryUnit;
+ wmsmaterial.Standard = input.Standard;
+ wmsmaterial.OuterDiameter = input.OuterDiameter;
+ wmsmaterial.WallThickness = input.WallThickness;
+ wmsmaterial.MaterialQuality = input.MaterialQuality;
+ wmsmaterial.Length = input.Length;
+ wmsmaterial.IsMainBranch = input.IsMainBranch;
+ wmsmaterial.Factory = input.Factory;
+ wmsmaterial.Certification = input.Certification;
await _wmsmaterialRepository.UpdateAsync(wmsmaterial);
@@ -226,6 +236,17 @@
{
MaterialCode = wmsmaterial.MaterialCode,
MaterialName = wmsmaterial.MaterialName,
+ PurchaseType = wmsmaterial.PurchaseType,
+ MaterialType = wmsmaterial.MaterialType,
+ PrimaryUnit = wmsmaterial.PrimaryUnit,
+ Standard = wmsmaterial.Standard,
+ OuterDiameter = wmsmaterial.OuterDiameter,
+ WallThickness = wmsmaterial.WallThickness,
+ MaterialQuality = wmsmaterial.MaterialQuality,
+ Length = wmsmaterial.Length,
+ IsMainBranch = wmsmaterial.IsMainBranch,
+ Factory = wmsmaterial.Factory,
+ Certification = wmsmaterial.Certification,
Remark = wmsmaterial.Remark,
};
@@ -237,6 +258,17 @@
{
MaterialCode = wmsmaterial.MaterialCode,
MaterialName = wmsmaterial.MaterialName,
+ PurchaseType = wmsmaterial.PurchaseType,
+ MaterialType = wmsmaterial.MaterialType,
+ PrimaryUnit = wmsmaterial.PrimaryUnit,
+ Standard = wmsmaterial.Standard,
+ OuterDiameter = wmsmaterial.OuterDiameter,
+ WallThickness = wmsmaterial.WallThickness,
+ MaterialQuality = wmsmaterial.MaterialQuality,
+ Length = wmsmaterial.Length,
+ IsMainBranch = wmsmaterial.IsMainBranch,
+ Factory = wmsmaterial.Factory,
+ Certification = wmsmaterial.Certification,
Remark = wmsmaterial.Remark,
};
--
Gitblit v1.9.3