From 67348f250a1b7970059698002949a5e0a5f3c52f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 14 八月 2025 08:51:04 +0800
Subject: [PATCH] 上传最新代码

---
 项目代码/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs |   90 ++++++++++++++++----------------------------
 1 files changed, 33 insertions(+), 57 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
index 768a873..a3607a1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
@@ -15,7 +15,7 @@
     /// </summary>
     [SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
     [SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)]
-    public class Dt_MaterielInfo : BaseEntity//, BaseWarehouseEntity
+    public class Dt_MaterielInfo : BaseEntity
     {
         /// <summary>
         /// 涓婚敭
@@ -40,6 +40,36 @@
         /// </summary>
         [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
         public string MaterielName { get; set; }
+        
+        /// <summary>
+        /// 鐗╂枡鍒嗙被
+        /// </summary>
+        [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍒嗙被")]
+        public int MaterielSourceType { get; set; }
+
+        /// <summary>
+        /// 搴撳瓨缁勭粐
+        /// </summary>
+        [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨缁勭粐")]
+        public int MaterielInvOrgId { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡闀垮害
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡闀垮害")]
+        public decimal? MaterielLength { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡鐩村緞/楂樺害
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鐩村緞/楂樺害")]
+        public decimal? MaterielThickness { get; set; }
+
+        /// <summary>
+        /// 鐗╂枡渚ч潰骞呭(m)
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡渚ч潰骞呭(m)")]
+        public decimal? MaterielWide { get; set; }
 
         /// <summary>
         /// 鐗╂枡瑙勬牸
@@ -48,70 +78,16 @@
         public string MaterielSpec { get; set; }
 
         /// <summary>
-        /// 鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)
+        /// 鍩烘湰鍗曚綅
         /// </summary>
-        [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)")]
-        public MaterielTypeEnum MaterielType { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡灞炴�у垎绫�(1:閲囪喘浠躲��2:鑷埗浠躲��3:閲囪喘&鑷埗浠�)
-        /// </summary>
-        [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴�у垎绫�(1:閲囪喘浠躲��2:鑷埗浠躲��3:閲囪喘&鑷埗浠�)")]
-        public MaterielSourceTypeEnum MaterielSourceType { get; set; }
-
-        /// <summary>
-        /// 鍩烘湰鍗曚綅(buyUnitId/StockUnitId)
-        /// </summary>
-        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅(buyUnitId/StockUnitId)")]
+        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅")]
         public string MaterielUnit { get; set; }
-
-        /// <summary>
-        /// 鐗堟湰鍚嶇О
-        /// </summary>
-        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗堟湰鍚嶇О")]
-        public string MaterielVersion { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡灏哄
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡灏哄")]
-        public float? MaterielSize { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡闀垮害
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡闀垮害")]
-        public float? MaterielLength { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡鍘氬害
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍘氬害")]
-        public float? MaterielThickness { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡瀹藉害
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡瀹藉害")]
-        public float? MaterielWide { get; set; }
-
-        /// <summary>
-        /// 鐗╂枡鍨嬪彿
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍨嬪彿")]
-        public string MaterielModel { get; set; }
 
         /// <summary>
         /// 鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)
         /// </summary>
         [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)")]
         public EnableEnum MaterielState { get; set; }
-
-        /// <summary>
-        /// 搴撳瓨缁勭粐(榛樿:娣畨鐗瑰垱浜屽巶)
-        /// </summary>
-        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "搴撳瓨缁勭粐(榛樿:娣畨鐗瑰垱浜屽巶)")]
-        public string MaterielInvOrgId { get; set; }
 
         /// <summary>
         /// 鏄惁闇�瑕佽川妫�

--
Gitblit v1.9.3