From 976d3ae1547b896cc5c7875408c09616d5c2ee55 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 26 十一月 2024 20:51:17 +0800
Subject: [PATCH] 箱数更新

---
 Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
index 00f0836..b268176 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 int ROT_TYPE { get; set; }
 		/// <summary>
 		/// 工艺路线版本
 		/// </summary>
-		public string ROT_VER { get; set; }
+		public double ROT_VER { get; set; }
 		/// <summary>
 		/// 是否启用(Y/N)
 		/// </summary>
@@ -52,6 +52,26 @@
         /*例子
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
+		*/
+        [SugarColumn(IsIgnore = true)]
+        public string WORK_ORDER { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public string PROD_CODE { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public string CUST_CODE { get; set; }
+        #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
 
@@ -72,18 +92,33 @@
             [Description("返工")]
             Rework,
         }
-        #endregion
+		#endregion
 
-        #region 公共方法
+		#region 公共方法
 
-        #endregion
+		#endregion
 
-    }//endClass
+	}//endClass
 
+	/// <summary>
+	/// 标准工艺路线图实体
+	/// </summary>
     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; }
+    }
+
+	/// <summary>
+	/// 工单工艺路线图实体
+	/// </summary>
+    public class WoRouteData
+    {
+        public MES_ROUTE route { get; set; }
+        public List<MES_WO_NODE> nodes { get; set; }
+        public List<MES_WO_EDGE> edges { get; set; }
+        public List<MES_WO_NODE_ACT> acts { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3