Tiger.Business.MES/WorkAction/PackingAction.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -377,6 +377,7 @@ //最外层包装已处理完成则直接结束行为 if (CurPkg.Item.PKG_LEVEL == FinishLevel) { CurPkg.Item.WipSNs = CurPosition.CurWipSNs.ToDictionary(k => k.ID, v => v.SN); action = End(input); } //最外层包装未打印扫描则继续 @@ -586,6 +587,9 @@ CurPkgItem.Package.ACT_ID = NodeAct.ID; CurPkgItem.Package.ACT_NAME = NodeAct.ACT_NAME; CurPkgItem.Package.FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN; CurPkgItem.WipSNs = CurPosition.CurWipSNs.ToDictionary(k => k.ID, v => v.SN); FinishLevel++; //完成包装的层级小于最外层包装层级 if (FinishLevel < PkgRule.Details.Max(q => q.PKG_LEVEL)) Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -196,6 +196,7 @@ public MES_WIP_PKG Package { get; set; } public bool IsFinished { get; set; } = false; public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>(); public Dictionary<string, string> WipSNs { get; set; } = new Dictionary<string, string>(); public int TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : 1; public List<MES_WIP_PKG> GetMinPackageList() @@ -218,6 +219,23 @@ } 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>