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.Domain/WmsMaterials/WmsMaterial.cs |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs
index 4b9d049..9cb7320 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs
@@ -14,12 +14,18 @@
         /// <summary>
         /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
         /// </summary>
-        public string MaterialCode { get; set; }
+        public string MaterialNo { get; set; }
 
         /// <summary>
         /// 鐗╂枡鍚嶇О
         /// </summary>
         public string MaterialName { get; set; }
+
+
+        /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        public string MaterialModel { get; set; }
 
         /// <summary>
         /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
@@ -29,7 +35,12 @@
         /// <summary>
         /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
         /// </summary>
-        public MaterialTypeEnum MaterialType { get; set; }
+        public string  MaterialTypeCode { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡绫诲瀷
+        /// </summary>
+        public string MaterialTypeDesc { get; set; }
 
         /// <summary>
         /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�

--
Gitblit v1.9.3