From f55c2a5b2f1c9d3aad310766b8281f4b7f7c1ded Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 22 八月 2024 12:06:56 +0800
Subject: [PATCH] 优化包装逻辑
---
Tiger.Api/Controllers/MES/MESController.CollectNode.cs | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/Tiger.Api/Controllers/MES/MESController.CollectNode.cs b/Tiger.Api/Controllers/MES/MESController.CollectNode.cs
index f3ee1f1..97803f1 100644
--- a/Tiger.Api/Controllers/MES/MESController.CollectNode.cs
+++ b/Tiger.Api/Controllers/MES/MESController.CollectNode.cs
@@ -100,6 +100,44 @@
return Ok(response);
}
+ /// <summary>
+ /// Reset(ApiAction)
+ /// 閲嶇疆宸ュ簭鎿嶄綔
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/CollectNode/Reset")]
+ public async Task<IActionResult> CollectNode_ResetAsync([FromBody] ApiAction action)
+ {
+ ApiAction response;
+ ICollectNode trans = null;
+ try
+ {
+ if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
+ {
+ trans = iBiz.MES.Context.GetTransDic()[action.ID] as ICollectNode;
+ if (!trans.IsFinished)
+ {
+ lock (trans.TransLock) { response = action.GetResponse(trans.Reset()); }
+ }
+ else
+ {
+ response = action.GetResponse($"Transaction Error: 宀椾綅[{trans.PostCode}]鐨勯噰闆嗗伐搴忎簨鍔ID:{action.ID}]宸茬粡鍏抽棴", false);
+ }
+ }
+ else
+ {
+ response = action.GetResponse($"Transaction Error: 宀椾綅鐨勯噰闆嗗伐搴忎簨鍔ID:{action.ID}]宸茬粡琚叧闂�", false);
+ }
+ }
+ catch (System.Exception ex)
+ {
+ response = action.GetResponse().CatchExceptionWithLog(ex);
+ }
+ trans?.AddHistory(Request, action);
+ return Ok(response);
+ }
/// <summary>
/// SelectWO(ApiAction(Data:{WoInput}))
@@ -149,7 +187,7 @@
/// <summary>
/// Submit(ApiAction(Data:{SubmitInput}))
- /// 娴嬭瘯宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹�
+ /// 閲囬泦宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹�
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
--
Gitblit v1.9.3