From f0c7f4ba26a8bcb4e551c50d6d9468edb542c063 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 27 十月 2024 14:07:05 +0800
Subject: [PATCH] 优化手动结束包装支持打印入库标签
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index bd6cbee..82074a3 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -46,6 +46,10 @@
/// </summary>
public string DFT_CODE { get; set; }
/// <summary>
+ /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑閫夐」
+ /// </summary>
+ public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
+ /// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
public string Data { get; set; }
@@ -61,14 +65,6 @@
/// 鐭秷鎭�
/// </summary>
public ShortMessage ShortMsg { get; set; }
- /// <summary>
- /// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
- /// </summary>
- public BIZ_MES_WO CurWO { get; set; }
- /// <summary>
- /// 褰撳墠鎿嶄綔鐨勫伐鍗曟壒娆″璞�
- /// </summary>
- public BIZ_MES_WO_BATCH CurBatch { get; set; }
/// <summary>
/// 褰撳墠鎿嶄綔鐨勮妭鐐瑰悕绉�
/// </summary>
@@ -93,7 +89,14 @@
/// 宸ュ簭淇℃伅
/// </summary>
public OperInfo OperInfo { get; set; }
-
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
+ /// </summary>
+ public BIZ_MES_WO CurWO { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫伐鍗曟壒娆″璞�
+ /// </summary>
+ public BIZ_MES_WO_BATCH CurBatch { get; set; }
}
public class DefectOutput
@@ -149,6 +152,10 @@
/// </summary>
public int PkgLevel { get; set; }
/// <summary>
+ /// 鏄惁闇�瑕�
+ /// </summary>
+ public bool RealPrint { get; set; } = true;
+ /// <summary>
/// 褰撳墠闇�瑕佹墦鍗扮殑鍖呰灞傜骇鐨勬爣绛句俊鎭�
/// </summary>
public BAS_LABEL_TEMP PrintLable { get; set; }
@@ -162,12 +169,15 @@
public string WorkBatch { get; set; }
public string RULE_CODE { get; set; }
public string RULE_NAME { get; set; }
- public string ITEM_CODE { get; set; }
+ public string PROD_CODE { get; set; }
+ public MES_CUST_SN CustSN { get; set; }
public WipPkgItem Item { get; set; }
public bool NeedWeighing { get; set; } = false;
public bool IsWeighed { get; set; } = false;
public WeightInfo WeightInfo { get; set; } = new WeightInfo();
public bool IsFinished => Item.IsFinished;
+ public bool IsReachedEndNode { get; set; } = false;
+ public BAS_LABEL_TEMP InStoreLabel { get; set; }
}
/// <summary>
@@ -181,6 +191,7 @@
public int PKG_LEVEL { get; set; }
public int PKG_QTY { get; set; }
public string LABEL_CODE { get; set; }
+ public string SN { get; set; }
public MES_WIP_PKG Package { get; set; }
public bool IsFinished { get; set; } = false;
public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
--
Gitblit v1.9.3