From 9eaf758e97367dbc2eca2bdbdc92ab39e08be9d0 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 13:12:17 +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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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..ada2978 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;
@@ -271,7 +271,7 @@
                         MaterialNo = wmsmaterial.MaterialNo,
                         MaterialName = wmsmaterial.MaterialName,
                         PurchaseType = wmsmaterial.PurchaseType,
-                        MaterialType = wmsmaterial.MaterialType,
+                        MaterialTypeCode = wmsmaterial.MaterialTypeCode,
                         PrimaryUnit = wmsmaterial.PrimaryUnit,
                         Standard = wmsmaterial.Standard,
                         OuterDiameter = wmsmaterial.OuterDiameter,
@@ -293,7 +293,7 @@
                         MaterialNo = wmsmaterial.MaterialNo,
                         MaterialName = wmsmaterial.MaterialName,
                         PurchaseType = wmsmaterial.PurchaseType,
-                        MaterialType = wmsmaterial.MaterialType,
+                        MaterialTypeCode = wmsmaterial.MaterialTypeCode,
                         PrimaryUnit = wmsmaterial.PrimaryUnit,
                         Standard = wmsmaterial.Standard,
                         OuterDiameter = wmsmaterial.OuterDiameter,

--
Gitblit v1.9.3