From 8bc453e47b30f0acf4333bec955ec86dadf428d5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 16 十月 2024 14:32:11 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/WorkAction/PrintLabel.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index a3f2941..a818341 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -42,6 +42,9 @@
Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+
+ CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -64,10 +67,12 @@
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
//璁剧疆鎵撳嵃鍙橀噺鍊�
- Label = CurPosition.SetLabelVariables(LabelPV, Label);
+ Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
action.Data.Data = Label;
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("鎵撳嵃寮�濮�");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = true;
action.Data.ShortMsg = new("鎵撳嵃寮�濮�", ShortMessage.Types.Success);
return action;
@@ -83,11 +88,13 @@
//鎻愪氦鏁版嵁鎵ц鎴愬姛
if (input.Data.ToBoolean())
{
- 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($"鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃澶辫触", Label.LABEL_NAME);
@@ -104,7 +111,7 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
@@ -148,6 +155,7 @@
ACT_VALUE_1 = Label.LABEL_CODE,
ACT_VALUE_2 = Label.Variables.ToJson(),
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃鎴愬姛",
};
wipActs.Add(wipAct);
@@ -163,6 +171,8 @@
};
IsFinished = true;
+ CurStep.Message = Biz.L("鎵撳嵃瀹屾垚");
+ CurStep.Status = StepStatus.Finished;
action.Data.ShortMsg = new("鎵撳嵃瀹屾垚", ShortMessage.Types.Success);
//action.LocaleMsg = new($"鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃鎴愬姛", Label.LABEL_NAME);
action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintSuccess", Label.LABEL_NAME, Label.LABEL_CODE);
--
Gitblit v1.9.3