From a7d56a5843eafae7ff40bd858978cd8a39021bdb Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 01 八月 2024 22:06:23 +0800
Subject: [PATCH] 重置工序
---
Tiger.Business.MES/Transaction/CollectNode.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 4494617..e7e6c2b 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -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);
@@ -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;
}
@@ -369,6 +369,8 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ //閲嶇疆宸ュ簭
+ ResetNode();
return action;
}
#endregion Functions
--
Gitblit v1.9.3