From 28137093fdd7ab9ddd4edfe1774a6f7024166730 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期二, 03 十二月 2024 21:27:57 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 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..342d3e7 100644 --- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs +++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE.cs @@ -103,20 +103,30 @@ /// </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; } = "N"; + /// <summary> + /// 鏄惁鎶曞叆绔�(Y/N) + /// </summary> + [DisplayName("鏄惁鎶曞叆绔�(Y/N)")] public string IS_INPUT { get; set; } /// <summary> /// 鏄惁浜у嚭绔�(Y/N) /// </summary> [DisplayName("鏄惁浜у嚭绔�(Y/N)")] public string IS_OUTPUT { get; set; } - /// <summary> - /// 璁剧疆鍊�1 - /// </summary> - [DisplayName("璁剧疆鍊�1")] + /// <summary> + /// 浜у搧琚垽鏂笉鑹悗鏄惁涓嬬嚎(Y/N) + /// </summary> + [DisplayName("浜у搧琚垽鏂笉鑹悗鏄惁涓嬬嚎(Y/N)")] + public string IF_DFT_OFFLINE { get; set; } = "N"; + /// <summary> + /// 璁剧疆鍊�1 + /// </summary> + [DisplayName("璁剧疆鍊�1")] public string OPTION_1 { get; set; } /// <summary> /// 璁剧疆鍊�2 @@ -154,6 +164,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