From 10f3247a8320da7e1e519c20b8014c65958301c2 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 31 七月 2024 23:17:05 +0800
Subject: [PATCH] 模板变量维护更新
---
Tiger.Business.MES/Transaction/CollectNode.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index e3a6e3a..f7dd115 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -37,7 +37,7 @@
/// <returns></returns>
public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)
{
- var action = new ApiAction<SubmitOutput>();
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
try
{
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
@@ -126,9 +126,9 @@
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.CurNode = CurStep?.NodeAct.ACT_NAME;
+ result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
+ result.Data.NextStepID = CurStep?.ID;
}
}
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
@@ -140,14 +140,14 @@
}
}
//娌℃湁鍙墽琛岀殑宸ユ
- ResetSteps();
+ ResetNode();
action.IsSuccessed = false;
//action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.WorkStepException", CurPosition.POST_CODE);
}
catch (Exception ex)
{
- action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭壂鎻忎骇鍝佹潯鐮佸紓甯�");
+ action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
}
return action;
}
@@ -170,7 +170,7 @@
return woStatus;
}
//闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
- var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
+ var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
{
SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
@@ -273,7 +273,7 @@
};
Steps.Add(curStep);
- //鏈夐渶瑕佸垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
+ //鏈夐渶瑕佺敤鎴锋彁浜や俊鎭垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
//鏈�鍚庢坊鍔犲綋鍓嶅伐搴忕殑琛屼负宸ユ
GenerateSteps(curStep);
@@ -294,7 +294,7 @@
//鏈畬鎴愭墍鏈夊伐姝�
if (!IsFinishAllSteps)
{
- var result = new ApiAction<SubmitOutput>();
+ var result = new ApiAction<SubmitOutput>(new SubmitOutput());
//鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
if (!IsFinishNodeSteps)
{
@@ -306,7 +306,7 @@
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.CurNode = CurStep?.Node.NODE_NAME;
result.Data.NextStepID = next.ID;
//鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
@@ -333,15 +333,15 @@
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.CurNode = CurStep?.Node.NODE_NAME;
action.Data.NextStepID = "";
action = DoIfFinishAllSteps(action);
}
}
catch (Exception ex)
{
- ResetSteps();
- action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭壂鎻忎骇鍝佹潯鐮佸紓甯�");
+ ResetNode();
+ action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯�");
}
return action;
}
--
Gitblit v1.9.3