From 55142f3214485c7ec12c5e414a56519f66a1eb1d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 十月 2025 19:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
index ca09721..34fef7e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
@@ -37,13 +37,19 @@
         public string MaterielCode { get; set; }
 
         /// <summary>
+        /// 涓婃父缁欑殑鍩虹鐗╂枡绫诲瀷
+        /// </summary>
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父缁欑殑鍩虹鐗╂枡绫诲瀷")]
+        public string MaterielErpType {  get; set; }
+
+        /// <summary>
         /// 鐗╂枡鍚嶇О
         /// </summary>
         [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
         public string MaterielName { get; set; }
 
         /// <summary>
-        /// 鍝佸悕
+        /// 鍝佸悕/閫氱敤鍚�
         /// </summary>
         [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍝佸悕")]
         public string item { get; set; }
@@ -116,7 +122,7 @@
         /// 鐗╂枡瀛樺偍鏉′欢
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡瀛樺偍鏉′欢")]
-        public float? MaterielStoragecondition { get; set; }
+        public float ? MaterielStoragecondition { get; set; }
 
         /// <summary>
         /// 绠辫

--
Gitblit v1.9.3