From ba0b68c347de4c9214d128d0b51d3af75688d6b3 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 11 九月 2024 01:22:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/WorkAction/VerifyItem.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/VerifyItem.cs b/Tiger.Business.MES/WorkAction/VerifyItem.cs
index 2abb1b8..be5a039 100644
--- a/Tiger.Business.MES/WorkAction/VerifyItem.cs
+++ b/Tiger.Business.MES/WorkAction/VerifyItem.cs
@@ -39,7 +39,8 @@
Setting = setting;
#endregion
-
+ CurStep.Message = Biz.L("楠岃瘉浜у搧鏁版嵁");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -64,6 +65,8 @@
action = Submit(input);
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ //CurStep.Message = Biz.L("楠岃瘉寮�濮�");
+ //CurStep.Status = StepStatus.Normal;
//action.IsSuccessed = true;
//action.Data.ShortMsg = new("楠岃瘉寮�濮�", ShortMessage.Types.Success);
return action;
@@ -78,7 +81,7 @@
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
action = Verify(input, action);
- //涓婃枡鏁版嵁淇濆瓨澶辫触
+ //鏁版嵁淇濆瓨澶辫触
if (!action.IsSuccessed)
{
//濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
@@ -98,6 +101,8 @@
//楠岃瘉閫昏緫
//if (input.SN.IsNullOrEmpty())
{
+ CurStep.Message = Biz.L("楠岃瘉澶辫触");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("楠岃瘉澶辫触", ShortMessage.Types.Failed);
action.IsSuccessed = isOK = false;
//action.LocaleMsg = new Locale($"閿欒锛歔{ExtInfo.FIELD_NAME}]鏍囩鏉＄爜涓嶈兘涓虹┖锛岃閲嶆柊鎵弿");
@@ -105,6 +110,8 @@
}
//if (CurPosition.CurWipSNs.Any(w => w.SN == input.SN))
{
+ CurStep.Message = Biz.L("楠岃瘉澶辫触");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("楠岃瘉澶辫触", ShortMessage.Types.Failed);
action.IsSuccessed = isOK = false;
//action.LocaleMsg = new Locale($"閿欒锛氭壂鎻忓埌浜у搧鏉＄爜[{input.SN}]锛岃閲嶆柊鎵弿[{ExtInfo.FIELD_NAME}]鏍囩鏉＄爜");
@@ -114,13 +121,15 @@
//楠岃瘉閫氳繃鍒欎繚瀛�
if (isOK)
{
- action = End();
+ action = End(input);
}
//閮芥病鏈夌墿鏂欓獙璇侀�氳繃锛屽垯杩斿洖閿欒淇℃伅
}
catch (System.Exception ex)
{
+ CurStep.Message = Biz.L("楠岃瘉寮傚父");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("楠岃瘉寮傚父", ShortMessage.Types.Exception);
action.CatchExceptionWithLog(ex, $"楠岃瘉寮傚父");
action.IsSuccessed = false;
@@ -135,7 +144,7 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
@@ -192,6 +201,8 @@
};
IsFinished = true;
+ CurStep.Message = Biz.L("楠岃瘉閫氳繃");
+ CurStep.Status = StepStatus.Finished;
action.Data.ShortMsg = new("楠岃瘉閫氳繃", ShortMessage.Types.Success);
//action.LocaleMsg = new($"浜у搧[{CurPosition.CurSN}]楠岃瘉閫氳繃");
action.LocaleMsg = new("MES.WorkAction.VerifyItem.VerifySuccess", CurPosition.CurSN);
--
Gitblit v1.9.3