From 5ee1d101de8685e8a86d8653c74fff9087175429 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 六月 2024 17:10:23 +0800
Subject: [PATCH] 更新实体

---
 /dev/null                                      |  166 ---------------
 Tiger.Model.Net/Entitys/MES/MES_PROD_ACTION.cs |  192 +++++++++++++++++
 Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs     |    4 
 Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs |   73 +++---
 Tiger.Model.Net/Tiger.Model.Net.csproj         |    3 
 Tiger.Model.Net/Entitys/MES/MES_WO_ACTION.cs   |  197 +++++++++++++++++
 6 files changed, 426 insertions(+), 209 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/MES_PROD_ACTION.cs b/Tiger.Model.Net/Entitys/MES/MES_PROD_ACTION.cs
new file mode 100644
index 0000000..8df7c8c
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_PROD_ACTION.cs
@@ -0,0 +1,192 @@
+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_PROD_ACTION")]
+	public class MES_PROD_ACTION : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：产品工序行为
+		/// </summary>
+		public MES_PROD_ACTION() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 产品编码
+		/// </summary>
+		[DisplayName("产品编码")]
+		public string PROD_CODE { get; set; }
+		/// <summary>
+		/// 客户编码(留空则不区分客户)
+		/// </summary>
+		[DisplayName("客户编码(留空则不区分客户)")]
+		public string CUST_CODE { get; set; }
+		/// <summary>
+		/// 工艺工序行为ID
+		/// </summary>
+		[DisplayName("工艺工序行为ID")]
+		public string ACT_ID { get; set; }
+		/// <summary>
+		/// 工艺路线ID
+		/// </summary>
+		[DisplayName("工艺路线ID")]
+		public string ROT_ID { get; set; }
+		/// <summary>
+		/// 工序节点ID
+		/// </summary>
+		[DisplayName("工序节点ID")]
+		public string NODE_ID { get; set; }
+		/// <summary>
+		/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
+		/// </summary>
+		[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("扫码验证：条码规则")]
+		public string RULE_CODE { get; set; }
+		/// <summary>
+		/// 组装上料：物料料号
+		/// </summary>
+		[DisplayName("组装上料：物料料号")]
+		public string ITEM_CODE { get; set; }
+		/// <summary>
+		/// 产品测试：检验项目编码
+		/// </summary>
+		[DisplayName("产品测试：检验项目编码")]
+		public string TEST_CODE { get; set; }
+		/// <summary>
+		/// 产品抽检：抽样规则编码
+		/// </summary>
+		[DisplayName("产品抽检：抽样规则编码")]
+		public string SAPL_CODE { get; set; }
+		/// <summary>
+		/// 标签打印：标签模板编码
+		/// </summary>
+		[DisplayName("标签打印：标签模板编码")]
+		public string LABEL_CODE { get; set; }
+		/// <summary>
+		/// 包装规则：包装规则编码
+		/// </summary>
+		[DisplayName("包装规则：包装规则编码")]
+		public string PKG_CODE { get; set; }
+		/// <summary>
+		/// 是否启用(Y/N)
+		/// </summary>
+		[DisplayName("是否启用(Y/N)")]
+		public string IS_ACTIVE { 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>
+		/// 是否设置完成(Y/N)
+		/// </summary>
+		[DisplayName("是否设置完成(Y/N)")]
+		public string SETUP_FINISH { 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_PROD_ACTION类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_ACTIONId))]//ClassA表中的MES_PROD_ACTIONId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_ACTIONId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[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 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
deleted file mode 100644
index c8146c5..0000000
--- a/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-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_PROD_NODE_ACT")]
-    public class MES_PROD_NODE_ACT : DbEntityWithAuth
-    {
-        #region 鏋勯�犲嚱鏁�
-        /// <summary>
-        /// 瀹炰綋锛氫骇鍝佸伐搴忚涓�
-        /// </summary>
-        public MES_PROD_NODE_ACT() { }
-        #endregion
-
-        #region 鍏叡灞炴��
-        /// <summary>
-        /// 浜у搧缂栫爜
-        /// </summary>
-        [DisplayName("浜у搧缂栫爜")]
-        public string PROD_CODE { get; set; }
-        /// <summary>
-        /// 瀹㈡埛缂栫爜(鐣欑┖鍒欎笉鍖哄垎瀹㈡埛)
-        /// </summary>
-        [DisplayName("瀹㈡埛缂栫爜(鐣欑┖鍒欎笉鍖哄垎瀹㈡埛)")]
-        public string CUST_CODE { get; set; }
-        /// <summary>
-        /// 宸ュ簭琛屼负ID
-        /// </summary>
-        [DisplayName("宸ヨ壓宸ュ簭琛屼负ID")]
-        public string ACT_ID { get; set; }
-        /// <summary>
-        /// 宸ヨ壓璺嚎ID
-        /// </summary>
-        [DisplayName("宸ヨ壓璺嚎ID")]
-        public string ROT_ID { get; set; }
-        /// <summary>
-        /// 宸ュ簭鑺傜偣ID
-        /// </summary>
-        [DisplayName("宸ュ簭鑺傜偣ID")]
-        public string NODE_ID { get; set; }
-        /// <summary>
-        /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)
-        /// </summary>
-        [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("鎵爜楠岃瘉锛氭潯鐮佽鍒�")]
-        public string RULE_CODE { get; set; }
-        /// <summary>
-        /// 缁勮涓婃枡锛氱墿鏂欐枡鍙�
-        /// </summary>
-        [DisplayName("缁勮涓婃枡锛氱墿鏂欐枡鍙�")]
-        public string ITEM_CODE { get; set; }
-        /// <summary>
-        /// 浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�
-        /// </summary>
-        [DisplayName("浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�")]
-        public string TEST_CODE { get; set; }
-        /// <summary>
-        /// 浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�
-        /// </summary>
-        [DisplayName("浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�")]
-        public string SAPL_CODE { get; set; }
-        /// <summary>
-        /// 鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�
-        /// </summary>
-        [DisplayName("鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�")]
-        public string LABEL_CODE { get; set; }
-        /// <summary>
-        /// 鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�
-        /// </summary>
-        [DisplayName("鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�")]
-        public string PKG_CODE { 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>
-        /// 鏄惁璁剧疆瀹屾垚(Y/N)
-        /// </summary>
-        [DisplayName("鏄惁璁剧疆瀹屾垚(Y/N)")]
-        public string SETUP_FINISH { 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鏄疢ES_PROD_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
-		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		//涓�瀵瑰澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_NODE_ACTId))]//ClassA琛ㄤ腑鐨凪ES_PROD_NODE_ACTId
-		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		//澶氬澶氬閿鑸�
-		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_NODE_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
-		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		*/
-        #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_ACTION.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_ACTION.cs
new file mode 100644
index 0000000..a110e09
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_ACTION.cs
@@ -0,0 +1,197 @@
+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_ACTION")]
+	public class MES_WO_ACTION : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：工单工序行为
+		/// </summary>
+		public MES_WO_ACTION() {}
+		#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>
+		/// 工单行为节点ID
+		/// </summary>
+		[DisplayName("工单行为节点ID")]
+		public string ROT_ID { get; set; }
+		/// <summary>
+		/// 工艺路线ID
+		/// </summary>
+		[DisplayName("工艺路线ID")]
+		public string NODE_ID { get; set; }
+		/// <summary>
+		/// 工单路线节点ID
+		/// </summary>
+		[DisplayName("工单路线节点ID")]
+		public string ACT_ID { get; set; }
+		/// <summary>
+		/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
+		/// </summary>
+		[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("扫码验证：条码规则")]
+		public string RULE_CODE { get; set; }
+		/// <summary>
+		/// 组装上料：物料料号
+		/// </summary>
+		[DisplayName("组装上料：物料料号")]
+		public string ITEM_CODE { get; set; }
+		/// <summary>
+		/// 产品测试：检验项目编码
+		/// </summary>
+		[DisplayName("产品测试：检验项目编码")]
+		public string TEST_CODE { get; set; }
+		/// <summary>
+		/// 产品抽检：抽样规则编码
+		/// </summary>
+		[DisplayName("产品抽检：抽样规则编码")]
+		public string SAPL_CODE { get; set; }
+		/// <summary>
+		/// 标签打印：标签模板编码
+		/// </summary>
+		[DisplayName("标签打印：标签模板编码")]
+		public string LABEL_CODE { get; set; }
+		/// <summary>
+		/// 包装规则：包装规则编码
+		/// </summary>
+		[DisplayName("包装规则：包装规则编码")]
+		public string PKG_CODE { get; set; }
+		/// <summary>
+		/// 是否启用(Y/N)
+		/// </summary>
+		[DisplayName("是否启用(Y/N)")]
+		public string IS_ACTIVE { 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>
+		/// 是否设置完成(Y/N)
+		/// </summary>
+		[DisplayName("是否设置完成(Y/N)")]
+		public string SETUP_FINISH { 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_ACTION类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_ACTIONId))]//ClassA表中的MES_WO_ACTIONId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_ACTIONId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[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 公共方法
+
+		#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
index 263291b..92763d0 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
@@ -94,9 +94,9 @@
 		[DisplayName("是否启用(Y/N)")]
 		public string IS_ACTIVE { get; set; }
 		/// <summary>
-		/// `
+		/// 是否计算直通率(Y/N)
 		/// </summary>
-		[DisplayName("`")]
+		[DisplayName("是否计算直通率(Y/N)")]
 		public string IS_CALC_FPY { get; set; }
 		/// <summary>
 		/// 是否允许跳站(Y/N)
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 44d4073..dfe5a6f 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
@@ -7,17 +7,17 @@
 namespace Tiger.Model
 {
 	/// <summary>
-	/// 实体：工单工序行为
+	/// 实体：工单行为节点
 	/// </summary>
 	[Description("Primary:ID")]
-	[DisplayName("工单工序行为")]
+	[DisplayName("工单行为节点")]
 	[Serializable]
 	[SugarTable("MES_WO_NODE_ACT")]
 	public class MES_WO_NODE_ACT : DbEntityWithAuth
 	{
 		#region 构造函数
 		/// <summary>
-		/// 实体：工单工序行为
+		/// 实体：工单行为节点
 		/// </summary>
 		public MES_WO_NODE_ACT() {}
 		#endregion
@@ -34,15 +34,15 @@
 		[DisplayName("产品编码")]
 		public string PROD_CODE { get; set; }
 		/// <summary>
-		/// 客户编码(留空则不区分客户)
+		/// 客户编码
 		/// </summary>
-		[DisplayName("客户编码(留空则不区分客户)")]
+		[DisplayName("客户编码")]
 		public string CUST_CODE { get; set; }
 		/// <summary>
-		/// 工艺工序行为ID
+		/// 行为名称
 		/// </summary>
-		[DisplayName("工艺工序行为ID")]
-		public string ACT_ID { get; set; }
+		[DisplayName("行为名称")]
+		public string ACT_NAME { get; set; }
 		/// <summary>
 		/// 工艺路线ID
 		/// </summary>
@@ -54,50 +54,50 @@
 		[DisplayName("工序节点ID")]
 		public string NODE_ID { get; set; }
 		/// <summary>
-		/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
+		/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
 		/// </summary>
-		[DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)")]
+		[DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)")]
 		public int ACT_TYPE { get; set; }
 		/// <summary>
-		/// 行为定义编码
+		/// 行为编码
 		/// </summary>
-		[DisplayName("行为定义编码")]
+		[DisplayName("行为编码")]
 		public string ACT_CODE { get; set; }
 		/// <summary>
-		/// 扫码验证：条码规则
+		/// 绘图属性：type
 		/// </summary>
-		[DisplayName("扫码验证：条码规则")]
-		public string RULE_CODE { get; set; }
+		[DisplayName("绘图属性：type")]
+		public string GPH_TYPE { get; set; }
 		/// <summary>
-		/// 组装上料：物料料号
+		/// 绘图属性：x
 		/// </summary>
-		[DisplayName("组装上料：物料料号")]
-		public string ITEM_CODE { get; set; }
+		[DisplayName("绘图属性：x")]
+		public double GPH_X { get; set; }
 		/// <summary>
-		/// 产品测试：检验项目编码
+		/// 绘图属性：y
 		/// </summary>
-		[DisplayName("产品测试：检验项目编码")]
-		public string TEST_CODE { get; set; }
+		[DisplayName("绘图属性：y")]
+		public double GPH_Y { get; set; }
 		/// <summary>
-		/// 产品抽检：抽样规则编码
+		/// 绘图属性：properties
 		/// </summary>
-		[DisplayName("产品抽检：抽样规则编码")]
-		public string SAPL_CODE { get; set; }
+		[DisplayName("绘图属性：properties")]
+		public string GPH_PROP { get; set; }
 		/// <summary>
-		/// 标签打印：标签模板编码
+		/// 绘图属性：text
 		/// </summary>
-		[DisplayName("标签打印：标签模板编码")]
-		public string LABEL_CODE { get; set; }
-		/// <summary>
-		/// 包装规则：包装规则编码
-		/// </summary>
-		[DisplayName("包装规则：包装规则编码")]
-		public string PKG_CODE { get; set; }
+		[DisplayName("绘图属性：text")]
+		public string GPH_TEXT { get; set; }
 		/// <summary>
 		/// 是否启用(Y/N)
 		/// </summary>
 		[DisplayName("是否启用(Y/N)")]
 		public string IS_ACTIVE { get; set; }
+		/// <summary>
+		/// 是否设置才能下发生产(Y/N)
+		/// </summary>
+		[DisplayName("是否设置才能下发生产(Y/N)")]
+		public string NEED_SETUP { get; set; }
 		/// <summary>
 		/// 设置值1
 		/// </summary>
@@ -123,11 +123,6 @@
 		/// </summary>
 		[DisplayName("设置值5")]
 		public string OPTION_5 { get; set; }
-		/// <summary>
-		/// 是否设置完成(Y/N)
-		/// </summary>
-		[DisplayName("是否设置完成(Y/N)")]
-		public string SETUP_FINISH { get; set; }
 		/// <summary>
 		/// 备注
 		/// </summary>
@@ -168,7 +163,7 @@
 		*/
 
 		/// <summary>
-		/// 枚举：行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
+		/// 枚举：行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
 		/// </summary>
 		public enum ACT_TYPEs
 		{
@@ -184,8 +179,6 @@
 			Audit = 4,
 			[Description("标签打印")]
 			Print = 5,
-			[Description("包装规则")]
-			Package = 5,
 		}
 		#endregion
 
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 916aae0..a28bb2a 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -107,7 +107,7 @@
     <Compile Include="Entitys\MES\C_Stock_Pallet_T.cs" />
     <Compile Include="Entitys\MES\edge.cs" />
     <Compile Include="Entitys\MES\MES_CUSTOM_ACT.cs" />
-    <Compile Include="Entitys\MES\MES_PROD_NODE_ACT.cs" />
+    <Compile Include="Entitys\MES\MES_PROD_ACTION.cs" />
     <Compile Include="Entitys\MES\MES_ROUTE_NODE_ACT.cs" />
     <Compile Include="Entitys\MES\MES_ROUTE_NODE_DFTG.cs" />
     <Compile Include="Entitys\MES\MES_ROUTE_NODE_POST.cs" />
@@ -117,6 +117,7 @@
     <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_ACTION.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" />

--
Gitblit v1.9.3