From 36746596927952a6b860129a62eec9059bf083a7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 26 四月 2025 18:06:27 +0800
Subject: [PATCH] 优化了备料逻辑
---
Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs b/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs
index 42477bd..b55fbae 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs
@@ -277,5 +277,94 @@
return Ok(response);
}
+ /// <summary>
+ /// 闆呰揪瑁呯宸ュ簭锛氭墦鍗版祴璇曟爣绛�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/YadaPacking/TestPrint")]
+ public async Task<IActionResult> YadaPacking_TestPrintAsync([FromBody] ApiAction action)
+ {
+ ApiAction response;
+ IYadaPacking trans = null;
+ try
+ {
+ if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
+ {
+ trans = iBiz.MES.Context.GetTransDic()[action.ID] as IYadaPacking;
+ if (!trans.IsFinished)
+ {
+ if (action.IsAsync)
+ {
+ response = action.GetResponse(await trans.TestPrint());
+ }
+ else
+ {
+ lock (trans.TransLock) { response = action.GetResponse(trans.TestPrint().Result); }
+ }
+ }
+ 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>
+ /// 闆呰揪瑁呯宸ュ簭锛氭墦鍗版祴璇曟爣绛�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/YadaPacking/GetIsCustomerLabelAndShipQty")]
+ public async Task<IActionResult> YadaPacking_GetIsCustomerLabelAndShipQtyAsync([FromBody] ApiAction action)
+ {
+ ApiAction response;
+ IYadaPacking trans = null;
+ try
+ {
+ if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
+ {
+ trans = iBiz.MES.Context.GetTransDic()[action.ID] as IYadaPacking;
+ if (!trans.IsFinished)
+ {
+ if (action.IsAsync)
+ {
+ response = action.GetResponse(await trans.GetIsCustomerLabelAndShipQty());
+ }
+ else
+ {
+ lock (trans.TransLock) { response = action.GetResponse(trans.GetIsCustomerLabelAndShipQty().Result); }
+ }
+ }
+ 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);
+ }
}
}
--
Gitblit v1.9.3