From 976d3ae1547b896cc5c7875408c09616d5c2ee55 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 26 十一月 2024 20:51:17 +0800
Subject: [PATCH] 箱数更新

---
 Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs |  567 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 297 insertions(+), 270 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index 305e741..ff829f4 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -6,218 +6,233 @@
 
 namespace Tiger.Model
 {
-	/// <summary>
-	/// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
-	/// </summary>
-	[Description("Primary:ID")]
-	[DisplayName("鍦ㄥ埗鍝佷俊鎭〃")]
-	[Serializable]
-	[SugarTable("MES_WIP_DATA")]
-	public class MES_WIP_DATA : DbEntityWithAuth
-	{
-		#region 鏋勯�犲嚱鏁�
-		/// <summary>
-		/// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
-		/// </summary>
-		public MES_WIP_DATA() {}
-		#endregion
+    /// <summary>
+    /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
+    /// </summary>
+    [Description("Primary:ID")]
+    [DisplayName("鍦ㄥ埗鍝佷俊鎭〃")]
+    [Serializable]
+    [SugarTable("MES_WIP_DATA")]
+    public class MES_WIP_DATA : DbEntityWithAuth
+    {
+        #region 鏋勯�犲嚱鏁�
+        /// <summary>
+        /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
+        /// </summary>
+        public MES_WIP_DATA() { }
+        #endregion
 
-		#region 鍏叡灞炴��
-		/// <summary>
-		/// 杩囩珯鏉＄爜
-		/// </summary>
-		[DisplayName("杩囩珯鏉＄爜")]
-		public string SN { get; set; }
-		/// <summary>
-		/// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
-		/// </summary>
-		[DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
-		public int STATUS { get; set; }
-		/// <summary>
-		/// 鐗╂枡缂栫爜
-		/// </summary>
-		[DisplayName("鐗╂枡缂栫爜")]
-		public string ITEM_CODE { get; set; }
-		/// <summary>
-		/// 宸ュ崟鍙�
-		/// </summary>
-		[DisplayName("宸ュ崟鍙�")]
-		public string WORK_ORDER { get; set; }
-		/// <summary>
-		/// 宸ュ崟鎵规鍙�
-		/// </summary>
-		[DisplayName("宸ュ崟鎵规鍙�")]
-		public string BATCH_NO { get; set; }
-		/// <summary>
-		/// 宸ヨ壓璺嚎缂栫爜
-		/// </summary>
-		[DisplayName("宸ヨ壓璺嚎缂栫爜")]
-		public string ROT_CODE { get; set; }
-		/// <summary>
-		/// 宸ヨ壓璺嚎鑺傜偣ID
-		/// </summary>
-		[DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
-		public string NODE_ID { get; set; }
-		/// <summary>
-		/// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
-		/// </summary>
-		[DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
-		public string NODE_NAME { get; set; }
-		/// <summary>
-		/// 宸ュ巶缂栫爜
-		/// </summary>
-		[DisplayName("宸ュ巶缂栫爜")]
-		public string FTY_CODE { get; set; }
-		/// <summary>
-		/// 杞﹂棿缂栫爜
-		/// </summary>
-		[DisplayName("杞﹂棿缂栫爜")]
-		public string WS_CODE { get; set; }
-		/// <summary>
-		/// 浜х嚎缂栫爜
-		/// </summary>
-		[DisplayName("浜х嚎缂栫爜")]
-		public string LINE_CODE { get; set; }
-		/// <summary>
-		/// 宀椾綅缂栫爜
-		/// </summary>
-		[DisplayName("宀椾綅缂栫爜")]
-		public string POST_CODE { get; set; }
-		/// <summary>
-		/// 宸ュ簭缂栫爜
-		/// </summary>
-		[DisplayName("宸ュ簭缂栫爜")]
-		public string OPER_CODE { get; set; }
-		/// <summary>
-		/// 鍔犲伐娈�
-		/// </summary>
-		[DisplayName("鍔犲伐娈�")]
-		public string SEGMENT { get; set; }
-		/// <summary>
-		/// 閿佸畾鏍囪
-		/// </summary>
-		[DisplayName("閿佸畾鏍囪")]
-		public string HOLD_FLAG { get; set; }
-		/// <summary>
-		/// 杩斿伐鏍囪
-		/// </summary>
-		[DisplayName("杩斿伐鏍囪")]
-		public string REWORK_FLAG { get; set; }
-		/// <summary>
-		/// 鏄惁瀹屽伐
-		/// </summary>
-		[DisplayName("鏄惁瀹屽伐")]
-		public string FINISHED_FLAG { get; set; }
-		/// <summary>
-		/// 鏄惁涓嶈壇
-		/// </summary>
-		[DisplayName("鏄惁涓嶈壇")]
-		public string DFT_FLAG { get; set; }
-		/// <summary>
-		/// 涓嶈壇璁℃暟
-		/// </summary>
-		[DisplayName("涓嶈壇璁℃暟")]
-		public int DFT_COUNT { get; set; }
-		/// <summary>
-		/// 涓嶈壇浠ｇ爜缂栫爜
-		/// </summary>
-		[DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
-		public string DFT_CODE { get; set; }
+        #region 鍏叡灞炴��
+        /// <summary>
+        /// 杩囩珯鏉＄爜
+        /// </summary>
+        [DisplayName("杩囩珯鏉＄爜")]
+        public string SN { get; set; }
+        /// <summary>
+        /// 鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
+        /// </summary>
+        [DisplayName("鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎))")]
+        public int STATUS { get; set; }
+        /// <summary>
+        /// 鐗╂枡缂栫爜
+        /// </summary>
+        [DisplayName("鐗╂枡缂栫爜")]
+        public string ITEM_CODE { get; set; }
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        [DisplayName("鏁伴噺")]
+        public double QTY { get; set; } = 1;
+        /// <summary>
+        /// 宸ュ崟鍙�
+        /// </summary>
+        [DisplayName("宸ュ崟鍙�")]
+        public string WORK_ORDER { get; set; }
+        /// <summary>
+        /// 宸ュ崟鎵规鍙�
+        /// </summary>
+        [DisplayName("宸ュ崟鎵规鍙�")]
+        public string BATCH_NO { get; set; }
+        /// <summary>
+        /// 宸ヨ壓璺嚎缂栫爜
+        /// </summary>
+        [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+        public string ROT_CODE { get; set; }
+        /// <summary>
+        /// 宸ヨ壓璺嚎鑺傜偣ID
+        /// </summary>
+        [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+        public string NODE_ID { get; set; }
+        /// <summary>
+        /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+        /// </summary>
+        [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+        public string NODE_NAME { get; set; }
+        /// <summary>
+        /// 宸ュ巶缂栫爜
+        /// </summary>
+        [DisplayName("宸ュ巶缂栫爜")]
+        public string FTY_CODE { get; set; }
+        /// <summary>
+        /// 杞﹂棿缂栫爜
+        /// </summary>
+        [DisplayName("杞﹂棿缂栫爜")]
+        public string WS_CODE { get; set; }
+        /// <summary>
+        /// 浜х嚎缂栫爜
+        /// </summary>
+        [DisplayName("浜х嚎缂栫爜")]
+        public string LINE_CODE { get; set; }
+        /// <summary>
+        /// 宀椾綅缂栫爜
+        /// </summary>
+        [DisplayName("宀椾綅缂栫爜")]
+        public string POST_CODE { get; set; }
+        /// <summary>
+        /// 宸ュ簭缂栫爜
+        /// </summary>
+        [DisplayName("宸ュ簭缂栫爜")]
+        public string OPER_CODE { get; set; }
+        /// <summary>
+        /// 鍔犲伐娈�
+        /// </summary>
+        [DisplayName("鍔犲伐娈�")]
+        public string SEGMENT { get; set; }
+        /// <summary>
+        /// 閿佸畾鏍囪
+        /// </summary>
+        [DisplayName("閿佸畾鏍囪")]
+        public string HOLD_FLAG { get; set; }
+        /// <summary>
+        /// 杩斿伐鏍囪
+        /// </summary>
+        [DisplayName("杩斿伐鏍囪")]
+        public string REWORK_FLAG { get; set; }
+        /// <summary>
+        /// 瑙ｇ粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)
+        /// </summary>
+        [DisplayName("瑙ｇ粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)")]
+        public string UNBIND_FLAG { get; set; }
+        /// <summary>
+        /// 鏄惁瀹屽伐
+        /// </summary>
+        [DisplayName("鏄惁瀹屽伐")]
+        public string FINISHED_FLAG { get; set; }
+        /// <summary>
+        /// 鏄惁涓嶈壇
+        /// </summary>
+        [DisplayName("鏄惁涓嶈壇")]
+        public string DFT_FLAG { get; set; }
+        /// <summary>
+        /// 涓嶈壇璁℃暟
+        /// </summary>
+        [DisplayName("涓嶈壇璁℃暟")]
+        public int DFT_COUNT { get; set; }
+        /// <summary>
+        /// 涓嶈壇浠ｇ爜缂栫爜
+        /// </summary>
+        [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
+        public string DFT_CODE { get; set; }
         /// <summary>
         /// 缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)
         /// </summary>
         [DisplayName("缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)")]
         public string REFLOW_NODE { get; set; }
         /// <summary>
+        /// 鍘傚唴娴佽浆鏉＄爜
+        /// </summary>
+        [DisplayName("鍘傚唴娴佽浆鏉＄爜")]
+        public string FLOW_SN { get; set; }
+        /// <summary>
         /// 鎵樼洏/杞藉叿鏉＄爜
         /// </summary>
         [DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
-		public string TRAY_SN { get; set; }
-		/// <summary>
-		/// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
-		/// </summary>
-		[DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")]
-		public string CONTAINER_SN { get; set; }
-		/// <summary>
-		/// 澶栫鏉＄爜
-		/// </summary>
-		[DisplayName("澶栫鏉＄爜")]
-		public string CARTON_SN { get; set; }
-		/// <summary>
-		/// 鏍堟澘鏉＄爜
-		/// </summary>
-		[DisplayName("鏍堟澘鏉＄爜")]
-		public string PALLET_SN { get; set; }
-		/// <summary>
-		/// 鏄惁鍏ュ簱
-		/// </summary>
-		[DisplayName("鏄惁鍏ュ簱")]
-		public string INV_FLAG { get; set; }
-		/// <summary>
-		/// 鍏ュ簱鏃ユ湡
-		/// </summary>
-		[DisplayName("鍏ュ簱鏃ユ湡")]
-		public DateTime INV_DATE { get; set; } = DateTime.MinValue;
-		/// <summary>
-		/// 鎶曞叆鏃堕棿
-		/// </summary>
-		[DisplayName("鎶曞叆鏃堕棿")]
-		public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
-		/// <summary>
-		/// 浜у嚭鏃堕棿
-		/// </summary>
-		[DisplayName("浜у嚭鏃堕棿")]
-		public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
-		/// <summary>
-		/// 褰撳墠鎿嶄綔鏃堕棿
-		/// </summary>
-		[DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
-		public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
-		/// <summary>
-		/// 鐝埗缂栫爜
-		/// </summary>
-		[DisplayName("鐝埗缂栫爜")]
-		public string SFTS_CODE { get; set; }
-		/// <summary>
-		/// 鐝缂栫爜
-		/// </summary>
-		[DisplayName("鐝缂栫爜")]
-		public string SFT_CODE { get; set; }
-		/// <summary>
-		/// 鏃舵缂栫爜
-		/// </summary>
-		[DisplayName("鏃舵缂栫爜")]
-		public string PRD_CODE { get; set; }
-		/// <summary>
-		/// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
-		/// </summary>
-		[DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
-		public int OBA_STATUS { get; set; }
-		/// <summary>
-		/// 鎶芥鎵规鍙�
-		/// </summary>
-		[DisplayName("鎶芥鎵规鍙�")]
-		public string OBA_BATCH { get; set; }
-		/// <summary>
-		/// 閿佸畾鎵规鍙�
-		/// </summary>
-		[DisplayName("閿佸畾鎵规鍙�")]
-		public string LOCK_BATCH { get; set; }
-		/// <summary>
-		/// 鍑鸿揣鏃堕棿
-		/// </summary>
-		[DisplayName("鍑鸿揣鏃堕棿")]
-		public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
-		/// <summary>
-		/// 鍑鸿揣鍗曞彿
-		/// </summary>
-		[DisplayName("鍑鸿揣鍗曞彿")]
-		public string SHIPPING_ORDER { get; set; }
-		/// <summary>
-		/// 澶囨敞
-		/// </summary>
-		[DisplayName("澶囨敞")]
-		public string REMARK { get; set; }
+        public string TRAY_SN { get; set; }
+        /// <summary>
+        /// 鍐呭寘瑁呮潯鐮�
+        /// </summary>
+        [DisplayName("鍐呭寘瑁呮潯鐮�")]
+        public string INNER_SN { get; set; }
+        /// <summary>
+        /// 澶栫鏉＄爜
+        /// </summary>
+        [DisplayName("澶栫鏉＄爜")]
+        public string CARTON_SN { get; set; }
+        /// <summary>
+        /// 鏍堟澘鏉＄爜
+        /// </summary>
+        [DisplayName("鏍堟澘鏉＄爜")]
+        public string PALLET_SN { get; set; }
+        /// <summary>
+        /// 鏄惁鍏ュ簱
+        /// </summary>
+        [DisplayName("鏄惁鍏ュ簱")]
+        public string INV_FLAG { get; set; }
+        /// <summary>
+        /// 鍏ュ簱鏃ユ湡
+        /// </summary>
+        [DisplayName("鍏ュ簱鏃ユ湡")]
+        public DateTime INV_DATE { get; set; } = DateTime.MinValue;
+        /// <summary>
+        /// 鎶曞叆鏃堕棿
+        /// </summary>
+        [DisplayName("鎶曞叆鏃堕棿")]
+        public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
+        /// <summary>
+        /// 浜у嚭鏃堕棿
+        /// </summary>
+        [DisplayName("浜у嚭鏃堕棿")]
+        public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
+        /// <summary>
+        /// 褰撳墠鎿嶄綔鏃堕棿
+        /// </summary>
+        [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
+        public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+        /// <summary>
+        /// 鐝埗缂栫爜
+        /// </summary>
+        [DisplayName("鐝埗缂栫爜")]
+        public string SFTS_CODE { get; set; }
+        /// <summary>
+        /// 鐝缂栫爜
+        /// </summary>
+        [DisplayName("鐝缂栫爜")]
+        public string SFT_CODE { get; set; }
+        /// <summary>
+        /// 鏃舵缂栫爜
+        /// </summary>
+        [DisplayName("鏃舵缂栫爜")]
+        public string PRD_CODE { get; set; }
+        /// <summary>
+        /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
+        /// </summary>
+        [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
+        public int OBA_STATUS { get; set; }
+        /// <summary>
+        /// 鎶芥鎵规鍙�
+        /// </summary>
+        [DisplayName("鎶芥鎵规鍙�")]
+        public string OBA_BATCH { get; set; }
+        /// <summary>
+        /// 閿佸畾鎵规鍙�
+        /// </summary>
+        [DisplayName("閿佸畾鎵规鍙�")]
+        public string LOCK_BATCH { get; set; }
+        /// <summary>
+        /// 鍑鸿揣鏃堕棿
+        /// </summary>
+        [DisplayName("鍑鸿揣鏃堕棿")]
+        public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
+        /// <summary>
+        /// 鍑鸿揣鍗曞彿
+        /// </summary>
+        [DisplayName("鍑鸿揣鍗曞彿")]
+        public string SHIPPING_ORDER { get; set; }
+        /// <summary>
+        /// 澶囨敞
+        /// </summary>
+        [DisplayName("澶囨敞")]
+        public string REMARK { get; set; }
         #endregion
 
         #region 铏氭嫙灞炴��
@@ -229,28 +244,34 @@
 
         #region 澶栭敭灞炴��
         /*渚嬪瓙
-		//涓�瀵逛竴澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
-		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		//涓�瀵瑰澶栭敭瀵艰埅
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
-		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		//澶氬澶氬閿鑸�
-		[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
-		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		*/
-        [Navigate(NavigateType.OneToOne, nameof(ITEM_CODE), nameof(BAS_ITEM.ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
-        public BAS_ITEM ItemInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-        [Navigate(NavigateType.OneToMany, nameof(MES_WIP_HIS.SN), nameof(SN), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+        //涓�瀵逛竴澶栭敭瀵艰埅
+        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+        public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        //涓�瀵瑰澶栭敭瀵艰埅
+        [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+        public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        //澶氬澶氬閿鑸�
+        [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+        public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        */
+        //[Navigate(NavigateType.OneToOne, nameof(ITEM_CODE), nameof(BAS_ITEM.ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+        //public BAS_ITEM ItemInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+        public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        [SugarColumn(IsIgnore = true)]
+        public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG);
+        [Navigate(NavigateType.OneToMany, nameof(MES_WIP_HIS.WIP_ID), nameof(ID), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
         public List<MES_WIP_HIS> _History { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		public List<MES_WIP_HIS> History => _History ?? new List<MES_WIP_HIS>();
-		[Navigate(NavigateType.OneToMany, nameof(MES_WIP_DFT.SN), nameof(SN), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
-		public List<MES_WIP_DFT> _Defects { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
-		public List<MES_WIP_DFT> Defects => _Defects ?? new List<MES_WIP_DFT>();
-		#endregion
+        [SugarColumn(IsIgnore = true)]
+        public List<MES_WIP_HIS> History => _History?.Any(q => q.UNBIND_FLAG == "Y") == true ? (_History = _History?.Where(q => q.UNBIND_FLAG != "Y").ToList()) : (_History ?? new List<MES_WIP_HIS>());
+        [Navigate(NavigateType.OneToMany, nameof(MES_WIP_DFT.WIP_ID), nameof(ID), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+        public List<MES_WIP_DFT> _Defects { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        [SugarColumn(IsIgnore = true)]
+        public List<MES_WIP_DFT> Defects => _Defects ?? new List<MES_WIP_DFT>();
+        #endregion
 
-		#region 鏋氫妇鍙橀噺
-		/*渚嬪瓙
+        #region 鏋氫妇鍙橀噺
+        /*渚嬪瓙
 		public enum FieldNames
 		{
 			[Description("鏋氫妇鎻忚堪0")]
@@ -260,56 +281,62 @@
 		}
 		*/
 
-		/// <summary>
-		/// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
-		/// </summary>
-		public enum STATUSs
-		{
-			[Description("鍒濆鍖�")]
-			Init = 0,
-			[Description("宸叉姇鍏�")]
-			Input = 1,
-			[Description("鑹搧杩囩珯")]
-			OK = 2,
-			[Description("涓嶈壇杩囩珯")]
-			NG = 3,
-			[Description("缁翠慨涓�")]
-			Repair = 4,
-			[Description("宸插畬宸�")]
-			Finished = 5,
-			[Description("宸叉姤搴�")]
-			Scrap = 6,
-			[Description("宸插叆搴�")]
-			InStorage = 7,
-			[Description("宸叉嫆鏀�")]
-			Reject = 8,
-			[Description("宸插嚭璐�")]
-			Shipped = 9,
-		}
+        /// <summary>
+        /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
+        /// </summary>
+        public enum STATUSs
+        {
+            [Description("鍒濆鍖�")]
+            Init = 0,
+            [Description("宸叉姇鍏�")]
+            Input = 10,
+            [Description("鑹搧杩囩珯")]
+            OK = 20,
+            [Description("涓嶈壇杩囩珯")]
+            NG = 30,
+            [Description("缁翠慨涓�")]
+            Repair = 40,
+            [Description("宸蹭骇鍑�")]
+            Output = 50,
+            [Description("寰呭叆搴�")]
+            WaitStorage = 51,
+            [Description("寰呭嚭璐�")]
+            WaitShipment = 52,
+            [Description("宸插叆搴�")]
+            InStorage = 60,
+            [Description("宸叉嫆鏀�")]
+            Reject = 61,
+            [Description("宸插嚭璐�")]
+            Shipped = 80,
+            [Description("宸叉姤搴�")]
+            Scrap = 90,
+            [Description("寮傚父涓嬬嚎")]
+            Offline = 91,
+        }
 
-		/// <summary>
-		/// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
-		/// </summary>
-		public enum OBA_STATUSs
-		{
-			[Description("鏈娊妫�")]
-			Unsampled = 0,
-			[Description("涓嶆娊妫�")]
-			NoSampling = 1,
-			[Description("寰呮楠�")]
-			WaitCheck = 2,
-			[Description("妫�楠屼腑")]
-			Checking = 3,
-			[Description("妫�楠屽畬")]
-			Completed = 4,
-			[Description("宸查攣瀹�")]
-			Locked = 5,
-		}
-		#endregion
+        /// <summary>
+        /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
+        /// </summary>
+        public enum OBA_STATUSs
+        {
+            [Description("鏈娊妫�")]
+            Unsampled = 0,
+            [Description("涓嶆娊妫�")]
+            NoSampling = 1,
+            [Description("寰呮楠�")]
+            WaitCheck = 2,
+            [Description("妫�楠屼腑")]
+            Checking = 3,
+            [Description("妫�楠屽畬")]
+            Completed = 4,
+            [Description("宸查攣瀹�")]
+            Locked = 5,
+        }
+        #endregion
 
-		#region 鍏叡鏂规硶
+        #region 鍏叡鏂规硶
 
-		#endregion
+        #endregion
 
-	}//endClass
+    }//endClass
 }
\ No newline at end of file

--
Gitblit v1.9.3