From 1ab448972aed699a5665876316972cc07b879e95 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 18 十月 2024 15:35:13 +0800
Subject: [PATCH] 包装行为支持生成包装条码
---
Tiger.Business.MES/Transaction/PackingNode.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 78b7b56..05cb530 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -114,13 +114,14 @@
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
return action;
}
- if (Context.ContainsKey("CurPackage") && !Context["CurPackage"].IsNullOrEmpty() && (Context["CurPackage"] as WipPkg).WorkBatch != curSNs.First().Batch.BATCH_NO)
+ var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
+ if (!curPkg.IsNullOrEmpty() && !curPkg.IsFinished && curPkg.WorkBatch != curSNs.First().Batch.BATCH_NO)
{
action.Data.ShortMsg = new("宸ュ崟鎵规閿欒", ShortMessage.Types.Error);
action.Data.OperInfo = new();
action.IsSuccessed = false;
//action.LocaleMsg = new($"姝ｅ湪鍖呰宸ュ崟鎵规[{0}]鐨勪骇鍝侊紝璇峰厛瀹屾垚褰撳墠鍖呰鍚庡啀鎵弿鍏朵粬鎵规[{1}]鐨勪骇鍝乕{2}]");
- action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", (Context["CurPackage"] as WipPkg).WorkBatch, curSNs.First().Batch.BATCH_NO, input.SN);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", curPkg.WorkBatch, curSNs.First().Batch.BATCH_NO, input.SN);
return action;
}
if (curSNs.First().Batch.ACT_LINE != CurLine.LINE_CODE)
@@ -476,7 +477,7 @@
CurWipSNHiss.Clear();
foreach (var wipSN in wipSNs)
{
- var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛");
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛锛圱ransId锛歿TransID}锛�");
wipSN.History.Add(his);
CurWipSNHiss.Add(his);
}
@@ -676,16 +677,15 @@
db.Storageable(_wipHiss, UserCode).ExecuteCommand();
if (_pkgList.Any())
{
- foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
- {
- //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
- db.Updateable<MES_WIP_HIS>()
- .SetColumns(q => q.TRAY_SN == curPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == curPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.OPER_CODE == "EndNode")
- .ExecuteCommand();
- }
+ var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var wo = _pkgList.First().WORK_ORDER;
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+ db.Updateable<MES_WIP_HIS>()
+ .SetColumns(q => q.TRAY_SN == curPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == curPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && q.OPER_CODE == "EndNode" && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
}
};
}
--
Gitblit v1.9.3