From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Model.Net/Entitys/MES/MES_LINE.cs | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_LINE.cs b/Tiger.Model.Net/Entitys/MES/MES_LINE.cs
index cba7aa5..52b235d 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_LINE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_LINE.cs
@@ -7,89 +7,93 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：产线
+ /// 瀹炰綋锛氫骇绾�
/// </summary>
[Description("Primary:ID")]
[Serializable]
[SugarTable("MES_LINE")]
public class MES_LINE : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：产线
+ /// 瀹炰綋锛氫骇绾�
/// </summary>
public MES_LINE() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 产线编码
+ /// 浜х嚎缂栫爜
/// </summary>
public string LINE_CODE { get; set; }
/// <summary>
- /// 产线名称
+ /// 浜х嚎鍚嶇О
/// </summary>
public string LINE_NAME { get; set; }
/// <summary>
- /// 产线简称
+ /// 浜х嚎绠�绉�
/// </summary>
public string SHORT_NAME { get; set; }
/// <summary>
- /// 产线类型
+ /// 浜х嚎绫诲瀷
/// </summary>
public string LINE_TYPE { get; set; }
/// <summary>
- /// 车间编码
+ /// 杞﹂棿缂栫爜
/// </summary>
public string WS_CODE { get; set; }
/// <summary>
- /// 组织编码
+ /// 缁勭粐缂栫爜
/// </summary>
public string ORG_CODE { get; set; }
+ /// <summary>
+ /// 鐝埗缂栫爜
+ /// </summary>
+ public string SFTS_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鍚敤(Y/N)
+ /// </summary>
+ public string IS_ACTIVE { get; set; }
/// <summary>
- /// 是否启用(Y/N)
- /// </summary>
- public string IS_ACTIVE { get; set; }
- /// <summary>
- /// 备注
+ /// 澶囨敞
/// </summary>
public string REMARK { get; set; }
#endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
#endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_LINE类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_LINEId))]//ClassA表中的MES_LINEId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_LINEId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_LINE绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_LINEId))]//ClassA琛ㄤ腑鐨凪ES_LINEId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_LINEId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
#endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
#endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
#endregion
--
Gitblit v1.9.3