From d0be552afd02de828036aa53ecf0f22e67aa599a Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 27 二月 2025 10:52:43 +0800
Subject: [PATCH] 类型修改
---
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index caa05ca..3fa1f45 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -29,9 +29,9 @@
[DisplayName("杩囩珯鏉＄爜")]
public string SN { get; set; }
/// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6InStorage宸插叆搴搢7Reject宸叉嫆鏀秥8Shipped宸插嚭璐9Offline寮傚父涓嬬嚎|10Scrap宸叉姤搴�)
+ /// 鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6InStorage宸插叆搴搢7Reject宸叉嫆鏀秥8Shipped宸插嚭璐9Offline寮傚父涓嬬嚎|10Scrap宸叉姤搴�))")]
+ [DisplayName("鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎))")]
public int STATUS { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
@@ -189,6 +189,21 @@
[DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
/// <summary>
+ /// 鎿嶄綔瀹屾垚鏃堕棿
+ /// </summary>
+ [DisplayName("鎿嶄綔瀹屾垚鏃堕棿")]
+ public DateTime OPERATION_END { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 涓嶈壇鏁伴噺
+ /// </summary>
+ [DisplayName("涓嶈壇鏁伴噺")]
+ public int DFT_QTY { get; set; } = 0;
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ /// </summary>
+ [DisplayName("鎶ュ簾鏁伴噺")]
+ public int SCRAP_QTY { get; set; } = 0;
+ /// <summary>
/// 鐝埗缂栫爜
/// </summary>
[DisplayName("鐝埗缂栫爜")]
@@ -263,7 +278,7 @@
[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
[SugarColumn(IsIgnore = true)]
- public List<MES_WIP_HIS> History => _History.Where(q => q.UNBIND_FLAG != "Y").ToList() ?? new List<MES_WIP_HIS>();
+ 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)]
@@ -282,32 +297,36 @@
*/
/// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6InStorage宸插叆搴搢7Reject宸叉嫆鏀秥8Shipped宸插嚭璐9Offline寮傚父涓嬬嚎|10Scrap宸叉姤搴�)
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
public enum STATUSs
{
[Description("鍒濆鍖�")]
Init = 0,
[Description("宸叉姇鍏�")]
- Input = 1,
+ Input = 10,
[Description("鑹搧杩囩珯")]
- OK = 2,
+ OK = 20,
[Description("涓嶈壇杩囩珯")]
- NG = 3,
+ NG = 30,
[Description("缁翠慨涓�")]
- Repair = 4,
- [Description("宸插畬宸�")]
- Finished = 5,
+ Repair = 40,
+ [Description("宸蹭骇鍑�")]
+ Output = 50,
+ [Description("寰呭叆搴�")]
+ WaitStorage = 51,
+ [Description("寰呭嚭璐�")]
+ WaitShipment = 52,
[Description("宸插叆搴�")]
- InStorage = 6,
+ InStorage = 60,
[Description("宸叉嫆鏀�")]
- Reject = 7,
+ Reject = 61,
[Description("宸插嚭璐�")]
- Shipped = 8,
- [Description("寮傚父涓嬬嚎")]
- Offline = 9,
+ Shipped = 80,
[Description("宸叉姤搴�")]
- Scrap = 10,
+ Scrap = 90,
+ [Description("寮傚父涓嬬嚎")]
+ Offline = 91,
}
/// <summary>
--
Gitblit v1.9.3