From fe2b27527084667a15c424ffba00052cbf35ef7f Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 15 七月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/BllCheckController.cs | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 79bbb0b..812b777 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -168,11 +168,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetStockCheckLogList(GetCheckLogVm model)
+ public async Task<IActionResult> GetStockCheckLogList(GetCheckLogVm model)
{
try
{
- var list = _stockCheckLogSvc.GetStockCheckLogList(model.CrNo, model.Status, model.PalletNo, model.BoxNo, model.SkuNo, model.SkuName, model.LotNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var list = await _stockCheckLogSvc.GetStockCheckLogList(model.CrNo, model.Status, model.PalletNo, model.BoxNo, model.SkuNo, model.SkuName, model.LotNo, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鐩樼偣璁板綍", data = list });
}
@@ -192,12 +193,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetCrTaskList(GetTaskVm model)
+ public async Task<IActionResult> GetCrTaskList(GetTaskVm model)
{
try
{
var type = new List<string>() { "2", "3", "4" };
- var bolls = _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "搴撳唴浠诲姟淇℃伅", data = bolls });
}
@@ -213,11 +215,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetLogOperationCrList(GetOperationVm model)
+ public async Task<IActionResult> GetLogOperationCrList(GetOperationVm model)
{
try
{
- var bolls = _logSvc.GetLogOperationCrList(model.MenuName, model.Type, model.Msg, model.StartTime, model.EndTime, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _logSvc.GetLogOperationCrList(model.MenuName, model.Type, model.Msg, model.StartTime, model.EndTime, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鍑哄簱鎿嶄綔鏃ュ織淇℃伅", data = bolls });
}
@@ -329,9 +332,10 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetPalletsOutside(PalletsOutVm model)
+ public async Task<IActionResult> GetPalletsOutside(PalletsOutVm model)
{
- List<MateDataStockDto> mateDataStockDtos = _stockPallet.GetPalletsOutside(model.SkuNo, model.SkuName, model.LotNo, model.PalletNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ List<MateDataStockDto> mateDataStockDtos = await _stockPallet.GetPalletsOutside(model.SkuNo, model.SkuName, model.LotNo, model.PalletNo, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鑾峰彇搴撳鎵樼洏淇℃伅鎴愬姛", data = mateDataStockDtos });
}
@@ -341,7 +345,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SaveAppointSlot(SaveAppointSlotVm model)
+ public async Task<IActionResult> SaveAppointSlot(SaveAppointSlotVm model)
{
try
{
@@ -356,7 +360,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockPallet.SaveAppointSlot(model.StockDetailId, model.LocateId, int.Parse(userId));
+ await _stockPallet.SaveAppointSlot(model.StockDetailId, model.LocateId);
return Ok(new { code = 0, count = 0, msg = "鎸囧畾鍌ㄤ綅鎴愬姛", data = "" });
}
@@ -430,11 +434,11 @@
/// <param name="type">0锛氳幏鍙栧彲鍐荤粨搴撳瓨 1锛氳幏鍙栧彲瑙ｅ喕鏁版嵁</param>
/// <returns></returns>
[HttpGet]
- public IActionResult ByTypeGetDataStockType(string SkuNo, int type)
+ public async Task<IActionResult> ByTypeGetDataStockType(string SkuNo, int type)
{
try
{
- var models = _freect.ByTypeGetDataStockType(SkuNo, type);
+ var models = await _freect.ByTypeGetDataStockType(SkuNo, type);
return Ok(new
{
@@ -459,11 +463,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetDataFreezeList(FreezeUnfreezeInfoDto model)
+ public async Task<IActionResult> GetDataFreezeList(FreezeUnfreezeInfoDto model)
{
try
{
- var models = _freect.GetDataFreezeList(model);
+ var models = await _freect.GetDataFreezeList(model);
return Ok(new
{
@@ -488,11 +492,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetDataUnFreezeList(FreezeUnfreezeInfoDto model)
+ public async Task<IActionResult> GetDataUnFreezeList(FreezeUnfreezeInfoDto model)
{
try
{
- var models = _freect.GetDataUnFreezeList(model);
+ var models = await _freect.GetDataUnFreezeList(model);
return Ok(new
{
@@ -517,7 +521,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult InsertDataFreezeInfo(FreezeUnfreezeInfoDto model)
+ public async Task<IActionResult> InsertDataFreezeInfo(FreezeUnfreezeInfoDto model)
{
try
{
@@ -533,7 +537,7 @@
}
model.CreateUser = int.Parse(UserId);
- string strMesage = _freect.InsertDataFreezeInfo(model);
+ string strMesage = await _freect.InsertDataFreezeInfo(model);
//var arr = strMesage.Split(':');
if (!strMesage.Contains("-1"))
{
--
Gitblit v1.8.0