From 77771c41aa9f7f1f242c79b95fc2a8c82bd7c6c8 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 01 一月 2025 15:59:31 +0800
Subject: [PATCH] 增加更新条码数量行为
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index ba389de..0d32bf9 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -46,6 +46,10 @@
/// </summary>
public string DFT_CODE { get; set; }
/// <summary>
+ /// 褰撳墠鎿嶄綔鐨勮涓虹殑鍙橀噺瀛楀吀锛屽鏋滄槸涓嶆槸琛屼负锛屽惁鍒欑暀绌�
+ /// </summary>
+ public Dictionary<string, string> ActionDic { get; set; } = new Dictionary<string, string>();
+ /// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
public string Data { get; set; }
@@ -57,10 +61,6 @@
/// 鏁翠釜宸ュ簭鎿嶄綔鏄惁瀹屾垚
/// </summary>
public bool IsFinished { get; set; } = false;
- /// <summary>
- /// 鐭秷鎭�
- /// </summary>
- public ShortMessage ShortMsg { get; set; }
/// <summary>
/// 褰撳墠鎿嶄綔鐨勮妭鐐瑰悕绉�
/// </summary>
@@ -74,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>
@@ -148,6 +160,10 @@
/// </summary>
public int PkgLevel { get; set; }
/// <summary>
+ /// 鏄惁闇�瑕�
+ /// </summary>
+ public bool RealPrint { get; set; } = true;
+ /// <summary>
/// 褰撳墠闇�瑕佹墦鍗扮殑鍖呰灞傜骇鐨勬爣绛句俊鎭�
/// </summary>
public BAS_LABEL_TEMP PrintLable { get; set; }
@@ -169,6 +185,8 @@
public WeightInfo WeightInfo { get; set; } = new WeightInfo();
public bool IsFinished => Item.IsFinished;
public bool IsReachedEndNode { get; set; } = false;
+ public string InStoreActID { get; set; }
+ public BAS_LABEL_TEMP InStoreLabel { get; set; }
}
/// <summary>
@@ -185,8 +203,48 @@
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()
+ {
+ var list = new List<MES_WIP_PKG>();
+ if (Items.Any())
+ {
+ foreach (var item in Items)
+ {
+ item.Package.PARENT_SN = Package?.SN;
+ list.AddRange(item.GetMinPackageList());
+ }
+ }
+ else
+ {
+ if (Package != null)
+ {
+ 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;
+ }
}
/// <summary>
@@ -272,4 +330,13 @@
public string Message { get; set; }
}
+ /// <summary>
+ /// 鍑鸿揣淇℃伅
+ /// </summary>
+ public class ShipingInfo
+ {
+ public bool IsPrintCustomerLabel { get; set; }
+ public int ShipQty { get; set; }
+ }
+
}
--
Gitblit v1.9.3