From 8bfaf7141c88f41d3dbd1995cfb9cb015ca0d1d6 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 16:34:13 +0800
Subject: [PATCH] 整理了工序传入传出参数
---
Tiger.Business.MES/Transaction/CollectNode.cs | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index f7dd115..b374b1b 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -10,6 +10,7 @@
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
+using static System.Net.Mime.MediaTypeNames;
namespace Tiger.Business.MES.Transaction
{
@@ -123,12 +124,7 @@
}
else
{
- result.Data.IsFinished = IsFinishAllSteps;
- result.Data.CurWO = CurBatch.WO.ORDER_NO;
- result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
- result.Data.CurNode = CurStep?.NodeAct.ACT_NAME;
- result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
- result.Data.NextStepID = CurStep?.ID;
+ result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
}
}
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
@@ -260,7 +256,6 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
{
- NodeID = curNode.ID,
Sequence = Steps.Count + 1,
Node = curNode,
DBSubmitAction = () =>
@@ -303,11 +298,7 @@
NextSteps.Clear();
NextSteps.Add(next);
//鏍规嵁鍚庣画宸ユ杩斿洖ApiAction
- result.Data.IsFinished = IsFinishAllSteps;
- result.Data.CurWO = CurBatch.WO.ORDER_NO;
- result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
- result.Data.CurNode = CurStep?.Node.NODE_NAME;
- result.Data.NextStepID = next.ID;
+ result.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
//鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
switch (next.Sequence)
@@ -330,11 +321,7 @@
//宸插畬鎴愭墍鏈夊伐姝�
else
{
- action.Data.IsFinished = IsFinishAllSteps;
- action.Data.CurWO = CurBatch.WO.ORDER_NO;
- action.Data.CurBatch = CurBatch.Batch.BATCH_NO;
- action.Data.CurNode = CurStep?.Node.NODE_NAME;
- action.Data.NextStepID = "";
+ action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
action = DoIfFinishAllSteps(action);
}
}
@@ -369,6 +356,8 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", 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", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ //閲嶇疆宸ュ簭
+ ResetNode();
return action;
}
#endregion Functions
--
Gitblit v1.9.3