From 9f49831b4fc9d883acaec0601dc0d5b3bb25bf4f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 11 十月 2024 19:30:48 +0800
Subject: [PATCH] 包装数量（出货数量）包装工序验证
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 85 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 79 insertions(+), 6 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 0256ef9..a5c99b3 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -45,6 +45,10 @@
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
public string Data { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string Qty { get; set; }
}
public class SubmitOutput
@@ -53,6 +57,10 @@
/// 鏁翠釜宸ュ簭鎿嶄綔鏄惁瀹屾垚
/// </summary>
public bool IsFinished { get; set; } = false;
+ /// <summary>
+ /// 鐭秷鎭�
+ /// </summary>
+ public ShortMessage ShortMsg { get; set; }
/// <summary>
/// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
/// </summary>
@@ -81,6 +89,10 @@
/// 褰撳墠鎿嶄綔杩斿洖鐨勬暟鎹�
/// </summary>
public object Data { get; set; }
+ /// <summary>
+ /// 宸ュ簭淇℃伅
+ /// </summary>
+ public OperInfo OperInfo { get; set; }
}
@@ -99,7 +111,8 @@
/// 鍖呰琛屼负褰撳墠鎵ц鐨勬搷浣滀唬鐮侊紝鍖呮嫭锛�<br/>
/// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
/// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
- /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰鍚庣粨鏉熻涓�<br/>
+ /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰<br/>
+ /// Weighing锛氱О閲嶏紝瀹屾垚鍖呰鍚庡鏁翠釜鍖呰鎴愮О閲�<br/>
/// </summary>
public string ExecCode { get; set; }
/// <summary>
@@ -114,6 +127,10 @@
/// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑鏍囩鏉＄爜
/// </summary>
public string PkgSN { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑閲嶉噺淇℃伅
+ /// </summary>
+ public WeightInfo WeightInfo { get; set; }
}
public class PackingActionOutput
@@ -124,6 +141,7 @@
/// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
/// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
/// Complete锛氬畬鎴愶紝宸蹭繚瀛樺寘瑁呮暟鎹�<br/>
+ /// Weighing锛氱О閲嶏紝瀹屾垚鍖呰鍚庡鏁翠釜鍖呰鎴愮О閲�<br/>
/// </summary>
public string ExecCode { get; set; }
/// <summary>
@@ -141,10 +159,15 @@
/// </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 IsFinished { get; set; } = false;
+ public bool NeedWeighing { get; set; } = false;
+ public bool IsWeighed { get; set; } = false;
+ public WeightInfo WeightInfo { get; set; } = new WeightInfo();
+ public bool IsFinished => Item.IsFinished;
}
/// <summary>
@@ -161,7 +184,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>
@@ -170,8 +193,15 @@
public class AssemblySetting
{
public string ITEM_CODE { get; set; }
- public string RULE_CODE { get; set; }
- public int QTY { get; set; }
+ public string RULE_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鎵规鐗╂枡
+ /// </summary>
+ public bool IsBatchItem { get; set; }
+ /// <summary>
+ /// 涓婃枡鏁伴噺
+ /// </summary>
+ public int QTY { get; set; }
}
/// <summary>
@@ -192,8 +222,51 @@
public BAS_ITEM ItemInfo { get; set; }
public string RuleCode { get; set; }
public int LoadQty { get; set; }
+ /// <summary>
+ /// 鏄惁鎵规鐗╂枡
+ /// </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;
-
}
+
+ /// <summary>
+ /// 绉伴噸淇℃伅
+ /// </summary>
+ public class WeightInfo
+ {
+ public double Weight { get; set; }
+ public string Unit { get; set; }
+ }
+
+ /// <summary>
+ /// 宸ュ簭淇℃伅
+ /// </summary>
+ public class OperInfo
+ {
+ 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