From 31d9f1928baf17a29a5fe0adf7e11bba59d986cf Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 12 九月 2024 16:38:51 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/PackingNode.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index d3fc692..96f3392 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -63,6 +63,8 @@
else
{
NodeCmd = "NodeSubmit";
+ //鏇存柊CurBatch
+ CurBatch = WoContext.GetBatch(CurBatch?.OrderNo, CurLine.LINE_CODE);
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
{
@@ -100,9 +102,18 @@
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
return action;
}
+ if (Context.ContainsKey("CurPackage") && !Context["CurPackage"].IsNullOrEmpty() && (Context["CurPackage"] as WipPkg).WorkBatch != wosns.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, wosns.First().Batch.BATCH_NO, CurSN);
+ return action;
+ }
if (wosns.First().Batch.ACT_LINE != CurLine.LINE_CODE)
{
- action.Data.ShortMsg = new("浜х嚎閿欒", ShortMessage.Types.Error);
+ action.Data.ShortMsg = new("浜х嚎鎶曚骇閿欒", ShortMessage.Types.Error);
action.Data.OperInfo = new();
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{0}]宸插湪浜х嚎[{1}]鎶曞叆鐢熶骇锛岃鍦ㄦ纭矖浣嶆壂鎻�");
@@ -585,7 +596,7 @@
NodeCmd = "PkgSubmit";
TempPkgAction = new PackingAction();
- TempPkgAction.Init(null, this, null, null);
+ TempPkgAction.Init(this);
action = TempPkgAction.Submit(null);
}
else
--
Gitblit v1.9.3