From 6b821f97b2a82c199113d68054b3e3c93f3443aa Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 28 四月 2025 14:19:04 +0800
Subject: [PATCH] 收货行ID类型修改
---
Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 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 ff744e5..504bcc9 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
@@ -98,10 +98,15 @@
/// </summary>
[DisplayName("鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)")]
public string NEED_SETUP { get; set; }
- /// <summary>
- /// 璁剧疆鍊�1
- /// </summary>
- [DisplayName("璁剧疆鍊�1")]
+ /// <summary>
+ /// 鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)
+ /// </summary>
+ [DisplayName("鎵ц鍑洪敊鏃讹紝鏄惁閲嶇疆鏁翠釜宸ュ簭鐨勬搷浣�(Y/N)")]
+ public string NEED_RESET { get; set; }
+ /// <summary>
+ /// 璁剧疆鍊�1
+ /// </summary>
+ [DisplayName("璁剧疆鍊�1")]
public string OPTION_1 { get; set; }
/// <summary>
/// 璁剧疆鍊�2
@@ -128,17 +133,22 @@
/// </summary>
[DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ /// <summary>
+ /// 鑺傜偣
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public node node { get; set; }
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -149,10 +159,14 @@
[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
+ [Navigate(NavigateType.OneToMany, nameof(MES_WO_ACT_VAR.ACT_ID), nameof(ID), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WO_NODE_ACTId
+ public List<MES_WO_ACT_VAR> Variables { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -162,10 +176,10 @@
}
*/
- /// <summary>
- /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
- /// </summary>
- public enum ACT_TYPEs
+ /// <summary>
+ /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </summary>
+ public enum ACT_TYPEs
{
[Description("鑷畾涔夎涓�")]
Normal = 0,
--
Gitblit v1.9.3