From 2c8b6a511da5848099f9419b36997716395979a5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 26 七月 2024 11:04:30 +0800
Subject: [PATCH] 工单，工单批次，在制品信息增加物料信息的导航属性
---
Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
index 8f56f47..7ab5e94 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
@@ -28,7 +28,7 @@
/// <param name="traceInfo">杩芥函淇℃伅</param>
public MES_WIP_HIS(MES_WIP_DATA data, string traceInfo)
{
- ID = data.HIS_ID;
+ ID = Guid.NewGuid().ToString("N");
CREATE_USER = data.CREATE_USER;
UPDATE_USER = data.UPDATE_USER;
AUTH_ORG = data.AUTH_ORG;
@@ -54,6 +54,7 @@
DFT_FLAG = data.DFT_FLAG;
DFT_COUNT = data.DFT_COUNT;
DFT_CODE = data.DFT_CODE;
+ REFLOW_NODE = data.REFLOW_NODE;
TRAY_SN = data.TRAY_SN;
CONTAINER_SN = data.CONTAINER_SN;
CARTON_SN = data.CARTON_SN;
@@ -177,10 +178,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>
/// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
@@ -279,10 +285,15 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ /// <summary>
+ /// 鏄惁宸茬粡鑹搧杩囩珯
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public bool IsFinished => DFT_FLAG == "Y";
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_HIS绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -293,10 +304,10 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_HISId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -306,10 +317,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