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_PROD_OPER.cs | 156 +++++++++++++++++++++++++++++++---------------------
1 files changed, 93 insertions(+), 63 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_PROD_OPER.cs b/Tiger.Model.Net/Entitys/MES/MES_PROD_OPER.cs
index 9aec047..7b87732 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_PROD_OPER.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_PROD_OPER.cs
@@ -7,143 +7,173 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：产品工序设置
+ /// 瀹炰綋锛氫骇鍝佸伐搴忚缃�
/// </summary>
[Description("Primary:ID")]
- [DisplayName("产品工序设置")]
+ [DisplayName("浜у搧宸ュ簭璁剧疆")]
[Serializable]
[SugarTable("MES_PROD_OPER")]
public class MES_PROD_OPER : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：产品工序设置
+ /// 瀹炰綋锛氫骇鍝佸伐搴忚缃�
/// </summary>
public MES_PROD_OPER() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 产品编码
+ /// 浜у搧缂栫爜
/// </summary>
- [DisplayName("产品编码")]
+ [DisplayName("浜у搧缂栫爜")]
public string PROD_CODE { get; set; }
/// <summary>
- /// 客户编码(留空则不区分客户)
+ /// 瀹㈡埛缂栫爜(鐣欑┖鍒欎笉鍖哄垎瀹㈡埛)
/// </summary>
- [DisplayName("客户编码(留空则不区分客户)")]
+ [DisplayName("瀹㈡埛缂栫爜(鐣欑┖鍒欎笉鍖哄垎瀹㈡埛)")]
public string CUST_CODE { get; set; }
/// <summary>
- /// 工序节点ID
+ /// 宸ュ簭鑺傜偣ID
/// </summary>
- [DisplayName("工序节点ID")]
+ [DisplayName("宸ュ簭鑺傜偣ID")]
public string NODE_ID { get; set; }
/// <summary>
- /// 工序节点名称
+ /// 宸ュ簭鑺傜偣鍚嶇О
/// </summary>
- [DisplayName("工序节点名称")]
+ [DisplayName("宸ュ簭鑺傜偣鍚嶇О")]
public string NODE_NAME { get; set; }
/// <summary>
- /// 工艺路线ID
+ /// 宸ヨ壓璺嚎ID
/// </summary>
- [DisplayName("工艺路线ID")]
+ [DisplayName("宸ヨ壓璺嚎ID")]
public string ROT_ID { get; set; }
/// <summary>
- /// 工序编码
+ /// 宸ュ簭缂栫爜
/// </summary>
- [DisplayName("工序编码")]
+ [DisplayName("宸ュ簭缂栫爜")]
public string OPER_CODE { get; set; }
/// <summary>
- /// 是否启用(Y/N)
+ /// 鏄惁鍚敤(Y/N)
/// </summary>
- [DisplayName("是否启用(Y/N)")]
+ [DisplayName("鏄惁鍚敤(Y/N)")]
public string IS_ACTIVE { get; set; }
/// <summary>
- /// 是否计算直通率(Y/N)
+ /// 鏄惁璁＄畻鐩撮�氱巼(Y/N)
/// </summary>
- [DisplayName("是否计算直通率(Y/N)")]
+ [DisplayName("鏄惁璁＄畻鐩撮�氱巼(Y/N)")]
public string IS_CALC_FPY { get; set; }
/// <summary>
- /// 是否允许跳站(Y/N)
+ /// 鏄惁鍏佽璺崇珯(Y/N)
/// </summary>
- [DisplayName("是否允许跳站(Y/N)")]
+ [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)
+ /// 鏄惁浜у嚭绔�(Y/N)
/// </summary>
- [DisplayName("是否产出站(Y/N)")]
+ [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
+ /// 璁剧疆鍊�2
/// </summary>
- [DisplayName("设置值2")]
+ [DisplayName("璁剧疆鍊�2")]
public string OPTION_2 { get; set; }
/// <summary>
- /// 设置值3
+ /// 璁剧疆鍊�3
/// </summary>
- [DisplayName("设置值3")]
+ [DisplayName("璁剧疆鍊�3")]
public string OPTION_3 { get; set; }
/// <summary>
- /// 设置值4
+ /// 璁剧疆鍊�4
/// </summary>
- [DisplayName("设置值4")]
+ [DisplayName("璁剧疆鍊�4")]
public string OPTION_4 { get; set; }
/// <summary>
- /// 设置值5
+ /// 璁剧疆鍊�5
/// </summary>
- [DisplayName("设置值5")]
+ [DisplayName("璁剧疆鍊�5")]
public string OPTION_5 { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- [DisplayName("备注")]
+ /// <summary>
+ /// 璁剧疆鍊�6
+ /// </summary>
+ [DisplayName("璁剧疆鍊�6")]
+ public string OPTION_6 { get; set; }
+ /// <summary>
+ /// 璁剧疆鍊�7
+ /// </summary>
+ [DisplayName("璁剧疆鍊�7")]
+ public string OPTION_7 { get; set; }
+ /// <summary>
+ /// 璁剧疆鍊�8
+ /// </summary>
+ [DisplayName("璁剧疆鍊�8")]
+ public string OPTION_8 { get; set; }
+ /// <summary>
+ /// 璁剧疆鍊�9
+ /// </summary>
+ [DisplayName("璁剧疆鍊�9")]
+ public string OPTION_9 { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
#endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
#endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_PROD_OPER类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_OPERId))]//ClassA表中的MES_PROD_OPERId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_OPERId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_PROD_OPER绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_PROD_OPERId))]//ClassA琛ㄤ腑鐨凪ES_PROD_OPERId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_PROD_OPERId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
#endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
#endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
#endregion
--
Gitblit v1.9.3