From c598e4bf57de2b4703d6c0e4d0905c9159273d26 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 06 八月 2024 10:16:18 +0800
Subject: [PATCH] 条码增加托盘批量过站逻辑和包装外箱过站逻辑
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 134 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 127 insertions(+), 7 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index e778eeb..dd244a4 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -54,21 +54,25 @@
/// </summary>
public bool IsFinished { get; set; } = false;
/// <summary>
- /// 褰撳墠鎿嶄綔鐨勫伐鍗�
+ /// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
/// </summary>
- public string CurWO { get; set; }
+ public BIZ_MES_WO CurWO { get; set; }
/// <summary>
- /// 褰撳墠鎿嶄綔鐨勫伐鍗曟壒娆�
+ /// 褰撳墠鎿嶄綔鐨勫伐鍗曟壒娆″璞�
/// </summary>
- public string CurBatch { get; set; }
+ public BIZ_MES_WO_BATCH CurBatch { get; set; }
/// <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 +81,7 @@
/// 褰撳墠鎿嶄綔杩斿洖鐨勬暟鎹�
/// </summary>
public object Data { get; set; }
+
}
public class DefectOutput
@@ -87,4 +92,119 @@
public string DFT_NAME { get; set; }
public int DFT_LEVEL { get; set; }
}
+
+ public class PackingActionInput
+ {
+ /// <summary>
+ /// 鍖呰琛屼负褰撳墠鎵ц鐨勬搷浣滀唬鐮侊紝鍖呮嫭锛�<br/>
+ /// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
+ /// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
+ /// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰鍚庣粨鏉熻涓�<br/>
+ /// </summary>
+ public string ExecCode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛绔槸鍚﹀畬鎴愬綋鍓嶆搷浣�
+ /// </summary>
+ public bool IsFinish { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾�
+ /// </summary>
+ public int PkgLevel { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾х殑鏍囩鏉＄爜
+ /// </summary>
+ public string PkgSN { get; set; }
+ }
+
+ public class PackingActionOutput
+ {
+ public WipPkg PkgInfo { get; set; }
+ /// <summary>
+ /// 鍖呰琛屼负褰撳墠鎵ц鐨勬搷浣滀唬鐮侊紝鍖呮嫭锛�<br/>
+ /// Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�<br/>
+ /// Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�<br/>
+ /// Complete锛氬畬鎴愶紝宸蹭繚瀛樺寘瑁呮暟鎹�<br/>
+ /// </summary>
+ public string ExecCode { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勫寘瑁呭眰绾�
+ /// </summary>
+ public int PkgLevel { get; set; }
+ /// <summary>
+ /// 褰撳墠闇�瑕佹墦鍗扮殑鍖呰灞傜骇鐨勬爣绛句俊鎭�
+ /// </summary>
+ public BAS_LABEL_TEMP PrintLable { get; set; }
+ }
+
+ /// <summary>
+ /// 鍦ㄧ嚎鍖呰
+ /// </summary>
+ public class WipPkg
+ {
+ public string RULE_CODE { get; set; }
+ public string RULE_NAME { get; set; }
+ public WipPkgItem Item { get; set; }
+ public bool IsFinished { get; set; } = false;
+ }
+
+ /// <summary>
+ /// 鍦ㄧ嚎鍖呰鏄庣粏
+ /// </summary>
+ public class WipPkgItem
+ {
+ public string PKG_CODE { get; set; }
+ public string PKG_NAME { get; set; }
+ public string IS_MIN_PKG { get; set; }
+ public int PKG_LEVEL { get; set; }
+ public int PKG_QTY { get; set; }
+ public string LABEL_CODE { get; set; }
+ public MES_WIP_PKG Package { get; set; }
+ public bool IsFinished { get; set; } = false;
+ 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;
+
+ }
}
--
Gitblit v1.9.3