From 59c8d02d2bc7c7d9651edbd755ad73e4e7843ed8 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期四, 09 一月 2025 09:32:05 +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 | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 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 92f56a7..682c4fe 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" @@ -10,15 +10,24 @@ namespace WIDESEA_Model.Models { + /// <summary> + /// 鐗╂枡淇℃伅 + /// </summary> [SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")] [SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)] - public class Dt_MaterielInfo : BaseEntity + public class Dt_MaterielInfo : BaseEntity//, BaseWarehouseEntity { /// <summary> /// 涓婚敭 /// </summary> [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] public int Id { get; set; } + + /// <summary> + /// 浠撳簱缂栧彿 + /// </summary> + [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")] + public int WarehouseId { get; set; } /// <summary> /// 鐗╂枡缂栧彿 @@ -109,12 +118,6 @@ /// </summary> [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁闇�瑕佽川妫�")] public WhetherEnum IsCheck { get; set; } - - /// <summary> - /// 浠撳簱缂栧彿 - /// </summary> - [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")] - public int WaId { get; set; } /// <summary> /// 澶囨敞 -- Gitblit v1.9.3