From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +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 | 12 ++++++++----
1 files changed, 8 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 012a139..3648d2d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -125,7 +125,7 @@
wmsmaterial.MaterialName = input.MaterialName;
wmsmaterial.PurchaseType = input.PurchaseType;
- wmsmaterial.MaterialType = input.MaterialType;
+ wmsmaterial.MaterialTypeCode = input.MaterialTypeCode;
wmsmaterial.PrimaryUnit = input.PrimaryUnit;
wmsmaterial.Standard = input.Standard;
wmsmaterial.OuterDiameter = input.OuterDiameter;
@@ -136,7 +136,7 @@
wmsmaterial.Factory = input.Factory;
wmsmaterial.MaterialModel = input.MaterialModel;
wmsmaterial.Certification = input.Certification;
-
+ wmsmaterial.MaterialTypeDesc = input.MaterialTypeDesc;
await _wmsmaterialRepository.UpdateAsync(wmsmaterial);
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
@@ -271,7 +271,8 @@
MaterialNo = wmsmaterial.MaterialNo,
MaterialName = wmsmaterial.MaterialName,
PurchaseType = wmsmaterial.PurchaseType,
- MaterialType = wmsmaterial.MaterialType,
+ MaterialTypeCode = wmsmaterial.MaterialTypeCode,
+ MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
PrimaryUnit = wmsmaterial.PrimaryUnit,
Standard = wmsmaterial.Standard,
OuterDiameter = wmsmaterial.OuterDiameter,
@@ -281,6 +282,7 @@
IsMainBranch = wmsmaterial.IsMainBranch,
Factory = wmsmaterial.Factory,
Certification = wmsmaterial.Certification,
+ MaterialModel = wmsmaterial.MaterialModel,
Remark = wmsmaterial.Remark,
};
@@ -293,7 +295,8 @@
MaterialNo = wmsmaterial.MaterialNo,
MaterialName = wmsmaterial.MaterialName,
PurchaseType = wmsmaterial.PurchaseType,
- MaterialType = wmsmaterial.MaterialType,
+ MaterialTypeCode = wmsmaterial.MaterialTypeCode,
+ MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
PrimaryUnit = wmsmaterial.PrimaryUnit,
Standard = wmsmaterial.Standard,
OuterDiameter = wmsmaterial.OuterDiameter,
@@ -301,6 +304,7 @@
MaterialQuality = wmsmaterial.MaterialQuality,
Length = wmsmaterial.Length,
IsMainBranch = wmsmaterial.IsMainBranch,
+ MaterialModel = wmsmaterial.MaterialModel,
Factory = wmsmaterial.Factory,
Certification = wmsmaterial.Certification,
Remark = wmsmaterial.Remark,
--
Gitblit v1.9.3