From 3ab68d4877acffcb9677ecf369e15210e5db6981 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期一, 28 四月 2025 17:03:08 +0800 Subject: [PATCH] 一些更改 --- Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs index 3c5261c..f3f26f7 100644 --- a/Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs +++ b/Tiger.Controllers.WMS/Controllers/WMSController.Print_BIZ_U9_ASN.cs @@ -137,5 +137,90 @@ return Ok(response); } + [HttpPost] + [Route("api/[controller]/Print_U9Asn/GetOrderList")] + public async Task<IActionResult> Print_BIZ_U9_ASN_GetOrderListAsync([FromBody] ApiAction<BaseInput> action) + { + ApiAction response; + IPrint_BIZ_U9_ASN trans = null; + try + { + if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID)) + { + trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IPrint_BIZ_U9_ASN; + if (!trans.IsFinished) + { + if (action.IsAsync) + { + response = action.GetResponse(await trans.Scan(action.Data)); + } + else + { + lock (trans.TransLock) { response = action.GetResponse(trans.GetOrderList().Result); } + } + } + else + { + response = action.GetResponse($"Transaction Error: (U9)鏉ユ枡鎵撳嵃娓呯偣浜嬪姟[ID:{action.ID}]宸茬粡鍏抽棴锛岃閲嶆柊鎵撳紑(U9)鏉ユ枡鎵撳嵃娓呯偣鍔熻兘", false); + } + } + else + { + response = action.GetResponse($"Transaction Error: (U9)鏉ユ枡鎵撳嵃娓呯偣浜嬪姟[ID:{action.ID}]鏁版嵁涓㈠け锛岃閲嶆柊鎵撳紑(U9)鏉ユ枡鎵撳嵃娓呯偣鍔熻兘", false); + } + } + catch (System.Exception ex) + { + response = action.GetResponse().CatchExceptionWithLog(ex); + } + trans?.AddHistory(Request, action); + return Ok(response); + } + + /// <summary> + /// GenerateReceipt(ApiAction(BaseInput(Data:OrderNo))) + /// 鏍规嵁浼犲叆鐨勫崟鍙风敓鎴愭敹璐у崟锛屽苟璋冪敤U9鏂板鏀惰揣鍗曟帴鍙� + /// </summary> + /// <param name="action"></param> + /// <returns></returns> + [HttpPost] + [Route("api/[controller]/Print_U9Asn/GenerateReceipt")] + public async Task<IActionResult> Print_BIZ_U9_ASN_GenerateReceiptAsync([FromBody] ApiAction<BaseInput> action) + { + ApiAction response; + IPrint_BIZ_U9_ASN trans = null; + try + { + if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID)) + { + trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IPrint_BIZ_U9_ASN; + if (!trans.IsFinished) + { + if (action.IsAsync) + { + response = action.GetResponse(await trans.GenerateReceipt(action.Data)); + } + else + { + lock (trans.TransLock) { response = action.GetResponse(trans.GenerateReceipt(action.Data).Result); } + } + } + else + { + response = action.GetResponse($"Transaction Error: 鏉ユ枡鎵撳嵃娓呯偣浜嬪姟[ID:{action.ID}]宸茬粡鍏抽棴锛岃閲嶆柊鎵撳紑閫佽揣鍗�(U9)娓呯偣鍔熻兘", false); + } + } + else + { + response = action.GetResponse($"Transaction Error: 鏉ユ枡鎵撳嵃娓呯偣浜嬪姟[ID:{action.ID}]鏁版嵁涓㈠け锛岃閲嶆柊鎵撳紑閫佽揣鍗�(U9)娓呯偣鍔熻兘", false); + } + } + catch (System.Exception ex) + { + response = action.GetResponse().CatchExceptionWithLog(ex); + } + trans?.AddHistory(Request, action); + return Ok(response); + } } } \ No newline at end of file -- Gitblit v1.9.3