From 0fdd0687f116ac43f7432227dfaa2ebc2f696575 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 04 八月 2024 17:21:11 +0800
Subject: [PATCH] 增加扩展信息绑定工序
---
Tiger.Business.MES/Transaction/PackingNode.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 5a3b770..6a65b6c 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -175,7 +175,8 @@
}
catch (Exception ex)
{
- action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
+ //action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
+ action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
}
return action;
}
@@ -188,9 +189,9 @@
/// <returns></returns>
public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
{
+ var curNode = CurBatch.GetNode(PostCode);
try
{
- var curNode = CurBatch.GetNode(PostCode);
//鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜�
var woStatus = CurBatch.CheckCanProduce(curNode);
if (!woStatus.IsSuccessed)
@@ -311,14 +312,23 @@
}
};
Steps.Add(curStep);
-
- //鏈夐渶瑕佺敤鎴锋彁浜や俊鎭垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
-
- //鏈�鍚庢坊鍔犲綋鍓嶅伐搴忕殑琛屼负宸ユ
- GenerateSteps(curStep);
-
- //瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
- curStep.IsFinished = true;
+
+ //鏈夐渶瑕佺敤鎴锋彁浜や俊鎭垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
+
+ //鏈�鍚庢坊鍔犲綋鍓嶅伐搴忕殑琛屼负宸ユ
+ try
+ {
+ GenerateSteps(curStep);
+ }
+ catch (System.Exception ex)
+ {
+ ResetNode();
+ //action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚涓哄伐姝ョ敓鎴愬紓甯革紝璇锋鏌ュ伐搴忚涓鸿缃�");
+ action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmit.GenerateStepsException", curNode.NODE_NAME));
+ }
+
+ //瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
CurStep = curStep;
}
else if (!IsFinishNodeSteps)
@@ -372,7 +382,8 @@
catch (Exception ex)
{
ResetNode();
- action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯�");
+ //action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯革紝璇锋鏌ュ伐搴忚妭鐐硅缃�");
+ action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));
}
return action;
}
--
Gitblit v1.9.3