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/BAS/BAS_LABEL_VAR.cs | 170 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 79 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_VAR.cs b/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_VAR.cs
index a842d0d..3ab490b 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_VAR.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_LABEL_VAR.cs
@@ -6,101 +6,113 @@
namespace Tiger.Model
{
- /// <summary>
- /// 实体：标签模板变量
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("标签模板变量")]
- [Serializable]
- [SugarTable("BAS_LABEL_VAR")]
- public class BAS_LABEL_VAR : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：标签模板变量
- /// </summary>
- public BAS_LABEL_VAR() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氭爣绛炬ā鏉垮彉閲�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鏍囩妯℃澘鍙橀噺")]
+ [Serializable]
+ [SugarTable("BAS_LABEL_VAR")]
+ public class BAS_LABEL_VAR : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氭爣绛炬ā鏉垮彉閲�
+ /// </summary>
+ public BAS_LABEL_VAR() { }
+ #endregion
- #region 公共属性
- /// <summary>
- /// 标签模板ID
- /// </summary>
- [DisplayName("标签模板ID")]
- public string LABEL_ID { get; set; }
- /// <summary>
- /// 变量名
- /// </summary>
- [DisplayName("变量名")]
- public string VAR_NAME { get; set; }
- /// <summary>
- /// 变量类型(0Constant常量|1ProcessVariable过程变量|2DateVariable日期变量|3CustomVariable自定义变量)
- /// </summary>
- [DisplayName("变量类型(0Constant常量|1ProcessVariable过程变量|2DateVariable日期变量|3CustomVariable自定义变量)")]
- public int VAR_TYPE { get; set; }
- /// <summary>
- /// 变量值
- /// </summary>
- [DisplayName("变量值")]
- public string VAR_VALUE { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- [DisplayName("备注")]
- public string REMARK { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鏍囩妯℃澘ID
+ /// </summary>
+ [DisplayName("鏍囩妯℃澘ID")]
+ public string LABEL_ID { get; set; }
+ /// <summary>
+ /// 鍙橀噺鍚�
+ /// </summary>
+ [DisplayName("鍙橀噺鍚�")]
+ public string VAR_NAME { get; set; }
+ /// <summary>
+ /// 鍙橀噺绫诲瀷(0Constant甯搁噺|1ProcessVariable杩囩▼鍙橀噺|2DateVariable鏃ユ湡鍙橀噺|3CustomVariable鑷畾涔夊彉閲弢4BarcodeGenerate鏉＄爜鐢熸垚)
+ /// </summary>
+ [DisplayName("鍙橀噺绫诲瀷(0Constant甯搁噺|1ProcessVariable杩囩▼鍙橀噺|2DateVariable鏃ユ湡鍙橀噺|3CustomVariable鑷畾涔夊彉閲弢4BarcodeGenerate鏉＄爜鐢熸垚)")]
+ public int VAR_TYPE { get; set; }
+ /// <summary>
+ /// 鍙橀噺鍊�
+ /// </summary>
+ [DisplayName("鍙橀噺鍊�")]
+ public string VAR_VALUE { get; set; }
+ /// <summary>
+ /// 鏉＄爜鐢熸垚瑙勫垯
+ /// </summary>
+ [DisplayName("鏉＄爜鐢熸垚瑙勫垯")]
+ public string BARCODE_RULE { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ /// <summary>
+ /// 杩斿洖鐨勫彉閲忓��
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string Value { get; set; }
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_LABEL_VAR类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_LABEL_VARId))]//ClassA表中的BAS_LABEL_VARId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_LABEL_VARId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊AS_LABEL_VAR绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_LABEL_VARId))]//ClassA琛ㄤ腑鐨凚AS_LABEL_VARId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_LABEL_VARId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
- /// <summary>
- /// 枚举：变量类型(0Constant常量|1ProcessVariable过程变量|2DateVariable日期变量|3CustomVariable自定义变量)
- /// </summary>
- public enum VAR_TYPEs
- {
- [Description("常量")]
- Constant = 0,
- [Description("过程变量")]
- ProcessVariable = 1,
- [Description("日期变量")]
- DateVariable = 2,
- [Description("自定义变量")]
- CustomVariable = 3,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氬彉閲忕被鍨�(0Constant甯搁噺|1ProcessVariable杩囩▼鍙橀噺|2DateVariable鏃ユ湡鍙橀噺|3CustomVariable鑷畾涔夊彉閲弢4BarcodeGenerate鏉＄爜鐢熸垚)
+ /// </summary>
+ public enum VAR_TYPEs
+ {
+ [Description("甯搁噺")]
+ Constant = 0,
+ [Description("杩囩▼鍙橀噺")]
+ ProcessVariable = 1,
+ [Description("鏃ユ湡鍙橀噺")]
+ DateVariable = 2,
+ [Description("鑷畾涔夊彉閲�")]
+ CustomVariable = 3,
+ [Description("鏉＄爜鐢熸垚")]
+ BarcodeGenerate = 4,
+ }
+ #endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3