From 806b3cb3448ad15a5d563937fdac2ffae37342a7 Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期三, 23 四月 2025 22:11:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Controllers.WMS/Controllers/WMSController.In_BIZ_U9_RECEIPT.cs | 92 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/Tiger.Controllers.WMS/Controllers/WMSController.In_BIZ_U9_RECEIPT.cs b/Tiger.Controllers.WMS/Controllers/WMSController.In_BIZ_U9_RECEIPT.cs
index e3abe37..628e0f5 100644
--- a/Tiger.Controllers.WMS/Controllers/WMSController.In_BIZ_U9_RECEIPT.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.In_BIZ_U9_RECEIPT.cs
@@ -137,5 +137,97 @@
return Ok(response);
}
+ /// <summary>
+ /// GetOrderList(ApiAction(BasePageInput))
+ /// 鑾峰彇闇�瑕佷笂鏋剁殑鏀惰揣鍗曞垪琛紙甯﹀垎椤碉級
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/In_U9Receipt/GetOrderList")]
+ public async Task<IActionResult> In_BIZ_U9_RECEIPT_GetOrderListAsync([FromBody] ApiAction<BaseInputWithPage> action)
+ {
+ ApiAction response;
+ IIn_BIZ_U9_RECEIPT trans = null;
+ try
+ {
+ if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
+ {
+ trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RECEIPT;
+ if (!trans.IsFinished)
+ {
+ if (action.IsAsync)
+ {
+ response = action.GetResponse(await trans.GetOrderList(action.Data));
+ }
+ else
+ {
+ lock (trans.TransLock) { response = action.GetResponse(trans.GetOrderList(action.Data).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>
+ /// GetCurOrder(ApiAction)
+ /// 鑾峰彇褰撳墠鏀惰揣鍗曚俊鎭�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/In_U9Receipt/GetCurOrder")]
+ public async Task<IActionResult> In_BIZ_U9_RECEIPT_GetCurOrderAsync([FromBody] ApiAction<BaseInput> action)
+ {
+ ApiAction response;
+ IIn_BIZ_U9_RECEIPT trans = null;
+ try
+ {
+ if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
+ {
+ trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RECEIPT;
+ if (!trans.IsFinished)
+ {
+ if (action.IsAsync)
+ {
+ response = action.GetResponse(await trans.GetCurOrder());
+ }
+ else
+ {
+ lock (trans.TransLock) { response = action.GetResponse(trans.GetCurOrder().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);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3