From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs | 114 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 21 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
index 00005cf..768a873 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
@@ -4,52 +4,124 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.MaterielEnum;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
{
+ /// <summary>
+ /// 鐗╂枡淇℃伅
+ /// </summary>
[SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
- public class Dt_MaterielInfo : BaseEntity
+ [SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)]
+ public class Dt_MaterielInfo : BaseEntity//, BaseWarehouseEntity
{
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鍖哄煙涓婚敭")]
- public int AreaId { get; set; }
+ /// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
+ public int WarehouseId { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
public string MaterielCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
[SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
public string MaterielName { get; set; }
- [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鐗╂枡鎻忚堪")]
- public string MaterielDes { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "瀹瑰櫒绫诲瀷", DefaultValue = "0")]
- public int CotainerType { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)")]
+ public MaterielTypeEnum MaterielType { get; set; }
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍖呰瑙勬牸")]
- public string Packspes { get; set; }
+ /// <summary>
+ /// 鐗╂枡灞炴�у垎绫�(1:閲囪喘浠躲��2:鑷埗浠躲��3:閲囪喘&鑷埗浠�)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴�у垎绫�(1:閲囪喘浠躲��2:鑷埗浠躲��3:閲囪喘&鑷埗浠�)")]
+ public MaterielSourceTypeEnum MaterielSourceType { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴��", DefaultValue = "0")]
- public int Attribute { get; set; }
+ /// <summary>
+ /// 鍩烘湰鍗曚綅(buyUnitId/StockUnitId)
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅(buyUnitId/StockUnitId)")]
+ public string MaterielUnit { get; set; }
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁￠噺鍗曚綅", DefaultValue = "0")]
- public string Unit { get; set; }
+ /// <summary>
+ /// 鐗堟湰鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗堟湰鍚嶇О")]
+ public string MaterielVersion { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鏈夋晥鏈�", DefaultValue = "-1")]
- public int Validity { get; set; }
+ /// <summary>
+ /// 鐗╂枡灏哄
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡灏哄")]
+ public float? MaterielSize { get; set; }
- [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "瀹夊叏搴撳瓨", DefaultValue = "-1")]
- public decimal SafetyStock { get; set; }
+ /// <summary>
+ /// 鐗╂枡闀垮害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡闀垮害")]
+ public float? MaterielLength { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋壒")]
- public bool IsMixBatch { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍘氬害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍘氬害")]
+ public float? MaterielThickness { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋枡")]
- public bool IsMixMateriel { 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>
+ /// 鏄惁闇�瑕佽川妫�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁闇�瑕佽川妫�")]
+ public WhetherEnum IsCheck { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
}
--
Gitblit v1.9.3