From 41961aaa4f4915890404a69f75d3bd8e46989df4 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 22 八月 2024 16:03:16 +0800
Subject: [PATCH] 包装更新
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 92 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 5437c96..133dc6b 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -54,6 +54,10 @@
/// </summary>
public bool IsFinished { get; set; } = false;
/// <summary>
+ /// 鐭秷鎭�
+ /// </summary>
+ public ShortMessage ShortMsg { get; set; }
+ /// <summary>
/// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
/// </summary>
public BIZ_MES_WO CurWO { get; set; }
@@ -64,11 +68,15 @@
/// <summary>
/// 褰撳墠鎿嶄綔鐨勮妭鐐瑰悕绉�
/// </summary>
- public string CurNode { get; set; }
+ public string NodeName { get; set; }
/// <summary>
- /// 濡傛灉褰撳墠鑺傜偣涓哄伐搴忚涓鸿妭鐐癸紝鍒欒涓哄畾涔夌紪鐮侊紝鍚﹀垯鐣欑┖
+ /// 褰撳墠鎿嶄綔鐨勮涓哄悕绉帮紝濡傛灉鏄笉鏄涓猴紝鍚﹀垯鐣欑┖
/// </summary>
- public string StepActCode { get; set; }
+ public string ActionName { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勮涓虹殑绫诲悕锛屽鏋滄槸涓嶆槸琛屼负锛屽惁鍒欑暀绌�
+ /// </summary>
+ public string ActionType { get; set; }
/// <summary>
/// 涓嬩竴涓搷浣滅殑宸ユID
/// </summary>
@@ -77,6 +85,10 @@
/// 褰撳墠鎿嶄綔杩斿洖鐨勬暟鎹�
/// </summary>
public object Data { get; set; }
+ /// <summary>
+ /// 宸ュ簭淇℃伅
+ /// </summary>
+ public OperInfo OperInfo { get; set; }
}
@@ -95,7 +107,8 @@
/// 鍖呰琛屼负褰撳墠鎵ц鐨勬搷浣滀唬鐮侊紝鍖呮嫭锛�<br/>
/// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
/// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
- /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰鍚庣粨鏉熻涓�<br/>
+ /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰<br/>
+ /// Weighing锛氱О閲嶏紝瀹屾垚鍖呰鍚庡鏁翠釜鍖呰鎴愮О閲�<br/>
/// </summary>
public string ExecCode { get; set; }
/// <summary>
@@ -110,6 +123,10 @@
/// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑鏍囩鏉＄爜
/// </summary>
public string PkgSN { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑閲嶉噺淇℃伅
+ /// </summary>
+ public WeightInfo WeightInfo { get; set; }
}
public class PackingActionOutput
@@ -120,6 +137,7 @@
/// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
/// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
/// Complete锛氬畬鎴愶紝宸蹭繚瀛樺寘瑁呮暟鎹�<br/>
+ /// Weighing锛氱О閲嶏紝瀹屾垚鍖呰鍚庡鏁翠釜鍖呰鎴愮О閲�<br/>
/// </summary>
public string ExecCode { get; set; }
/// <summary>
@@ -140,7 +158,9 @@
public string RULE_CODE { get; set; }
public string RULE_NAME { get; set; }
public WipPkgItem Item { get; set; }
- public bool IsFinished { get; set; } = false;
+ public bool IsWeighed { get; set; } = false;
+ public WeightInfo WeightInfo { get; set; } = new WeightInfo();
+ public bool IsFinished => Item.IsFinished;
}
/// <summary>
@@ -159,4 +179,66 @@
public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
}
+
+ /// <summary>
+ /// 涓婃枡璁剧疆
+ /// </summary>
+ public class AssemblySetting
+ {
+ public string ITEM_CODE { get; set; }
+ public string RULE_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鎵规鐗╂枡
+ /// </summary>
+ public bool IsBatchItem { get; set; }
+ /// <summary>
+ /// 涓婃枡鏁伴噺
+ /// </summary>
+ public int QTY { get; set; }
+ }
+
+ /// <summary>
+ /// 涓婃枡淇℃伅
+ /// </summary>
+ public class AssemblyInfo
+ {
+ public MES_WIP_DATA Product { get; set; }
+ public bool IsFinished => !Items.Any(q => !q.IsFinished);
+ public List<AssemblyItem> Items { get; set; } = new List<AssemblyItem>();
+ }
+
+ /// <summary>
+ /// 涓婃枡淇℃伅鏄庣粏
+ /// </summary>
+ public class AssemblyItem
+ {
+ 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<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;
+ }
}
--
Gitblit v1.9.3