From b3f75becd8305056d8ec3b3b732143c387b397e7 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 11 九月 2024 19:28:47 +0800
Subject: [PATCH] 规则维护更新
---
Tiger.Business.MES/Transaction/PackingNode.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index d3fc692..a82d340 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -100,9 +100,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 +594,7 @@
NodeCmd = "PkgSubmit";
TempPkgAction = new PackingAction();
- TempPkgAction.Init(null, this, null, null);
+ TempPkgAction.Init(this);
action = TempPkgAction.Submit(null);
}
else
--
Gitblit v1.9.3