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 | 68 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index fb7cf93..82074a3 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -38,9 +38,17 @@
/// </summary>
public string SN { get; set; }
/// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string Qty { get; set; }
+ /// <summary>
/// 褰撳墠鎿嶄綔鎻愪氦鐨勪笉鑹唬鐮侊紝娌℃湁鍒欑暀绌�
/// </summary>
public string DFT_CODE { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑閫夐」
+ /// </summary>
+ public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
/// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
@@ -57,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>
@@ -89,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
@@ -145,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; }
@@ -155,10 +166,18 @@
/// </summary>
public class WipPkg
{
+ public string WorkBatch { get; set; }
public string RULE_CODE { get; set; }
public string RULE_NAME { 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>
@@ -172,10 +191,11 @@
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>();
-
+ public int TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : 1;
}
/// <summary>
@@ -217,6 +237,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;
}
@@ -235,8 +256,29 @@
/// </summary>
public class OperInfo
{
- public string NextNode { get; set; }
- public string CurNode { get; set; }
- public int InputQty { get; set; }
+ public string NextNode { get; set; } = " 鈥� ";
+ public string CurNode { get; set; } = " 鈥� ";
+ public bool IsReachedEndNode { get; set; } = false;
+ 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