From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
index 1f7afce..647f568 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs
@@ -103,10 +103,15 @@
/// </summary>
[DisplayName("鏄惁鍏佽璺崇珯(Y/N)")]
public string CAN_SKIP { get; set; }
- /// <summary>
- /// 鏄惁鎶曞叆绔�(Y/N)
- /// </summary>
- [DisplayName("鏄惁鎶曞叆绔�(Y/N)")]
+ /// <summary>
+ /// 鏄惁鍏佽涓嶈壇鍝佽繘绔�(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鍏佽涓嶈壇鍝佽繘绔�(Y/N)")]
+ public string ALLOW_DFT_IN { get; set; }
+ /// <summary>
+ /// 鏄惁鎶曞叆绔�(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鎶曞叆绔�(Y/N)")]
public string IS_INPUT { get; set; }
/// <summary>
/// 鏄惁浜у嚭绔�(Y/N)
@@ -154,6 +159,11 @@
public int Sequence { get; set; }
[SugarColumn(IsIgnore = true)]
public List<string> PrepNodeIDs { get; set; } = new List<string>();
+ /// <summary>
+ /// 鑺傜偣
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public node node { get; set; }
#endregion
#region 澶栭敭灞炴��
--
Gitblit v1.9.3