From fa1be5dfce8ad7c956cc9329174fad068c58a458 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 13 六月 2024 21:01:27 +0800
Subject: [PATCH] 优化实体
---
Tiger.Business/BizSettings.json | 2
Tiger.Model.Net/Entitys/SYS/SYS_USERGROUP_ROLE.cs | 1
Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs | 84 +++++++++++++++++++++---------------------
3 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/Tiger.Business/BizSettings.json b/Tiger.Business/BizSettings.json
index e83d93b..b69dc56 100644
--- a/Tiger.Business/BizSettings.json
+++ b/Tiger.Business/BizSettings.json
@@ -27,7 +27,7 @@
"DbType": "SqlServer",
//"ConnectionString": "server=172.18.8.57;uid=sa;pwd=bmsEia9IS4VByWJr;database=SharetronicWmsDb_DGSC;",
//"ConnectionString": "server=172.16.80.40;uid=sa;pwd=Yada@321654;database=MES;"
- "ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=master;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False"
+ "ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=MES;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False"
//"DbType": "Sqlite",
//"ConnectionString": "DataSource=..\\apidata\\Automate.db"
//"DbType": "MySql",
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs
index b0bcc25..8a27b52 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs
@@ -7,134 +7,134 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：工艺路线连线
+ /// 瀹炰綋锛氬伐鑹鸿矾绾胯繛绾�
/// </summary>
[Description("Primary:ID")]
[Serializable]
[SugarTable("MES_ROUTE_EDGE")]
public class MES_ROUTE_EDGE : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：工艺路线连线
+ /// 瀹炰綋锛氬伐鑹鸿矾绾胯繛绾�
/// </summary>
public MES_ROUTE_EDGE() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 连线名称
+ /// 杩炵嚎鍚嶇О
/// </summary>
public string EDGE_NAME { get; set; }
/// <summary>
- /// 工艺路线ID
+ /// 宸ヨ壓璺嚎ID
/// </summary>
public string ROT_ID { get; set; }
/// <summary>
- /// 源节点编码
+ /// 婧愯妭鐐圭紪鐮�
/// </summary>
public string SRC_NODE { get; set; }
/// <summary>
- /// 目标节点编码
+ /// 鐩爣鑺傜偣缂栫爜
/// </summary>
public string TGT_NODE { get; set; }
/// <summary>
- /// 绘图属性：type
+ /// 缁樺浘灞炴�э細type
/// </summary>
public string GPH_TYPE { get; set; }
/// <summary>
- /// 绘图属性：startPoint: x
+ /// 缁樺浘灞炴�э細startPoint: x
/// </summary>
public double GPH_SRC_X { get; set; }
/// <summary>
- /// 绘图属性：startPoint: y
+ /// 缁樺浘灞炴�э細startPoint: y
/// </summary>
public double GPH_SRC_Y { get; set; }
/// <summary>
- /// 绘图属性：endPoint: x
+ /// 缁樺浘灞炴�э細endPoint: x
/// </summary>
public double GPH_TGT_X { get; set; }
/// <summary>
- /// 绘图属性：endPoint: y
+ /// 缁樺浘灞炴�э細endPoint: y
/// </summary>
public double GPH_TGT_Y { get; set; }
/// <summary>
- /// 绘图属性：properties
+ /// 缁樺浘灞炴�э細properties
/// </summary>
public string GPH_PROP { get; set; }
/// <summary>
- /// 绘图属性：pointsList
+ /// 缁樺浘灞炴�э細pointsList
/// </summary>
public string GPH_POTS { get; set; }
/// <summary>
- /// 连线类型(0Normal默认连线|1BackFlow回流连线|2Repair维修连线)
+ /// 杩炵嚎绫诲瀷(0Normal榛樿杩炵嚎|1BackFlow鍥炴祦杩炵嚎|2Repair缁翠慨杩炵嚎)
/// </summary>
- public int EDGE_TYPE { get; set; }
+ //public int EDGE_TYPE { get; set; }
/// <summary>
- /// 设置值1
+ /// 璁剧疆鍊�1
/// </summary>
public string OPTION_1 { get; set; }
/// <summary>
- /// 设置值2
+ /// 璁剧疆鍊�2
/// </summary>
public string OPTION_2 { get; set; }
/// <summary>
- /// 设置值3
+ /// 璁剧疆鍊�3
/// </summary>
public string OPTION_3 { get; set; }
/// <summary>
- /// 设置值4
+ /// 璁剧疆鍊�4
/// </summary>
public string OPTION_4 { get; set; }
/// <summary>
- /// 设置值5
+ /// 璁剧疆鍊�5
/// </summary>
public string OPTION_5 { get; set; }
/// <summary>
- /// 备注
+ /// 澶囨敞
/// </summary>
public string REMARK { get; set; }
#endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
/// <summary>
- /// 边
+ /// 杈�
/// </summary>
[SugarColumn(IsIgnore = true)]
public edge edge { get; set; }
#endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_ROUTE_EDGE类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_ROUTE_EDGEId))]//ClassA表中的MES_ROUTE_EDGEId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_ROUTE_EDGEId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_ROUTE_EDGE绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_ROUTE_EDGEId))]//ClassA琛ㄤ腑鐨凪ES_ROUTE_EDGEId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_ROUTE_EDGEId), 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
diff --git a/Tiger.Model.Net/Entitys/SYS/SYS_USERGROUP_ROLE.cs b/Tiger.Model.Net/Entitys/SYS/SYS_USERGROUP_ROLE.cs
index 54f9213..94c4267 100644
--- a/Tiger.Model.Net/Entitys/SYS/SYS_USERGROUP_ROLE.cs
+++ b/Tiger.Model.Net/Entitys/SYS/SYS_USERGROUP_ROLE.cs
@@ -32,7 +32,6 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string ROLE_CODE { get; set; }
- [SugarColumn(IsPrimaryKey = true)]
#endregion
#region 铏氭嫙灞炴��
--
Gitblit v1.9.3