From 2420648a1522c2e1cd8138bb43dd7d46a6561a1a Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 25 九月 2024 23:37:04 +0800 Subject: [PATCH] 厂内码客户码绑定增加包装工单和成品料号 --- Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs index 133dc6b..ddd2199 100644 --- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs +++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs @@ -155,9 +155,12 @@ /// </summary> public class WipPkg { + public string WorkBatch { get; set; } public string RULE_CODE { get; set; } public string RULE_NAME { get; set; } + public string ITEM_CODE { 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; @@ -177,7 +180,7 @@ public MES_WIP_PKG Package { get; set; } public bool IsFinished { get; set; } = false; public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>(); - + public int TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : 1; } /// <summary> @@ -219,6 +222,7 @@ /// 鏄惁鎵规鐗╂枡 /// </summary> public bool IsBatchItem { get; set; } + public List<BAS_ITEM> SubItems { get; set; } = new List<BAS_ITEM>(); public List<MES_WIP_ASSY> Records { get; set; } = new List<MES_WIP_ASSY>(); public bool IsFinished { get; set; } = false; } @@ -240,5 +244,25 @@ public string NextNode { get; set; } = " 鈥� "; public string CurNode { get; set; } = " 鈥� "; public int InputQty { get; set; } = 0; + public List<WorkStepInfo> StepsInfo { get; set; } = new List<WorkStepInfo>(); } + + /// <summary> + /// 宸ユ淇℃伅 + /// </summary> + public class WorkStepInfo + { + public string ID { get; set; } + public string Name { get; set; } + public int Sequence { get; set; } + public string NodeID { get; set; } + public string NodeType { get; set; } + public MES_WO_NODE Node { get; set; } + public MES_WO_OPER OperSetting { get; set; } + public MES_WO_NODE_ACT NodeAct { get; set; } + public MES_WO_ACTION ActSetting { get; set; } + public string Status { get; set; } + public string Message { get; set; } + } + } -- Gitblit v1.9.3