From 7d1c8af2ebd6125e90b03e63f9cbf6693ac70ff5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 15 六月 2024 15:08:56 +0800
Subject: [PATCH] 优化实体
---
Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs | 6 +-
Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs | 136 ++++++++++++++++++++++----------------------
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs | 29 +--------
3 files changed, 76 insertions(+), 95 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
index c8f50ce..1713e71 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_PROD_NODE_ACT.cs
@@ -109,10 +109,10 @@
[DisplayName("璁剧疆鍊�5")]
public string OPTION_5 { get; set; }
/// <summary>
- /// 鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)
+ /// 鏄惁璁剧疆瀹屾垚(Y/N)
/// </summary>
- [DisplayName("鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)")]
- public string NEED_SETUP { get; set; }
+ [DisplayName("鏄惁璁剧疆瀹屾垚(Y/N)")]
+ public string SETUP_FINISH { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
index fa5b014..0bca904 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
@@ -72,6 +72,11 @@
/// </summary>
public string IS_ACTIVE { get; set; }
/// <summary>
+ /// 鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁璁剧疆鎵嶈兘涓嬪彂鐢熶骇(Y/N)")]
+ public string NEED_SETUP { get; set; }
+ /// <summary>
/// 鑷畾涔夋柟娉曠被鍨�(0ServerMethod鏈嶅姟绔柟娉晐1WebApiWebApi鏂规硶|2StoredProcedure瀛樺偍杩囩▼)
/// </summary>
public int DO_TYPE { get; set; }
@@ -87,30 +92,6 @@
/// 澶辫触鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)
/// </summary>
public string DO_IF_FAIL { get; set; }
- ///// <summary>
- ///// 鎵爜楠岃瘉锛氭潯鐮佽鍒�
- ///// </summary>
- //public string RULE_CODE { get; set; }
- ///// <summary>
- ///// 缁勮涓婃枡锛氱墿鏂欐枡鍙�
- ///// </summary>
- //public string ITEM_CODE { get; set; }
- ///// <summary>
- ///// 浜у搧娴嬭瘯/鎶芥锛氫骇鍝佹枡鍙�
- ///// </summary>
- //public string PROD_CODE { get; set; }
- ///// <summary>
- ///// 浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�
- ///// </summary>
- //public string TEST_CODE { get; set; }
- ///// <summary>
- ///// 浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�
- ///// </summary>
- //public string SAPL_CODE { get; set; }
- ///// <summary>
- ///// 鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�
- ///// </summary>
- //public string LABEL_CODE { get; set; }
/// <summary>
/// 璁剧疆鍊�1
/// </summary>
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 daea75f..36aee3d 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WO_NODE_ACT.cs
@@ -7,158 +7,158 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：工单工序行为
+ /// 瀹炰綋锛氬伐鍗曞伐搴忚涓�
/// </summary>
[Description("Primary:ID")]
- [DisplayName("工单工序行为")]
+ [DisplayName("宸ュ崟宸ュ簭琛屼负")]
[Serializable]
[SugarTable("MES_WO_NODE_ACT")]
public class MES_WO_NODE_ACT : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：工单工序行为
+ /// 瀹炰綋锛氬伐鍗曞伐搴忚涓�
/// </summary>
public MES_WO_NODE_ACT() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 关联工单号
+ /// 鍏宠仈宸ュ崟鍙�
/// </summary>
- [DisplayName("关联工单号")]
+ [DisplayName("鍏宠仈宸ュ崟鍙�")]
public string WORK_ORDER { get; set; }
/// <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 ACT_ID { get; set; }
/// <summary>
- /// 工艺路线ID
+ /// 宸ヨ壓璺嚎ID
/// </summary>
- [DisplayName("工艺路线ID")]
+ [DisplayName("宸ヨ壓璺嚎ID")]
public string ROT_ID { get; set; }
/// <summary>
- /// 工序节点ID
+ /// 宸ュ簭鑺傜偣ID
/// </summary>
- [DisplayName("工序节点ID")]
+ [DisplayName("宸ュ簭鑺傜偣ID")]
public string NODE_ID { get; set; }
/// <summary>
- /// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)
+ /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)
/// </summary>
- [DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|5Package包装规则)")]
+ [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|5Package鍖呰瑙勫垯)")]
public int ACT_TYPE { get; set; }
/// <summary>
- /// 扫码验证：条码规则
+ /// 鎵爜楠岃瘉锛氭潯鐮佽鍒�
/// </summary>
- [DisplayName("扫码验证：条码规则")]
+ [DisplayName("鎵爜楠岃瘉锛氭潯鐮佽鍒�")]
public string RULE_CODE { get; set; }
/// <summary>
- /// 组装上料：物料料号
+ /// 缁勮涓婃枡锛氱墿鏂欐枡鍙�
/// </summary>
- [DisplayName("组装上料：物料料号")]
+ [DisplayName("缁勮涓婃枡锛氱墿鏂欐枡鍙�")]
public string ITEM_CODE { get; set; }
/// <summary>
- /// 产品测试：检验项目编码
+ /// 浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�
/// </summary>
- [DisplayName("产品测试：检验项目编码")]
+ [DisplayName("浜у搧娴嬭瘯锛氭楠岄」鐩紪鐮�")]
public string TEST_CODE { get; set; }
/// <summary>
- /// 产品抽检：抽样规则编码
+ /// 浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�
/// </summary>
- [DisplayName("产品抽检：抽样规则编码")]
+ [DisplayName("浜у搧鎶芥锛氭娊鏍疯鍒欑紪鐮�")]
public string SAPL_CODE { get; set; }
/// <summary>
- /// 标签打印：标签模板编码
+ /// 鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�
/// </summary>
- [DisplayName("标签打印：标签模板编码")]
+ [DisplayName("鏍囩鎵撳嵃锛氭爣绛炬ā鏉跨紪鐮�")]
public string LABEL_CODE { get; set; }
/// <summary>
- /// 包装规则：包装规则编码
+ /// 鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�
/// </summary>
- [DisplayName("包装规则：包装规则编码")]
+ [DisplayName("鍖呰瑙勫垯锛氬寘瑁呰鍒欑紪鐮�")]
public string PKG_CODE { get; set; }
/// <summary>
- /// 设置值1
+ /// 璁剧疆鍊�1
/// </summary>
- [DisplayName("设置值1")]
+ [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>
- /// 是否设置才能下发生产(Y/N)
- /// </summary>
- [DisplayName("是否设置才能下发生产(Y/N)")]
- public string NEED_SETUP { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- [DisplayName("备注")]
+ /// <summary>
+ /// 鏄惁璁剧疆瀹屾垚(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁璁剧疆瀹屾垚(Y/N)")]
+ public string SETUP_FINISH { 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_WO_NODE_ACT类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODE_ACTId))]//ClassA表中的MES_WO_NODE_ACTId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WO_NODE_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_NODE_ACTId))]//ClassA琛ㄤ腑鐨凪ES_WO_NODE_ACTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_NODE_ACTId), 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