From 20ad0ae660e2669b4428c9b97f0cd5d48044d836 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 11 七月 2024 07:52:26 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Wms/Wms/Controllers/BllCheckController.cs | 169 ++++++++++++++------------------------------------------
1 files changed, 43 insertions(+), 126 deletions(-)
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 27ff38b..79bbb0b 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -16,6 +16,8 @@
using Model.ModelVm.BllSoVm;
using Wms.Tools;
using System.Collections;
+using Utility;
+using SqlSugar;
namespace Wms.Controllers
{
@@ -33,6 +35,7 @@
private readonly IWarehouseOutsidePalletsServer _stockPallet; //搴撳鎵樼洏
private readonly IStockFreectSetve _freect; //瑙ｅ喕\鍐荤粨
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -43,7 +46,7 @@
/// <param name="logSvc">搴撳唴鎿嶄綔鏃ュ織Svc</param>
/// <param name="stockPallet">搴撳鎵樼洏</param>
/// <param name="freect">瑙ｅ喕\鍐荤粨</param>
- public BllCheckController(IOptions<ApiUrlConfig> setting, IStockCheckServer stockCheckSvc, IStockCheckLogServer stockCheckLogSvc, ITaskServer taskSvc, IOperationCRServer logSvc, IWarehouseOutsidePalletsServer stockPallet, IStockFreectSetve freect)
+ public BllCheckController(IOptions<ApiUrlConfig> setting, IStockCheckServer stockCheckSvc, IStockCheckLogServer stockCheckLogSvc, ITaskServer taskSvc, IOperationCRServer logSvc, IWarehouseOutsidePalletsServer stockPallet, IStockFreectSetve freect, UserManager userManager)
{
_config = setting.Value;
_stockCheckSvc = stockCheckSvc;
@@ -52,6 +55,7 @@
_logSvc = logSvc;
_stockPallet = stockPallet;
_freect = freect;
+ _userManager = userManager;
}
#region 鐩樼偣鍗曟嵁
@@ -62,18 +66,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetStockCheckList(GetStockCheckVm model)
+ public async Task<IActionResult> GetStockCheckList(GetStockCheckVm model)
{
- try
- {
- var bolls = _stockCheckSvc.GetStockCheckList(model.CrNo, model.Status, model.PalletNo, model.SkuNo, model.SkuName, model.LotNo, model.StartTime, model.EndTime, model.Page, model.Limit, out int count);
-
- return Ok(new { code = 0, count, msg = "鐩樼偣鍗曚俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _stockCheckSvc.GetStockCheckList(model.CrNo, model.Status, model.PalletNo, model.SkuNo, model.SkuName, model.LotNo, model.StartTime, model.EndTime, model.Page, model.Limit, count);
+ return Ok(new { code = 0, count, msg = "鐩樼偣鍗曚俊鎭�", data = bolls });
}
/// <summary>
@@ -82,18 +79,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetStockCheckDetailList(GetStockCheckVm model)
+ public async Task<IActionResult> GetStockCheckDetailList(GetStockCheckVm model)
{
- try
- {
- var bolls = _stockCheckSvc.GetStockCheckDetailList(model.CrNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _stockCheckSvc.GetStockCheckDetailList(model.CrNo, model.Page, model.Limit, count);
- return Ok(new { code = 0, count, msg = "鐩樼偣鍗曟槑缁嗕俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return Ok(new { code = 0, count, msg = "鐩樼偣鍗曟槑缁嗕俊鎭�", data = bolls });
}
/// <summary>
/// 鑾峰彇搴撳瓨鏄庣粏淇℃伅锛堢洏鐐归�夋嫨鏄庣粏鏁版嵁婧愶級
@@ -101,18 +92,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetCheckStockDetailList(GetStockDetailVm model)
+ public async Task<IActionResult> GetCheckStockDetailList(GetStockDetailVm model)
{
- try
- {
- var bolls = _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg, model.Page, model.Limit, out int count);
-
- return Ok(new { code = 0, count, msg = "鑾峰彇搴撳瓨鏄庣粏淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg, model.Page, model.Limit, count);
+ return Ok(new { code = 0, count, msg = "鑾峰彇搴撳瓨鏄庣粏淇℃伅", data = bolls });
}
/// <summary>
@@ -121,18 +105,10 @@
/// <param name="soNo"></param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetStockCheckDetailById(string crNo)
+ public async Task<IActionResult> GetStockCheckDetailById(string crNo)
{
- try
- {
- var bolls = _stockCheckSvc.GetStockCheckDetailById(crNo);
-
- return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曠紪杈戜俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ var bolls = await _stockCheckSvc.GetStockCheckDetailById(crNo);
+ return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曠紪杈戜俊鎭�", data = bolls });
}
/// <summary>
@@ -141,29 +117,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult AddEditStockCheck(AddEditStockCheckVm model)
+ [UnitOfWork]
+ public async Task<IActionResult> AddEditStockCheck(AddEditStockCheckVm model)
{
- try
- {
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(userId))
- {
- return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- _stockCheckSvc.AddEditStockCheck(model, int.Parse(userId));
-
- return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曟搷浣滄垚鍔�", data = "" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = "鎿嶄綔澶辫触" + e.Message });
- }
+ await _stockCheckSvc.AddEditStockCheck(model);
+ return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曟搷浣滄垚鍔�", data = "" });
}
/// <summary>
@@ -172,22 +130,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult DelStockCheck(IdVm model)
+ [UnitOfWork]
+ public async Task<IActionResult> DelStockCheck(IdVm model)
{
try
{
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(userId))
- {
- return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- _stockCheckSvc.DelStockCheck(model.Id, int.Parse(userId));
+ await _stockCheckSvc.DelStockCheck(model.Id);
return Ok(new { code = 0, count = 0, msg = "鐩樼偣鍗曞垹闄ゆ垚鍔�" });
}
@@ -204,31 +152,11 @@
/// <param name="demo"></param>
/// <returns></returns>
[HttpGet]
- public IActionResult EditNoticeDemo(int id, string demo)
+ [UnitOfWork]
+ public async Task<IActionResult> EditNoticeDemo(int id, string demo)
{
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(userId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- _stockCheckSvc.EditNoticeDemo(id, demo, int.Parse(userId));
-
-
- return Ok(new { code = 0, msg = "缂栬緫澶囨敞鎴愬姛" });
-
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ await _stockCheckSvc.EditNoticeDemo(id, demo);
+ return Ok(new { code = 0, msg = "缂栬緫澶囨敞鎴愬姛" });
}
#endregion
@@ -320,7 +248,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockCheckSvc.AgainSendCheckTask(model.taskNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl);
+ //_stockCheckSvc.AgainSendCheckTask(model.taskNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl);
return Ok(new { code = 0, msg = "鎴愬姛涓嬪彂浠诲姟", data = "" });
}
@@ -335,7 +263,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult CancelCheckTask(CheckTaskVm model)
+ public async Task<IActionResult> CancelCheckTask(CheckTaskVm model)
{
try
{
@@ -350,7 +278,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockCheckSvc.CancelCheckTask(model.taskNo, int.Parse(userId));
+ await _stockCheckSvc.CancelCheckTask(model.taskNo);
return Ok(new { code = 0, msg = "鎴愬姛鍙栨秷浠诲姟", data = "" });
}
@@ -365,7 +293,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult FinishCheckTask(CheckTaskVm model)
+ public async Task<IActionResult> FinishCheckTask(CheckTaskVm model)
{
try
{
@@ -380,7 +308,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockCheckSvc.CheckSuccess(model.taskNo, int.Parse(userId));
+ await _stockCheckSvc.CheckSuccess(model.taskNo, int.Parse(userId));
return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" });
@@ -428,7 +356,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockPallet.SaveAppointSlot(model.StockDetailId,model.LocateId, int.Parse(userId));
+ _stockPallet.SaveAppointSlot(model.StockDetailId, model.LocateId, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "鎸囧畾鍌ㄤ綅鎴愬姛", data = "" });
}
@@ -448,22 +376,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult FinishMoveTask(CheckTaskVm model)
+ public async Task<IActionResult> FinishMoveTask(CheckTaskVm model)
{
try
{
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(userId))
- {
- return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- _stockCheckSvc.MoveSuccess(model.taskNo, int.Parse(userId));
+ await _stockCheckSvc.MoveSuccess(model.taskNo);
return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" });
}
@@ -478,7 +395,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult CancelMoveTask(CheckTaskVm model)
+ public async Task<IActionResult> CancelMoveTask(CheckTaskVm model)
{
try
{
@@ -493,7 +410,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockCheckSvc.CancelMoveTask(model.taskNo, int.Parse(userId));
+ await _stockCheckSvc.CancelMoveTask(model.taskNo);
return Ok(new { code = 0, msg = "鎴愬姛鍙栨秷浠诲姟", data = "" });
}
@@ -513,11 +430,11 @@
/// <param name="type">0锛氳幏鍙栧彲鍐荤粨搴撳瓨 1锛氳幏鍙栧彲瑙ｅ喕鏁版嵁</param>
/// <returns></returns>
[HttpGet]
- public IActionResult ByTypeGetDataStockType(string SkuNo,int type)
+ public IActionResult ByTypeGetDataStockType(string SkuNo, int type)
{
try
{
- var models = _freect.ByTypeGetDataStockType(SkuNo,type);
+ var models = _freect.ByTypeGetDataStockType(SkuNo, type);
return Ok(new
{
--
Gitblit v1.8.0