From e9bb18343eff6305b0a734784dbe0dc0e589ab05 Mon Sep 17 00:00:00 2001
From: Cloud Zhang <941187371@qq.com>
Date: 星期三, 08 五月 2024 14:39:46 +0800
Subject: [PATCH] 合并
---
Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs
index d98e23b..b0bcc25 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_EDGE.cs
@@ -12,7 +12,7 @@
[Description("Primary:ID")]
[Serializable]
[SugarTable("MES_ROUTE_EDGE")]
- public class MES_ROUTE_EDGE : DbEntity
+ public class MES_ROUTE_EDGE : DbEntityWithAuth
{
#region 构造函数
/// <summary>
@@ -23,23 +23,19 @@
#region 公共属性
/// <summary>
- /// 连线代码
- /// </summary>
- public string EDGE_CODE { get; set; }
- /// <summary>
/// 连线名称
/// </summary>
public string EDGE_NAME { get; set; }
/// <summary>
- /// 工艺路线代码
+ /// 工艺路线ID
/// </summary>
- public string ROT_CODE { get; set; }
+ public string ROT_ID { get; set; }
/// <summary>
- /// 源节点代码
+ /// 源节点编码
/// </summary>
public string SRC_NODE { get; set; }
/// <summary>
- /// 目标节点代码
+ /// 目标节点编码
/// </summary>
public string TGT_NODE { get; set; }
/// <summary>
@@ -49,19 +45,19 @@
/// <summary>
/// 绘图属性：startPoint: x
/// </summary>
- public decimal GPH_SRC_X { get; set; }
+ public double GPH_SRC_X { get; set; }
/// <summary>
/// 绘图属性：startPoint: y
/// </summary>
- public decimal GPH_SRC_Y { get; set; }
+ public double GPH_SRC_Y { get; set; }
/// <summary>
/// 绘图属性：endPoint: x
/// </summary>
- public decimal GPH_TGT_X { get; set; }
+ public double GPH_TGT_X { get; set; }
/// <summary>
/// 绘图属性：endPoint: y
/// </summary>
- public decimal GPH_TGT_Y { get; set; }
+ public double GPH_TGT_Y { get; set; }
/// <summary>
/// 绘图属性：properties
/// </summary>
@@ -71,20 +67,63 @@
/// </summary>
public string GPH_POTS { get; set; }
/// <summary>
+ /// 连线类型(0Normal默认连线|1BackFlow回流连线|2Repair维修连线)
+ /// </summary>
+ public int EDGE_TYPE { get; set; }
+ /// <summary>
+ /// 设置值1
+ /// </summary>
+ public string OPTION_1 { get; set; }
+ /// <summary>
+ /// 设置值2
+ /// </summary>
+ public string OPTION_2 { get; set; }
+ /// <summary>
+ /// 设置值3
+ /// </summary>
+ public string OPTION_3 { get; set; }
+ /// <summary>
+ /// 设置值4
+ /// </summary>
+ public string OPTION_4 { get; set; }
+ /// <summary>
+ /// 设置值5
+ /// </summary>
+ public string OPTION_5 { get; set; }
+ /// <summary>
/// 备注
/// </summary>
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ /// <summary>
+ /// 边
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public edge edge { get; set; }
+ #endregion
- #region 枚举变量
- /*例子
+ #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
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
[Description("枚举描述0")]
@@ -93,11 +132,11 @@
Enum1,
}
*/
- #endregion
+ #endregion
- #region 公共方法
+ #region 公共方法
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3