From 3678120ac63c176b5f261ef12e67c4ce7f1b320f Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 25 七月 2024 21:44:25 +0800
Subject: [PATCH] 增加维修入站跟维修回流的判断
---
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index 2ac3a63..305e741 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -123,10 +123,15 @@
/// </summary>
[DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
public string DFT_CODE { get; set; }
- /// <summary>
- /// 鎵樼洏/杞藉叿鏉＄爜
- /// </summary>
- [DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
+ /// <summary>
+ /// 缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)
+ /// </summary>
+ [DisplayName("缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)")]
+ public string REFLOW_NODE { get; set; }
+ /// <summary>
+ /// 鎵樼洏/杞藉叿鏉＄爜
+ /// </summary>
+ [DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
public string TRAY_SN { get; set; }
/// <summary>
/// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
@@ -220,8 +225,6 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- [SugarColumn(IsIgnore = true)]
- public string HIS_ID { get; set; } = Guid.NewGuid().ToString("N");
#endregion
#region 澶栭敭灞炴��
@@ -238,10 +241,16 @@
*/
[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
- #endregion
+ [Navigate(NavigateType.OneToMany, nameof(MES_WIP_HIS.SN), nameof(SN), "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
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -251,10 +260,10 @@
}
*/
- /// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
- /// </summary>
- public enum STATUSs
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ public enum STATUSs
{
[Description("鍒濆鍖�")]
Init = 0,
--
Gitblit v1.9.3