From 7febfae83ccb8c1d927a817145fc9c99d173f222 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 25 十月 2024 00:03:15 +0800
Subject: [PATCH] 计划任务更新，用FluentScheduler
---
Tiger.Business.MES/WorkAction/Weighing.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Weighing.cs b/Tiger.Business.MES/WorkAction/Weighing.cs
index 0fbb9b3..091f1a0 100644
--- a/Tiger.Business.MES/WorkAction/Weighing.cs
+++ b/Tiger.Business.MES/WorkAction/Weighing.cs
@@ -38,6 +38,7 @@
NodeAct = nodeAct;
Setting = setting;
#endregion
+
CurPkg = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
@@ -59,6 +60,9 @@
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
};
+
+ CurStep.Message = Biz.L("绛夊緟绉伴噸鏁版嵁");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -83,7 +87,10 @@
action.LocaleMsg = GetBeginMsg();
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("绉伴噸寮�濮�");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = true;
+ action.Data.ShortMsg = new("绉伴噸寮�濮�", ShortMessage.Types.Success);
return action;
}
@@ -107,7 +114,7 @@
}
else
{
- action = End();
+ action = End(input);
}
return action;
}
@@ -122,7 +129,10 @@
}
catch (System.Exception ex)
{
- action.CatchExceptionWithLog(ex, $"绉伴噸琛屼负锛氭潯鐮乕{CurPosition.CurSN}]绉伴噸鏁版嵁[{input?.Data.ToString()}]淇濆瓨寮傚父");
+ CurStep.Message = Biz.L("绉伴噸寮傚父");
+ CurStep.Status = StepStatus.Error;
+ action.Data.ShortMsg = new("绉伴噸寮傚父", ShortMessage.Types.Error);
+ action.CatchExceptionWithLog(ex, $"绉伴噸琛屼负锛氭潯鐮乕{CurPosition.CurSN}]绉伴噸鏁版嵁[{input?.Data?.ToString()}]淇濆瓨寮傚父");
action.LocaleMsg = new("MES.WorkAction.Weighing.SaveWeightInfoException", CurPosition.CurSN, input?.Data.ToString());
}
return action;
@@ -132,7 +142,7 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
@@ -174,6 +184,7 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"鏉＄爜[{CurPosition.CurSN}]绉伴噸鏁版嵁[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]淇濆瓨鎴愬姛",
};
wipActs.Add(wipAct);
@@ -191,6 +202,9 @@
};
IsFinished = true;
+ CurStep.Message = Biz.L("绉伴噸瀹屾垚");
+ CurStep.Status = StepStatus.Finished;
+ action.Data.ShortMsg = new("绉伴噸瀹屾垚", ShortMessage.Types.Success);
//action.LocaleMsg = new($"鏉＄爜[{CurPosition.CurSN}]绉伴噸鏁版嵁[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]淇濆瓨鎴愬姛");
action.LocaleMsg = new("MES.WorkAction.Weighing.SaveSuccess", CurPosition.CurSN, CurPkg.WEIGHT, CurPkg.WEIGHT_UNIT);
return action;
--
Gitblit v1.9.3