From e4ccb1dbd2af10d3322cba90722baf059e5bc853 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 18 九月 2024 22:59:23 +0800
Subject: [PATCH] 优化工步信息机制
---
Tiger.Business.MES/Transaction/CollectNode.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 3a9ca91..82ace7f 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -54,12 +54,12 @@
if (!action.IsSuccessed)
{
var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
else if (!IsFinishAllSteps)
{
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
@@ -101,12 +101,12 @@
if (!action.IsSuccessed && !CurWipSNs.Any())
{
var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
else if (!IsFinishAllSteps)
{
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
}
}
@@ -144,7 +144,7 @@
if (submitStep.IsNullOrEmpty())
{
action = BeginNextActionStep(input);
- action.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
+ action.Data.OperInfo = CurOperInfo(input.Locale);
}
else
{
@@ -174,7 +174,7 @@
}
else
{
- result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
+ result.Data.OperInfo = CurOperInfo(input.Locale);
}
return result;
}
@@ -183,7 +183,7 @@
else
{
action.Data.ShortMsg = new("閲嶇疆鎵弿", ShortMessage.Types.Error);
- action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
+ action.Data.OperInfo = CurOperInfo(input.Locale);
ResetNode();
action.IsSuccessed = false;
//action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
@@ -193,7 +193,7 @@
catch (Exception ex)
{
action.Data.ShortMsg = new("宸ュ簭寮傚父", ShortMessage.Types.Error);
- action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
+ action.Data.OperInfo = CurOperInfo(input.Locale);
ResetNode();
//action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.CollectNode.SubmitException"));
@@ -532,8 +532,8 @@
SaveStepsCommitActionToDB();
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
- OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count;
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], locale);
+ CurOperInfo(locale).InputQty += CurWipSNs.Count;
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));
action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME,CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
--
Gitblit v1.9.3