From 0fdb04b7c451d7c59b226c25425722afd3364916 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 25 九月 2024 16:37:52 +0800
Subject: [PATCH] 优化工序和行为逻辑
---
Tiger.Business.MES/WorkAction/IPQC.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index 933ed6e..8e423ab 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -15,11 +15,13 @@
public class IPQC : IIPQC
{
#region Propertys & Variables
+ #region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
public bool IsFinished { get; set; } = false;
public IWorkStep CurStep { get; set; }
public IPosition CurPosition { get; set; }
public MES_WO_NODE_ACT NodeAct { get; set; }
public MES_WO_ACTION Setting { get; set; }
+ #endregion
#endregion Propertys & Variables
#region Functions
@@ -29,10 +31,15 @@
/// <returns></returns>
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
+ #region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
+ #endregion
+
+ CurStep.Message = Biz.L("绛夊緟娴嬭瘯缁撴灉");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -59,7 +66,10 @@
action.LocaleMsg = new("MES.WorkAction.IPQC.PleaseTest");
//濡傛灉鏍规嵁杈撳叆鍙互寮�濮嬫墽琛屽綋鍓嶈涓哄垯鏍囪涓烘垚鍔燂紝鍚﹀垯澶辫触
+ CurStep.Message = Biz.L("绛夊緟娴嬭瘯");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = false;
+ action.Data.ShortMsg = new("绛夊緟娴嬭瘯", ShortMessage.Types.Success);
return action;
}
/// <summary>
@@ -79,12 +89,15 @@
//琛屼负鎵ц瀹屾垚
if (false)
{
- action = End();
+ action = End(input);
}
}
//鎻愪氦鏁版嵁鎵ц澶辫触
else
{
+ CurStep.Message = Biz.L("娴嬭瘯澶辫触");
+ CurStep.Status = StepStatus.Error;
+ action.Data.ShortMsg = new("娴嬭瘯澶辫触", ShortMessage.Types.Failed);
action.IsSuccessed = false;
//action.LocaleMsg = new($"鎵ц澶辫触");
action.LocaleMsg = new("MES.WorkAction.IPQC.Fail");
@@ -101,7 +114,7 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
@@ -148,6 +161,7 @@
ACT_VALUE_4 = "",
ACT_VALUE_5 = "",
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"鎵ц鎴愬姛",
};
wipActs.Add(wipAct);
@@ -163,7 +177,10 @@
};
IsFinished = true;
- action.LocaleMsg = new($"琛屼负缁撴潫");
+ CurStep.Message = Biz.L("娴嬭瘯瀹屾垚");
+ CurStep.Status = StepStatus.Finished;
+ action.Data.ShortMsg = new("娴嬭瘯瀹屾垚", ShortMessage.Types.Success);
+ action.LocaleMsg = new($"娴嬭瘯缁撴潫");
//action.LocaleMsg = new("MES.WorkAction.IPQC.Finish");
return action;
}
--
Gitblit v1.9.3