From 872730679351456e02fc80432788791b86309fac Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 10 十二月 2024 17:19:14 +0800
Subject: [PATCH] 优化包装节点异常数据处理
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 6ffaa14..e4469c4 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -422,25 +422,9 @@
ShippingOrder = IsPrintCustomerLabel ? ship?.ShipDoc ?? "" : "";
//缂撳瓨鍑鸿揣鏁伴噺
Context.SetOrAdd("CurShipQty", CurShipQty);
- //if (Context.ContainsKey("CurShipQty"))
- //{
- // Context["CurShipQty"] = CurShipQty;
- //}
- //else
- //{
- // Context.Add("CurShipQty", CurShipQty);
- //}
//缂撳瓨鍑鸿揣绠辨暟
Context.SetOrAdd("CurWaitShipmentCarton", WaitShipmentCarton);
Context.SetOrAdd("CurWaitShipment", WaitShipment);
- //if (Context.ContainsKey("CurWaitShipmentCarton"))
- //{
- // Context["CurWaitShipmentCarton"] = WaitShipmentCarton;
- //}
- //else
- //{
- // Context.Add("CurWaitShipmentCarton", WaitShipmentCarton);
- //}
debug.Log(new StackFrame(true), "***** 12", info => { ConsoleExt.WriteLine(info.ToString()); });
//缁戝畾鏉＄爜鍒板伐鍗�
@@ -706,6 +690,7 @@
catch (Exception ex)
{
action.Data.ShortMsg = new("宸ユ寮傚父", ShortMessage.Types.Error);
+ RemoveCurSnFromCurPackage(Context.ContainsKey("CurPackage") ? (Context["CurPackage"] as WipPkg).Item : null);
ResetNode();
//action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯革紝璇锋鏌ュ伐搴忚妭鐐硅缃�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));
@@ -1006,6 +991,26 @@
NodeCmd = null;
}
+ public void RemoveCurSnFromCurPackage(WipPkgItem pkgItem)
+ {
+ if (!pkgItem.IsNullOrEmpty())
+ {
+ var delItem = pkgItem.Items.Where(q => CurWipSNs.Any(sn => q.WipSNs.ContainsKey(sn.ID))).ToList();
+ if (delItem.Any())
+ {
+ pkgItem.Items.RemoveAll(q => CurWipSNs.Any(sn => q.WipSNs.ContainsKey(sn.ID)));
+ pkgItem.IsFinished = false;
+ }
+ else
+ {
+ foreach (var item in pkgItem.Items)
+ {
+ RemoveCurSnFromCurPackage(item);
+ }
+ }
+ }
+ }
+
public override bool Close(bool needSaveHistoryLog = false)
{
//needSaveHistoryLog = true;
--
Gitblit v1.9.3