From 17eb66608a95f38f6482fa99ba3659255869ba64 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 17 六月 2024 00:22:35 +0800
Subject: [PATCH] 增加工单流程实体

---
 Tiger.Api/Controllers/Test/TestController.R.cs |    6 
 Tiger.Model.Net/Entitys/MES/MES_WO_EDGE.cs     |  166 ++++++++++++++++++
 Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs     |  186 ++++++++++++++++++++
 Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs |  176 +++++++++++--------
 Tiger.Model.Net/Tiger.Model.Net.csproj         |    2 
 Tiger.Business/BizSettings.json                |    3 
 6 files changed, 460 insertions(+), 79 deletions(-)

diff --git a/Tiger.Api/Controllers/Test/TestController.R.cs b/Tiger.Api/Controllers/Test/TestController.R.cs
index b184f61..10a486a 100644
--- a/Tiger.Api/Controllers/Test/TestController.R.cs
+++ b/Tiger.Api/Controllers/Test/TestController.R.cs
@@ -159,8 +159,8 @@
             //Biz.Db.Insertable(data, "Interface").ExecuteCommand();
 
             var root = new SugarParameter("root", "system01");
-            var dt = Biz.Db.Ado.UseStoredProcedure().GetDataTable("PKG_SYS_GET_MENU", root);//杩斿洖dt
-            var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<SYS_MENU>("PKG_SYS_GET_MENU", root);//杩斿洖List
+            var dt = Biz.Db.Ado.UseStoredProcedure().GetDataTable("SP_SYS_GET_MENU", root);//杩斿洖dt
+            var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<SYS_MENU>("SP_SYS_GET_MENU", root);//杩斿洖List
             ;
             //var data = Biz.Db.Queryable<BIZ_SRM_DLVY>()
             //    .IncludesAllFirstLayer()
@@ -190,7 +190,7 @@
             //{
             //    throw dbTran.ErrorException;
             //}
-            return Ok("");
+            return Ok(data);
         }
         /// <summary>
         /// 
diff --git a/Tiger.Business/BizSettings.json b/Tiger.Business/BizSettings.json
index b69dc56..f435cf1 100644
--- a/Tiger.Business/BizSettings.json
+++ b/Tiger.Business/BizSettings.json
@@ -27,7 +27,8 @@
       "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=MES;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False"
+      "ConnectionString": "server=(localdb)\\MSSQLLocalDB;uid=sa;pwd=p@ssw0rd;database=MES;"
+      //"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_WO_EDGE.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_EDGE.cs
new file mode 100644
index 0000000..371a625
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_EDGE.cs
@@ -0,0 +1,166 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：工单路线连线
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("工单路线连线")]
+	[Serializable]
+	[SugarTable("MES_WO_EDGE")]
+	public class MES_WO_EDGE : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：工单路线连线
+		/// </summary>
+		public MES_WO_EDGE() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 关联工单号
+		/// </summary>
+		[DisplayName("关联工单号")]
+		public string WORK_ORDER { get; set; }
+		/// <summary>
+		/// 产品编码
+		/// </summary>
+		[DisplayName("产品编码")]
+		public string PROD_CODE { get; set; }
+		/// <summary>
+		/// 客户编码
+		/// </summary>
+		[DisplayName("客户编码")]
+		public string CUST_CODE { get; set; }
+		/// <summary>
+		/// 连线名称
+		/// </summary>
+		[DisplayName("连线名称")]
+		public string EDGE_NAME { get; set; }
+		/// <summary>
+		/// 工艺路线ID
+		/// </summary>
+		[DisplayName("工艺路线ID")]
+		public string ROT_ID { get; set; }
+		/// <summary>
+		/// 源节点编码
+		/// </summary>
+		[DisplayName("源节点编码")]
+		public string SRC_NODE { get; set; }
+		/// <summary>
+		/// 目标节点编码
+		/// </summary>
+		[DisplayName("目标节点编码")]
+		public string TGT_NODE { get; set; }
+		/// <summary>
+		/// 绘图属性：type
+		/// </summary>
+		[DisplayName("绘图属性：type")]
+		public string GPH_TYPE { get; set; }
+		/// <summary>
+		/// 绘图属性：startPoint: x
+		/// </summary>
+		[DisplayName("绘图属性：startPoint: x")]
+		public double GPH_SRC_X { get; set; }
+		/// <summary>
+		/// 绘图属性：startPoint: y
+		/// </summary>
+		[DisplayName("绘图属性：startPoint: y")]
+		public double GPH_SRC_Y { get; set; }
+		/// <summary>
+		/// 绘图属性：endPoint: x
+		/// </summary>
+		[DisplayName("绘图属性：endPoint: x")]
+		public double GPH_TGT_X { get; set; }
+		/// <summary>
+		/// 绘图属性：endPoint: y
+		/// </summary>
+		[DisplayName("绘图属性：endPoint: y")]
+		public double GPH_TGT_Y { get; set; }
+		/// <summary>
+		/// 绘图属性：properties
+		/// </summary>
+		[DisplayName("绘图属性：properties")]
+		public string GPH_PROP { get; set; }
+		/// <summary>
+		/// 绘图属性：pointsList
+		/// </summary>
+		[DisplayName("绘图属性：pointsList")]
+		public string GPH_POTS { get; set; }
+		/// <summary>
+		/// 设置值1
+		/// </summary>
+		[DisplayName("设置值1")]
+		public string OPTION_1 { get; set; }
+		/// <summary>
+		/// 设置值2
+		/// </summary>
+		[DisplayName("设置值2")]
+		public string OPTION_2 { get; set; }
+		/// <summary>
+		/// 设置值3
+		/// </summary>
+		[DisplayName("设置值3")]
+		public string OPTION_3 { get; set; }
+		/// <summary>
+		/// 设置值4
+		/// </summary>
+		[DisplayName("设置值4")]
+		public string OPTION_4 { get; set; }
+		/// <summary>
+		/// 设置值5
+		/// </summary>
+		[DisplayName("设置值5")]
+		public string OPTION_5 { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WO_EDGE类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_EDGEId))]//ClassA表中的MES_WO_EDGEId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_EDGEId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
new file mode 100644
index 0000000..263291b
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
@@ -0,0 +1,186 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：工单路线节点
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("工单路线节点")]
+	[Serializable]
+	[SugarTable("MES_WO_NODE")]
+	public class MES_WO_NODE : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：工单路线节点
+		/// </summary>
+		public MES_WO_NODE() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 关联工单号
+		/// </summary>
+		[DisplayName("关联工单号")]
+		public string WORK_ORDER { get; set; }
+		/// <summary>
+		/// 产品编码
+		/// </summary>
+		[DisplayName("产品编码")]
+		public string PROD_CODE { get; set; }
+		/// <summary>
+		/// 客户编码
+		/// </summary>
+		[DisplayName("客户编码")]
+		public string CUST_CODE { get; set; }
+		/// <summary>
+		/// 节点名称
+		/// </summary>
+		[DisplayName("节点名称")]
+		public string NODE_NAME { get; set; }
+		/// <summary>
+		/// 工艺路线ID
+		/// </summary>
+		[DisplayName("工艺路线ID")]
+		public string ROT_ID { get; set; }
+		/// <summary>
+		/// 工段
+		/// </summary>
+		[DisplayName("工段")]
+		public string SEGMENT { get; set; }
+		/// <summary>
+		/// 工序编码
+		/// </summary>
+		[DisplayName("工序编码")]
+		public string OPER_CODE { get; set; }
+		/// <summary>
+		/// 绘图属性：type
+		/// </summary>
+		[DisplayName("绘图属性：type")]
+		public string GPH_TYPE { get; set; }
+		/// <summary>
+		/// 绘图属性：x
+		/// </summary>
+		[DisplayName("绘图属性：x")]
+		public double GPH_X { get; set; }
+		/// <summary>
+		/// 绘图属性：y
+		/// </summary>
+		[DisplayName("绘图属性：y")]
+		public double GPH_Y { get; set; }
+		/// <summary>
+		/// 绘图属性：properties
+		/// </summary>
+		[DisplayName("绘图属性：properties")]
+		public string GPH_PROP { get; set; }
+		/// <summary>
+		/// 绘图属性：text
+		/// </summary>
+		[DisplayName("绘图属性：text")]
+		public string GPH_TEXT { get; set; }
+		/// <summary>
+		/// 是否第一个节点(Y/N)
+		/// </summary>
+		[DisplayName("是否第一个节点(Y/N)")]
+		public string IS_FIRST_NODE { get; set; }
+		/// <summary>
+		/// 是否启用(Y/N)
+		/// </summary>
+		[DisplayName("是否启用(Y/N)")]
+		public string IS_ACTIVE { get; set; }
+		/// <summary>
+		/// `
+		/// </summary>
+		[DisplayName("`")]
+		public string IS_CALC_FPY { get; set; }
+		/// <summary>
+		/// 是否允许跳站(Y/N)
+		/// </summary>
+		[DisplayName("是否允许跳站(Y/N)")]
+		public string CAN_SKIP { get; set; }
+		/// <summary>
+		/// 是否投入站(Y/N)
+		/// </summary>
+		[DisplayName("是否投入站(Y/N)")]
+		public string IS_INPUT { get; set; }
+		/// <summary>
+		/// 是否产出站(Y/N)
+		/// </summary>
+		[DisplayName("是否产出站(Y/N)")]
+		public string IS_OUTPUT { get; set; }
+		/// <summary>
+		/// 设置值1
+		/// </summary>
+		[DisplayName("设置值1")]
+		public string OPTION_1 { get; set; }
+		/// <summary>
+		/// 设置值2
+		/// </summary>
+		[DisplayName("设置值2")]
+		public string OPTION_2 { get; set; }
+		/// <summary>
+		/// 设置值3
+		/// </summary>
+		[DisplayName("设置值3")]
+		public string OPTION_3 { get; set; }
+		/// <summary>
+		/// 设置值4
+		/// </summary>
+		[DisplayName("设置值4")]
+		public string OPTION_4 { get; set; }
+		/// <summary>
+		/// 设置值5
+		/// </summary>
+		[DisplayName("设置值5")]
+		public string OPTION_5 { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WO_NODE类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODEId))]//ClassA表中的MES_WO_NODEId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODEId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
index 5f62d80..44d4073 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
@@ -7,163 +7,189 @@
 namespace Tiger.Model
 {
 	/// <summary>
-	/// 瀹炰綋锛氬伐鍗曞伐搴忚涓�
+	/// 实体：工单工序行为
 	/// </summary>
 	[Description("Primary:ID")]
-	[DisplayName("宸ュ崟宸ュ簭琛屼负")]
+	[DisplayName("工单工序行为")]
 	[Serializable]
 	[SugarTable("MES_WO_NODE_ACT")]
 	public class MES_WO_NODE_ACT : DbEntityWithAuth
 	{
-		#region 鏋勯�犲嚱鏁�
+		#region 构造函数
 		/// <summary>
-		/// 瀹炰綋锛氬伐鍗曞伐搴忚涓�
+		/// 实体：工单工序行为
 		/// </summary>
 		public MES_WO_NODE_ACT() {}
 		#endregion
 
-		#region 鍏叡灞炴��
+		#region 公共属性
 		/// <summary>
-		/// 鍏宠仈宸ュ崟鍙�
+		/// 关联工单号
 		/// </summary>
-		[DisplayName("鍏宠仈宸ュ崟鍙�")]
+		[DisplayName("关联工单号")]
 		public string WORK_ORDER { get; set; }
 		/// <summary>
-		/// 浜у搧缂栫爜
+		/// 产品编码
 		/// </summary>
-		[DisplayName("浜у搧缂栫爜")]
+		[DisplayName("产品编码")]
 		public string PROD_CODE { get; set; }
 		/// <summary>
-		/// 瀹㈡埛缂栫爜(鐣欑┖鍒欎笉鍖哄垎瀹㈡埛)
+		/// 客户编码(留空则不区分客户)
 		/// </summary>
-		[DisplayName("瀹㈡埛缂栫爜(鐣欑┖鍒欎笉鍖哄垎瀹㈡埛)")]
+		[DisplayName("客户编码(留空则不区分客户)")]
 		public string CUST_CODE { get; set; }
 		/// <summary>
-		/// 宸ュ簭琛屼负ID
+		/// 工艺工序行为ID
 		/// </summary>
-		[DisplayName("宸ヨ壓宸ュ簭琛屼负ID")]
+		[DisplayName("工艺工序行为ID")]
 		public string ACT_ID { get; set; }
 		/// <summary>
-		/// 宸ヨ壓璺嚎ID
+		/// 工艺路线ID
 		/// </summary>
-		[DisplayName("宸ヨ壓璺嚎ID")]
+		[DisplayName("工艺路线ID")]
 		public string ROT_ID { get; set; }
 		/// <summary>
-		/// 宸ュ簭鑺傜偣ID
+		/// 工序节点ID
 		/// </summary>
-		[DisplayName("宸ュ簭鑺傜偣ID")]
+		[DisplayName("工序节点ID")]
 		public string NODE_ID { get; set; }
 		/// <summary>
-		/// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)
+		/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
 		/// </summary>
-		[DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)")]
+		[DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)")]
 		public int ACT_TYPE { get; set; }
-        /// <summary>
-        /// 琛屼负瀹氫箟缂栫爜
-        /// </summary>
-        [DisplayName("琛屼负瀹氫箟缂栫爜")]
-        public string ACT_CODE { get; set; }
-        /// <summary>
-        /// 鎵爜楠岃瘉锛氭潯鐮佽鍒�
-        /// </summary>
-        [DisplayName("鎵爜楠岃瘉锛氭潯鐮佽鍒�")]
+		/// <summary>
+		/// 行为定义编码
+		/// </summary>
+		[DisplayName("行为定义编码")]
+		public string ACT_CODE { get; set; }
+		/// <summary>
+		/// 扫码验证：条码规则
+		/// </summary>
+		[DisplayName("扫码验证：条码规则")]
 		public string RULE_CODE { get; set; }
 		/// <summary>
-		/// 缁勮涓婃枡锛氱墿鏂欐枡鍙�
+		/// 组装上料：物料料号
 		/// </summary>
-		[DisplayName("缁勮涓婃枡锛氱墿鏂欐枡鍙�")]
+		[DisplayName("组装上料：物料料号")]
 		public string ITEM_CODE { get; set; }
 		/// <summary>
-		/// 浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�
+		/// 产品测试：检验项目编码
 		/// </summary>
-		[DisplayName("浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�")]
+		[DisplayName("产品测试：检验项目编码")]
 		public string TEST_CODE { get; set; }
 		/// <summary>
-		/// 浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�
+		/// 产品抽检：抽样规则编码
 		/// </summary>
-		[DisplayName("浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�")]
+		[DisplayName("产品抽检：抽样规则编码")]
 		public string SAPL_CODE { get; set; }
 		/// <summary>
-		/// 鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�
+		/// 标签打印：标签模板编码
 		/// </summary>
-		[DisplayName("鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�")]
+		[DisplayName("标签打印：标签模板编码")]
 		public string LABEL_CODE { get; set; }
 		/// <summary>
-		/// 鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�
+		/// 包装规则：包装规则编码
 		/// </summary>
-		[DisplayName("鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�")]
+		[DisplayName("包装规则：包装规则编码")]
 		public string PKG_CODE { get; set; }
 		/// <summary>
-		/// 璁剧疆鍊�1
+		/// 是否启用(Y/N)
 		/// </summary>
-		[DisplayName("璁剧疆鍊�1")]
+		[DisplayName("是否启用(Y/N)")]
+		public string IS_ACTIVE { get; set; }
+		/// <summary>
+		/// 设置值1
+		/// </summary>
+		[DisplayName("设置值1")]
 		public string OPTION_1 { get; set; }
 		/// <summary>
-		/// 璁剧疆鍊�2
+		/// 设置值2
 		/// </summary>
-		[DisplayName("璁剧疆鍊�2")]
+		[DisplayName("设置值2")]
 		public string OPTION_2 { get; set; }
 		/// <summary>
-		/// 璁剧疆鍊�3
+		/// 设置值3
 		/// </summary>
-		[DisplayName("璁剧疆鍊�3")]
+		[DisplayName("设置值3")]
 		public string OPTION_3 { get; set; }
 		/// <summary>
-		/// 璁剧疆鍊�4
+		/// 设置值4
 		/// </summary>
-		[DisplayName("璁剧疆鍊�4")]
+		[DisplayName("设置值4")]
 		public string OPTION_4 { get; set; }
 		/// <summary>
-		/// 璁剧疆鍊�5
+		/// 设置值5
 		/// </summary>
-		[DisplayName("璁剧疆鍊�5")]
+		[DisplayName("设置值5")]
 		public string OPTION_5 { get; set; }
-        /// <summary>
-        /// 鏄惁璁剧疆瀹屾垚(Y/N)
-        /// </summary>
-        [DisplayName("鏄惁璁剧疆瀹屾垚(Y/N)")]
-        public string SETUP_FINISH { get; set; }
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        [DisplayName("澶囨敞")]
+		/// <summary>
+		/// 是否设置完成(Y/N)
+		/// </summary>
+		[DisplayName("是否设置完成(Y/N)")]
+		public string SETUP_FINISH { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
 		public string REMARK { get; set; }
 		#endregion
 
-		#region 铏氭嫙灞炴��
-		/*渚嬪瓙
+		#region 虚拟属性
+		/*例子
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
 		*/
 		#endregion
 
-		#region 澶栭敭灞炴��
-		/*渚嬪瓙
-		//涓�瀵逛竴澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
-		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		//涓�瀵瑰澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODE_ACTId))]//ClassA琛ㄤ腑鐨凪ES_WO_NODE_ACTId
-		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		//澶氬澶氬閿鑸�
-		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
-		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WO_NODE_ACT类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODE_ACTId))]//ClassA表中的MES_WO_NODE_ACTId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
 		*/
 		#endregion
 
-		#region 鏋氫妇鍙橀噺
-		/*渚嬪瓙
+		#region 枚举变量
+		/*例子
 		public enum FieldNames
 		{
-			[Description("鏋氫妇鎻忚堪0")]
+			[Description("枚举描述0")]
 			Enum0,
-			[Description("鏋氫妇鎻忚堪1")]
+			[Description("枚举描述1")]
 			Enum1,
 		}
 		*/
+
+		/// <summary>
+		/// 枚举：行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
+		/// </summary>
+		public enum ACT_TYPEs
+		{
+			[Description("默认行为")]
+			Normal = 0,
+			[Description("扫码验证")]
+			Scan = 1,
+			[Description("组装上料")]
+			Assy = 2,
+			[Description("产品测试")]
+			Test = 3,
+			[Description("产品抽检")]
+			Audit = 4,
+			[Description("标签打印")]
+			Print = 5,
+			[Description("包装规则")]
+			Package = 5,
+		}
 		#endregion
 
-		#region 鍏叡鏂规硶
+		#region 公共方法
 
 		#endregion
 
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index fa2dbff..916aae0 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -117,6 +117,8 @@
     <Compile Include="Entitys\MES\MES_WIP_ACT.cs" />
     <Compile Include="Entitys\MES\MES_WIP_DATA.cs" />
     <Compile Include="Entitys\MES\MES_WIP_HIS.cs" />
+    <Compile Include="Entitys\MES\MES_WO_EDGE.cs" />
+    <Compile Include="Entitys\MES\MES_WO_NODE.cs" />
     <Compile Include="Entitys\MES\MES_WO_NODE_ACT.cs" />
     <Compile Include="Entitys\MES\node.cs" />
     <Compile Include="Entitys\MES\ParameterEntity\SmtLoadingReturn.cs" />

--
Gitblit v1.9.3