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_CUSTOM_ACT.cs | 135 +++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 65 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs
index 549e3fa..154649f 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_CUSTOM_ACT.cs
@@ -7,162 +7,167 @@
namespace Tiger.Model
{
/// <summary>
- /// 瀹炰綋锛氬伐搴忚涓哄畾涔�
+ /// 实体：工序行为定义
/// </summary>
[Description("Primary:ID")]
- [DisplayName("宸ュ簭琛屼负瀹氫箟")]
+ [DisplayName("工序行为定义")]
[Serializable]
[SugarTable("MES_CUSTOM_ACT")]
public class MES_CUSTOM_ACT : DbEntityWithAuth
{
- #region 鏋勯�犲嚱鏁�
+ #region 构造函数
/// <summary>
- /// 瀹炰綋锛氬伐搴忚涓哄畾涔�
+ /// 实体：工序行为定义
/// </summary>
public MES_CUSTOM_ACT() {}
#endregion
- #region 鍏叡灞炴��
+ #region 公共属性
/// <summary>
- /// 琛屼负缂栫爜
+ /// 行为编码
/// </summary>
- [DisplayName("琛屼负缂栫爜")]
+ [DisplayName("行为编码")]
public string ACT_CODE { get; set; }
/// <summary>
- /// 琛屼负鍚嶇О
+ /// 行为名称
/// </summary>
- [DisplayName("琛屼负鍚嶇О")]
+ [DisplayName("行为名称")]
public string ACT_NAME { get; set; }
/// <summary>
- /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|6Package包装规则)
/// </summary>
- [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)")]
+ [DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|6Package包装规则)")]
public int ACT_TYPE { get; set; }
/// <summary>
- /// 鏄惁鍚敤(Y/N)
+ /// 是否启用(Y/N)
/// </summary>
- [DisplayName("鏄惁鍚敤(Y/N)")]
+ [DisplayName("是否启用(Y/N)")]
public string IS_ACTIVE { get; set; }
/// <summary>
- /// 鑷畾涔夋柟娉曠被鍨�(0ServerMethod鏈嶅姟绔柟娉晐1WebApiWebApi鏂规硶|2StoredProcedure瀛樺偍杩囩▼)
+ /// 依赖注入类全名
/// </summary>
- [DisplayName("鑷畾涔夋柟娉曠被鍨�(0ServerMethod鏈嶅姟绔柟娉晐1WebApiWebApi鏂规硶|2StoredProcedure瀛樺偍杩囩▼)")]
+ [DisplayName("依赖注入类全名")]
+ public string SERVICE_TYPE { get; set; }
+ /// <summary>
+ /// 自定义方法类型(0ServerMethod服务端方法|1WebApiWebApi方法|2StoredProcedure存储过程)
+ /// </summary>
+ [DisplayName("自定义方法类型(0ServerMethod服务端方法|1WebApiWebApi方法|2StoredProcedure存储过程)")]
public int DO_TYPE { get; set; }
/// <summary>
- /// 鑷畾涔夋柟娉�(璋冪敤鏂规硶鐨勫叏鍚�)
+ /// 自定义方法(调用方法的全名)
/// </summary>
- [DisplayName("鑷畾涔夋柟娉�(璋冪敤鏂规硶鐨勫叏鍚�)")]
+ [DisplayName("自定义方法(调用方法的全名)")]
public string DO_METHOD { get; set; }
/// <summary>
- /// 閫氳繃鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)
+ /// 通过时执行(调用方法的全名)
/// </summary>
- [DisplayName("閫氳繃鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)")]
+ [DisplayName("通过时执行(调用方法的全名)")]
public string DO_IF_PASS { get; set; }
/// <summary>
- /// 澶辫触鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)
+ /// 失败时执行(调用方法的全名)
/// </summary>
- [DisplayName("澶辫触鏃舵墽琛�(璋冪敤鏂规硶鐨勫叏鍚�)")]
+ [DisplayName("失败时执行(调用方法的全名)")]
public string DO_IF_FAIL { 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>
- /// 澶囨敞
+ /// 备注
/// </summary>
- [DisplayName("澶囨敞")]
+ [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鏄疢ES_CUSTOM_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
- public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //涓�瀵瑰澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_CUSTOM_ACTId))]//ClassA琛ㄤ腑鐨凪ES_CUSTOM_ACTId
- public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //澶氬澶氬閿鑸�
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_CUSTOM_ACTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
- public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_CUSTOM_ACT类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_CUSTOM_ACTId))]//ClassA表中的MES_CUSTOM_ACTId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_CUSTOM_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
*/
#endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
- [Description("鏋氫妇鎻忚堪0")]
+ [Description("枚举描述0")]
Enum0,
- [Description("鏋氫妇鎻忚堪1")]
+ [Description("枚举描述1")]
Enum1,
}
*/
/// <summary>
- /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// 枚举：行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|6Package包装规则)
/// </summary>
public enum ACT_TYPEs
{
- [Description("榛樿琛屼负")]
+ [Description("默认行为")]
Normal = 0,
- [Description("鎵爜楠岃瘉")]
+ [Description("扫码验证")]
Scan = 1,
- [Description("缁勮涓婃枡")]
+ [Description("组装上料")]
Assy = 2,
- [Description("浜у搧娴嬭瘯")]
+ [Description("产品测试")]
Test = 3,
- [Description("浜у搧鎶芥")]
+ [Description("产品抽检")]
Audit = 4,
- [Description("鏍囩鎵撳嵃")]
+ [Description("标签打印")]
Print = 5,
- [Description("鍖呰瑙勫垯")]
- Package = 6,
- }
+ [Description("包装规则")]
+ Package = 6,
+ }
/// <summary>
- /// 鏋氫妇锛氳嚜瀹氫箟鏂规硶绫诲瀷(0ServerMethod鏈嶅姟绔柟娉晐1WebApiWebApi鏂规硶|2StoredProcedure瀛樺偍杩囩▼)
+ /// 枚举：自定义方法类型(0ServerMethod服务端方法|1WebApiWebApi方法|2StoredProcedure存储过程)
/// </summary>
public enum DO_TYPEs
{
- [Description("鏈嶅姟绔柟娉�")]
+ [Description("服务端方法")]
ServerMethod = 0,
- [Description("鏂规硶")]
+ [Description("方法")]
WebApiWebApi = 1,
- [Description("瀛樺偍杩囩▼")]
+ [Description("存储过程")]
StoredProcedure = 2,
}
#endregion
- #region 鍏叡鏂规硶
+ #region 公共方法
#endregion
--
Gitblit v1.9.3