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 | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index 13a0c10..ff829f4 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宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// 鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
+ [DisplayName("鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎))")]
public int STATUS { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
@@ -108,6 +108,11 @@
/// </summary>
[DisplayName("杩斿伐鏍囪")]
public string REWORK_FLAG { get; set; }
+ /// <summary>
+ /// 瑙ｇ粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)
+ /// </summary>
+ [DisplayName("瑙ｇ粦鏍囪(鍥犲紓甯镐笅绾垮鑷村綋鍓嶈褰曚粠宸ュ崟鐢熶骇鏁版嵁涓Щ闄わ紝涓嶅弬涓庡伐鑹烘祦绋嬭绠楀拰鏁版嵁缁熻)")]
+ public string UNBIND_FLAG { get; set; }
/// <summary>
/// 鏄惁瀹屽伐
/// </summary>
@@ -255,11 +260,11 @@
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.SN), nameof(SN), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+ [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 ?? 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_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>();
@@ -277,30 +282,36 @@
*/
/// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// 鏋氫妇锛氱姸鎬�(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,
- [Description("宸叉姤搴�")]
- Scrap = 6,
+ Repair = 40,
+ [Description("宸蹭骇鍑�")]
+ Output = 50,
+ [Description("寰呭叆搴�")]
+ WaitStorage = 51,
+ [Description("寰呭嚭璐�")]
+ WaitShipment = 52,
[Description("宸插叆搴�")]
- InStorage = 7,
+ InStorage = 60,
[Description("宸叉嫆鏀�")]
- Reject = 8,
+ Reject = 61,
[Description("宸插嚭璐�")]
- Shipped = 9,
+ Shipped = 80,
+ [Description("宸叉姤搴�")]
+ Scrap = 90,
+ [Description("寮傚父涓嬬嚎")]
+ Offline = 91,
}
/// <summary>
--
Gitblit v1.9.3