From e14fe1c9f7753de8bad65b193843748429d6dde1 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 04 八月 2024 17:54:53 +0800
Subject: [PATCH] 修改包装行为的打印模板获取方法
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 5437c96..0256ef9 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -64,11 +64,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>
@@ -159,4 +163,37 @@
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; }
+ 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; }
+ public List<MES_WIP_ASSY> Records { get; set; } = new List<MES_WIP_ASSY>();
+ public bool IsFinished { get; set; } = false;
+
+ }
}
--
Gitblit v1.9.3