From 35afcfe07fef52f74a2079fdb5977a87f88ddbb6 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 17 十二月 2024 20:40:47 +0800
Subject: [PATCH] 提交前检查是否岗位、工单和不良代码
---
Tiger.Business.MES/Transaction/PackingNode.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index f0943da..4621164 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -264,6 +264,8 @@
{
action.Data.ShortMsg = new("宸ュ簭寮傚父", ShortMessage.Types.Error);
action.Data.OperInfo = CurOperInfo(input.Locale);
+ RemoveCurSnFromCurPackage(Context.ContainsKey("CurPackage") ? (Context["CurPackage"] as WipPkg).Item : null);
+ ResetNode();
//action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
}
@@ -313,7 +315,6 @@
FLOW_SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
ITEM_CODE = CurBatch.WO.ITEM_CODE,
- QTY = 1,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
BATCH_NO = CurBatch.Batch.BATCH_NO,
FTY_CODE = CurFactory.FTY_CODE,
@@ -376,7 +377,6 @@
FLOW_SN = wipSN.SN,
TRAY_SN = wipSN.TRAY_SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
- QTY = 1,
});
}
}
@@ -625,6 +625,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));
@@ -860,6 +861,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