From 947e034b871d10522b1046f6acecad6b405276c0 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期二, 29 十月 2024 20:40:35 +0800 Subject: [PATCH] 优化了一些已知问题 --- Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs index ba389de..3eb7342 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> Options { get; set; } = new Dictionary<string, string>(); + /// <summary> /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁 /// </summary> public string Data { get; set; } @@ -148,6 +152,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 +177,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> @@ -187,6 +197,27 @@ public bool IsFinished { get; set; } = false; public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>(); public int TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : 1; + + 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; + } } /// <summary> -- Gitblit v1.9.3