From 2df22d081aa4d3677b474962e9bbc38db8efa536 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 24 三月 2025 17:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 3eb7342..e375aff 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -46,9 +46,9 @@
/// </summary>
public string DFT_CODE { get; set; }
/// <summary>
- /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑閫夐」
+ /// 褰撳墠鎿嶄綔鐨勮涓虹殑鍙橀噺瀛楀吀锛屽鏋滄槸涓嶆槸琛屼负锛屽惁鍒欑暀绌�
/// </summary>
- public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
+ public Dictionary<string, string> ActionDic { get; set; } = new Dictionary<string, string>();
/// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
@@ -62,10 +62,6 @@
/// </summary>
public bool IsFinished { get; set; } = false;
/// <summary>
- /// 鐭秷鎭�
- /// </summary>
- public ShortMessage ShortMsg { get; set; }
- /// <summary>
/// 褰撳墠鎿嶄綔鐨勮妭鐐瑰悕绉�
/// </summary>
public string NodeName { get; set; }
@@ -78,9 +74,21 @@
/// </summary>
public string ActionType { get; set; }
/// <summary>
+ /// 褰撳墠鎿嶄綔鐨勮涓虹殑鍙橀噺瀛楀吀锛屽鏋滄槸涓嶆槸琛屼负锛屽惁鍒欑暀绌�
+ /// </summary>
+ public Dictionary<string, string> ActionDic { get; set; }
+ /// <summary>
/// 涓嬩竴涓搷浣滅殑宸ユID
/// </summary>
public string NextStepID { get; set; }
+ /// <summary>
+ /// 鐭秷鎭�
+ /// </summary>
+ public ShortMessage ShortMsg { get; set; }
+ /// <summary>
+ /// Mqtt娑堟伅
+ /// </summary>
+ public MQTT.Message MqttMsg { get; set; }
/// <summary>
/// 褰撳墠鎿嶄綔杩斿洖鐨勬暟鎹�
/// </summary>
@@ -195,8 +203,10 @@
public string SN { get; set; }
public MES_WIP_PKG Package { get; set; }
public bool IsFinished { get; set; } = false;
+ public bool PkgComplete => PKG_LEVEL == 1 || Items.Count(q => q.IsFinished) == PKG_QTY;
public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
- public int TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : 1;
+ public Dictionary<string, string> WipSNs { get; set; } = new Dictionary<string, string>();
+ public double TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : Package?.QTY ?? 0;
public List<MES_WIP_PKG> GetMinPackageList()
{
@@ -215,6 +225,23 @@
{
list.Add(Package);
}
+ }
+ return list;
+ }
+
+ public List<KeyValuePair<string, string>> GetWipSnList()
+ {
+ var list = new List<KeyValuePair<string, string>>();
+ if (Items.Any())
+ {
+ foreach (var item in Items)
+ {
+ list.AddRange(item.GetWipSnList());
+ }
+ }
+ else
+ {
+ list.AddRange(WipSNs.ToList());
}
return list;
}
@@ -303,4 +330,14 @@
public string Message { get; set; }
}
+ /// <summary>
+ /// 鍑鸿揣淇℃伅
+ /// </summary>
+ public class ShipingInfo
+ {
+ public bool IsPrintCustomerLabel { get; set; }
+ public int OldShipQty { get; set; }
+ public int ShipQty { get; set; }
+ }
+
}
--
Gitblit v1.9.3