From cd8182d8fefc55c245400936b6330a00e866adbd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 24 十二月 2024 21:25:06 +0800
Subject: [PATCH] 优化标准上下架
---
Tiger.Controllers.WMS/Controllers/WMSController.In_Default.cs | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/Tiger.Controllers.WMS/Controllers/WMSController.In_Default.cs b/Tiger.Controllers.WMS/Controllers/WMSController.In_Default.cs
index d99a6ac..2ea9da2 100644
--- a/Tiger.Controllers.WMS/Controllers/WMSController.In_Default.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.In_Default.cs
@@ -112,11 +112,11 @@
{
if (action.IsAsync)
{
- response = action.GetResponse(await trans.ScanItem(action.Data));
+ response = action.GetResponse(await trans.Scan(action.Data));
}
else
{
- lock (trans.TransLock) { response = action.GetResponse(trans.ScanItem(action.Data).Result); }
+ lock (trans.TransLock) { response = action.GetResponse(trans.Scan(action.Data).Result); }
}
}
else
@@ -141,45 +141,45 @@
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
- [HttpPost]
- [Route("api/[controller]/In_Default/ScanShelf")]
- public async Task<IActionResult> In_Default_ScanShelfAsync([FromBody] ApiAction action)
- {
- ApiAction response;
- IIn_Default trans = null;
- try
- {
- if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
- {
- trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_Default;
- if (!trans.IsFinished)
- {
- if (action.IsAsync)
- {
- response = action.GetResponse(await trans.ScanShelf(action.Data?.ToString()));
- }
- else
- {
- lock (trans.TransLock) { response = action.GetResponse(trans.ScanShelf(action.Data?.ToString()).Result); }
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 鏍囧噯涓婃灦浜嬪姟[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);
- }
+ //[HttpPost]
+ //[Route("api/[controller]/In_Default/ScanShelf")]
+ //public async Task<IActionResult> In_Default_ScanShelfAsync([FromBody] ApiAction action)
+ //{
+ // ApiAction response;
+ // IIn_Default trans = null;
+ // try
+ // {
+ // if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
+ // {
+ // trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_Default;
+ // if (!trans.IsFinished)
+ // {
+ // if (action.IsAsync)
+ // {
+ // response = action.GetResponse(await trans.ScanShelf(action.Data?.ToString()));
+ // }
+ // else
+ // {
+ // lock (trans.TransLock) { response = action.GetResponse(trans.ScanShelf(action.Data?.ToString()).Result); }
+ // }
+ // }
+ // else
+ // {
+ // response = action.GetResponse($"Transaction Error: 鏍囧噯涓婃灦浜嬪姟[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);
+ //}
}
}
\ No newline at end of file
--
Gitblit v1.9.3