From f949c8886b5881fdd19c7cc46a7ea44ff5f2e011 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期五, 13 十二月 2024 10:49: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 | 11 ++++------- 1 files changed, 4 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..0c7d21e 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" @@ -12,7 +12,7 @@ { [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> /// 涓婚敭 @@ -111,15 +111,12 @@ public WhetherEnum IsCheck { get; set; } /// <summary> - /// 浠撳簱缂栧彿 - /// </summary> - [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")] - public int WaId { get; set; } - - /// <summary> /// 澶囨敞 /// </summary> [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")] public string Remark { get; set; } + + [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")] + public int WarehouseId { get; set; } } } -- Gitblit v1.9.3