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.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
index aa80961..4031f2b 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
@@ -12,7 +12,7 @@
[Description("Primary:ID")]
[Serializable]
[SugarTable("MES_ROUTE")]
- public class MES_ROUTE : DbEntity
+ public class MES_ROUTE : DbEntityWithAuth
{
#region 构造函数
/// <summary>
@@ -23,7 +23,7 @@
#region 公共属性
/// <summary>
- /// 工艺路线代码
+ /// 工艺路线编码
/// </summary>
public string ROT_CODE { get; set; }
/// <summary>
@@ -31,13 +31,13 @@
/// </summary>
public string ROT_NAME { get; set; }
/// <summary>
- /// 工艺路线类型
+ /// 工艺路线类型(0Normal默认|1Rework返工)
/// </summary>
- public string ROT_TYPE { get; set; }
+ public int ROT_TYPE { get; set; }
/// <summary>
/// 工艺路线版本
/// </summary>
- public string ROT_VER { get; set; }
+ public double ROT_VER { get; set; }
/// <summary>
/// 是否启用(Y/N)
/// </summary>
@@ -55,6 +55,20 @@
*/
#endregion
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_ROUTE类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_ROUTEId))]//ClassA表中的MES_ROUTEId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_ROUTEId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
#region 枚举变量
/*例子
public enum FieldNames
@@ -65,6 +79,13 @@
Enum1,
}
*/
+ public enum ROT_TYPEs
+ {
+ [Description("正常")]
+ Normal,
+ [Description("返工")]
+ Rework,
+ }
#endregion
#region 公共方法
@@ -73,10 +94,11 @@
}//endClass
- public class RouterData
+ public class RouteData
{
public MES_ROUTE route { get; set; }
public List<MES_ROUTE_NODE> nodes { get; set; }
public List<MES_ROUTE_EDGE> edges { get; set; }
+ public List<MES_ROUTE_NODE_ACT> acts { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3