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_PKG_DTL.cs |  102 +++++++++++++++++++++++++++++----------------------
 1 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs
index d5295c7..a3c20a5 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_PKG_DTL.cs
@@ -6,57 +6,69 @@
 
 namespace Tiger.Model
 {
-	/// <summary>
-	/// 瀹炰綋锛氬寘瑁呮暟閲忔槑缁�
-	/// </summary>
-	[Description("Primary:ID")]
-	[Serializable]
-	[SugarTable("BAS_PKG_DTL")]
-	public class BAS_PKG_DTL : DbEntityWithAuth
-	{
-		#region 鏋勯�犲嚱鏁�
-		/// <summary>
-		/// 瀹炰綋锛氬寘瑁呮暟閲忔槑缁�
-		/// </summary>
-		public BAS_PKG_DTL() {}
-		#endregion
+    /// <summary>
+    /// 瀹炰綋锛氬寘瑁呮暟閲忔槑缁�
+    /// </summary>
+    [Description("Primary:ID")]
+    [DisplayName("鍖呰鏁伴噺鏄庣粏")]
+    [Serializable]
+    [SugarTable("BAS_PKG_DTL")]
+    public class BAS_PKG_DTL : DbEntityWithAuth
+    {
+        #region 鏋勯�犲嚱鏁�
+        /// <summary>
+        /// 瀹炰綋锛氬寘瑁呮暟閲忔槑缁�
+        /// </summary>
+        public BAS_PKG_DTL() { }
+        #endregion
 
-		#region 鍏叡灞炴��
-		/// <summary>
-		/// 鍖呰瑙勫垯ID
-		/// </summary>
-		public string PKG_RULE_ID { get; set; }
-		/// <summary>
-		/// 鍖呰/杞藉叿缂栫爜
-		/// </summary>
-		public string PKG_CODE { get; set; }
-		/// <summary>
-		/// 鍖呰灞傜骇
-		/// </summary>
-		public int PKG_LEVEL { get; set; }
-		/// <summary>
-		/// 鍖呰鏁伴噺
-		/// </summary>
-		public int PKG_QTY { get; set; }
+        #region 鍏叡灞炴��
+        /// <summary>
+        /// 鍖呰瑙勫垯ID
+        /// </summary>
+        [DisplayName("鍖呰瑙勫垯ID")]
+        public string PKG_RULE_ID { get; set; }
+        /// <summary>
+        /// 鍖呰/杞藉叿缂栫爜
+        /// </summary>
+        [DisplayName("鍖呰/杞藉叿缂栫爜")]
+        public string PKG_CODE { get; set; }
+        /// <summary>
+        /// 鍖呰灞傜骇
+        /// </summary>
+        [DisplayName("鍖呰灞傜骇")]
+        public int PKG_LEVEL { get; set; }
+        /// <summary>
+        /// 鍖呰鏁伴噺
+        /// </summary>
+        [DisplayName("鍖呰鏁伴噺")]
+        public int PKG_QTY { get; set; }
         /// <summary>
         /// 鏍囩妯℃澘缂栫爜
         /// </summary>
+        [DisplayName("鏍囩妯℃澘缂栫爜")]
         public string LABEL_CODE { get; set; }
+        /// <summary>
+        /// 鍖呰鏉$爜瑙勫垯缂栫爜
+        /// </summary>
+        [DisplayName("鍖呰鏉$爜瑙勫垯缂栫爜")]
+        public string SN_RULE { get; set; }
         /// <summary>
         /// 澶囨敞
         /// </summary>
+        [DisplayName("澶囨敞")]
         public string REMARK { get; set; }
-		#endregion
+        #endregion
 
-		#region 铏氭嫙灞炴��
-		/*渚嬪瓙
+        #region 铏氭嫙灞炴��
+        /*渚嬪瓙
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
 		*/
-		#endregion
+        #endregion
 
-		#region 澶栭敭灞炴��
-		/*渚嬪瓙
+        #region 澶栭敭灞炴��
+        /*渚嬪瓙
 		//涓�瀵逛竴澶栭敭瀵艰埅
 		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊AS_PKG_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁
 		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -67,10 +79,12 @@
 		[Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PKG_DTLId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
 		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		*/
-		#endregion
+        [Navigate(NavigateType.OneToOne, nameof(PKG_CODE), nameof(BAS_PKG_TYPE.PKG_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
+        public BAS_PKG_TYPE PkgType { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        #endregion
 
-		#region 鏋氫妇鍙橀噺
-		/*渚嬪瓙
+        #region 鏋氫妇鍙橀噺
+        /*渚嬪瓙
 		public enum FieldNames
 		{
 			[Description("鏋氫妇鎻忚堪0")]
@@ -79,11 +93,11 @@
 			Enum1,
 		}
 		*/
-		#endregion
+        #endregion
 
-		#region 鍏叡鏂规硶
+        #region 鍏叡鏂规硶
 
-		#endregion
+        #endregion
 
-	}//endClass
+    }//endClass
 }
\ No newline at end of file

--
Gitblit v1.9.3