From 01a5cb6f77739630a88fc2f95be694b53ade0d41 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 19 七月 2024 14:14:47 +0800
Subject: [PATCH] 工步修改为支持并行执行行为，优化工步执行逻辑
---
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs | 194 +++++++++++++++++++++++------------------------
1 files changed, 95 insertions(+), 99 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
index c43709b..e1dd128 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
@@ -6,42 +6,43 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氬伐搴忚涓�
- /// </summary>
- [Description("Primary:ID")]
- [Serializable]
- [SugarTable("MES_ROUTE_NODE_ACT")]
- public class MES_ROUTE_NODE_ACT : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氬伐搴忚涓�
- /// </summary>
- public MES_ROUTE_NODE_ACT() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氬伐鑹鸿涓鸿妭鐐�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("宸ヨ壓琛屼负鑺傜偣")]
+ [Serializable]
+ [SugarTable("MES_ROUTE_NODE_ACT")]
+ public class MES_ROUTE_NODE_ACT : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氬伐鑹鸿涓鸿妭鐐�
+ /// </summary>
+ public MES_ROUTE_NODE_ACT() { }
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 琛屼负鍚嶇О
- /// </summary>
- public string ACT_NAME { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎ID
- /// </summary>
- public string ROT_ID { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣ID
- /// </summary>
- public string NODE_ID { get; set; }
- /// <summary>
- /// 宸ュ簭缂栫爜
- /// </summary>
- //public string OPER_CODE { get; set; }
- /// <summary>
- /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
- /// </summary>
- public int ACT_TYPE { get; set; }
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 琛屼负鍚嶇О
+ /// </summary>
+ [DisplayName("琛屼负鍚嶇О")]
+ public string ACT_NAME { 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鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </summary>
+ [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)")]
+ public int ACT_TYPE { get; set; }
/// <summary>
/// 琛屼负缂栫爜
/// </summary>
@@ -50,26 +51,32 @@
/// <summary>
/// 缁樺浘灞炴�э細type
/// </summary>
+ [DisplayName("缁樺浘灞炴�э細type")]
public string GPH_TYPE { get; set; }
- /// <summary>
- /// 缁樺浘灞炴�э細x
- /// </summary>
- public double GPH_X { get; set; }
- /// <summary>
- /// 缁樺浘灞炴�э細y
- /// </summary>
- public double GPH_Y { get; set; }
- /// <summary>
- /// 缁樺浘灞炴�э細properties
- /// </summary>
- public string GPH_PROP { get; set; }
- /// <summary>
- /// 缁樺浘灞炴�э細text
- /// </summary>
- public string GPH_TEXT { 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_ACTIVE { get; set; }
/// <summary>
/// 鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)
@@ -77,45 +84,40 @@
[DisplayName("鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)")]
public string NEED_SETUP { get; set; }
/// <summary>
- /// 鑷畾涔夋柟娉曠被鍨�(0ServerMethod鏈嶅姟绔柟娉晐1WebApiWebApi鏂规硶|2StoredProcedure瀛樺偍杩囩▼)
+ /// 鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)
/// </summary>
- // public int DO_TYPE { get; set; }
- ///// <summary>
- ///// 鑷畾涔夋柟娉�(璋冪敤鏂规硶鐨勫叏鍚�)
- ///// </summary>
- //public string DO_METHOD { get; set; }
- ///// <summary>
- ///// 閫氳繃鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)
- ///// </summary>
- //public string DO_IF_PASS { get; set; }
- ///// <summary>
- ///// 澶辫触鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)
- ///// </summary>
- //public string DO_IF_FAIL { 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; }
+ [DisplayName("鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)")]
+ public string NEED_RESET { 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 铏氭嫙灞炴��
@@ -154,6 +156,10 @@
Enum1,
}
*/
+
+ /// <summary>
+ /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </summary>
public enum ACT_TYPEs
{
[Description("鑷畾涔夎涓�")]
@@ -170,16 +176,6 @@
Print = 5,
[Description("鍖呰瑙勫垯")]
Package = 6,
- }
-
- public enum DO_TYPEs
- {
- [Description("鏈嶅姟绔柟娉�")]
- ServerMethod,
- [Description("WebApi鏂规硶")]
- WebApi,
- [Description("瀛樺偍杩囩▼")]
- StoredProcedure,
}
#endregion
--
Gitblit v1.9.3