From e14fe1c9f7753de8bad65b193843748429d6dde1 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 04 八月 2024 17:54:53 +0800
Subject: [PATCH] 修改包装行为的打印模板获取方法
---
Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs | 154 ++++++++++++++++++++++++++++++---------------------
1 files changed, 91 insertions(+), 63 deletions(-)
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..3c82390 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,49 +54,59 @@
[DisplayName("宸ュ簭鑺傜偣ID")]
public string NODE_ID { get; set; }
/// <summary>
- /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)
+ /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
/// </summary>
- [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)")]
+ [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)")]
public int ACT_TYPE { get; set; }
+ /// <summary>
+ /// 琛屼负缂栫爜
+ /// </summary>
+ [DisplayName("琛屼负缂栫爜")]
+ public string ACT_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_ACTIVE { get; set; }
+ /// <summary>
+ /// 鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)")]
+ public string NEED_SETUP { get; set; }
/// <summary>
- /// 琛屼负瀹氫箟缂栫爜
+ /// 鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)
/// </summary>
- [DisplayName("琛屼负瀹氫箟缂栫爜")]
- public string ACT_CODE { get; set; }
+ [DisplayName("鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)")]
+ public string NEED_RESET { get; set; }
/// <summary>
- /// 鎵爜楠岃瘉锛氭潯鐮佽鍒�
+ /// 璁剧疆鍊�1
/// </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")]
+ [DisplayName("璁剧疆鍊�1")]
public string OPTION_1 { get; set; }
/// <summary>
/// 璁剧疆鍊�2
@@ -118,27 +128,22 @@
/// </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("澶囨敞")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -149,10 +154,12 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ [Navigate(NavigateType.OneToOne, nameof(ACT_CODE), nameof(MES_CUSTOM_ACT.ACT_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public MES_CUSTOM_ACT Definition { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -161,6 +168,27 @@
Enum1,
}
*/
+
+ /// <summary>
+ /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </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 = 6,
+ }
#endregion
#region 鍏叡鏂规硶
--
Gitblit v1.9.3