From ae9e999b7305d8934b9fd1c95d0cf0ca87c31fd1 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 04 九月 2024 10:34:30 +0800
Subject: [PATCH] 增加字段
---
Tiger.Business.MES/Transaction/TestNode.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 81213e3..ae89b25 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -49,9 +49,16 @@
{
action = NodeSubmit(action, input);
//鏇存柊宸ュ簭淇℃伅
- var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
- action.Data.OperInfo = info;
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (!IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
+ }
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
@@ -87,7 +94,16 @@
}
//鏉＄爜杩囩珯
action = NodeSubmit(action, input);
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ if (!action.IsSuccessed && !CurWipSNs.Any())
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (!IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
+ }
}
}
//鏌ユ壘涓嶅埌鏉＄爜宸茬粦瀹氱殑宸ュ崟
@@ -147,9 +163,12 @@
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
if (IsFinishAllSteps)
{
- result = DoIfFinishAllSteps(result);
+ result = DoIfFinishAllSteps(result, input.Locale);
}
- result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
+ else
+ {
+ result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
+ }
return result;
}
}
@@ -204,6 +223,10 @@
ITEM_CODE = CurBatch.WO.ITEM_CODE,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
BATCH_NO = CurBatch.Batch.BATCH_NO,
+ FTY_CODE = CurFactory.FTY_CODE,
+ WS_CODE = CurWorkshop.WS_CODE,
+ LINE_CODE = CurLine.LINE_CODE,
+ POST_CODE = CurPosition.POST_CODE,
HOLD_FLAG = "N",
REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
FINISHED_FLAG = "N",
@@ -256,6 +279,7 @@
WORK_ORDER = CurBatch.Batch.ORDER_NO,
WIP_ID = wipSN.ID,
SN = wipSN.SN,
+ FLOW_SN = wipSN.SN,
TRAY_SN = wipSN.TRAY_SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
});
@@ -365,7 +389,9 @@
CurWipSNHiss.Clear();
foreach (var wipSN in wipSNs)
{
- CurWipSNHiss.Add(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}]鎴愬姛");
+ wipSN.History.Add(his);
+ CurWipSNHiss.Add(his);
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
@@ -378,10 +404,12 @@
//鍒濆鍖栧伐姝ュ垪琛�
Steps.Clear();
- var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
+ var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
{
+ Name = "鎵弿浜у搧",
Sequence = Steps.Count + 1,
Node = curNode,
+ OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
DBSubmitAction = () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
@@ -426,15 +454,15 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
- curStep.IsFinished = true;
+ curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
else if (!IsFinishNodeSteps)
{
- var curStep = Steps.Where(q => q.Type == IWorkStep.Types.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
+ var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
- curStep.IsFinished = true;
+ curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -444,7 +472,7 @@
//鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
if (!IsFinishNodeSteps)
{
- var next = Steps.Where(q => q.Type == IWorkStep.Types.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
+ var next = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//璁剧疆鍚庣画鍙墽琛岀殑宸ユ鍒楄〃
NextSteps.Clear();
NextSteps.Add(next);
@@ -472,7 +500,7 @@
if (IsFinishAllSteps)
{
action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
- action = DoIfFinishAllSteps(action);
+ action = DoIfFinishAllSteps(action, input.Locale);
}
}
catch (Exception ex)
@@ -490,16 +518,18 @@
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
- public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action)
+ public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action, string locale)
{
//淇濆瓨鏁版嵁搴�
SaveStepsCommitActionToDB();
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count;
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], 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>());
+
//閲嶇疆宸ュ簭
ResetNode();
return action;
--
Gitblit v1.9.3