From bf1a9a818ffb721aea2709e9409fbb932b07e81d Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 18 七月 2024 15:55:54 +0800
Subject: [PATCH] Merge branch 'master' into yyk
---
Wms/Wms/Controllers/BllSoController.cs | 79 +++++++++++++--------------------------
1 files changed, 27 insertions(+), 52 deletions(-)
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index f81022e..73a6d6d 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -522,18 +522,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetExportAllotList(GetExportAllotVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetExportAllotList(GetExportAllotVm model)
{
- try
- {
- var bolls = _exAllotSvc.GetExportAllotList(model.SoNo, model.WaveNo, model.PalletNo, model.SkuNo, model.SkuName, model.LotNo, model.Status,model.BoxNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _exAllotSvc.GetExportAllotList(model, count);
- return Ok(new { code = 0, count, msg = "鍑哄簱鍒嗛厤淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
@@ -577,18 +572,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetCompleteDetailList(GetCompleteDetailVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetCompleteDetailList(GetCompleteDetailVm model)
{
- try
- {
- var bolls = _comDetailSvc.GetCompleteDetailList(model.Id,model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _comDetailSvc.GetCompleteDetailList(model, count);
- return Ok(new { code = 0, count, msg = "鎷ｈ揣鏄庣粏淇℃伅", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
[HttpGet]
@@ -615,19 +605,14 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- [HttpPost]
- public IActionResult GetPalletNoOutList(GetPalletNoOutVm model)
+ [HttpPost]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetPalletNoOutList(GetPalletNoOutVm model)
{
- try
- {
- var bolls = _exNoticeSvc.GetPalletNoOutList(model.SkuNo,model.SkuName,model.PalletNo,model.LotNo,model.InspectMark,model.BitPalletMark,model.Page,model.Limit,out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _exNoticeSvc.GetPalletNoOutList(model, count);
- return Ok(new { code = 0, count, msg = "鑾峰彇鎵樼洏鍑哄簱鏁版嵁寮傚父", data = bolls});
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = "鎵樼洏鍑哄簱鏁版嵁" + e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
@@ -722,7 +707,7 @@
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鍑哄簱浠诲姟淇℃伅", data = bolls });
}
catch (Exception e)
{
@@ -865,18 +850,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetLogOperationSoList(GetOperationVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetLogOperationSoList(GetOperationVm model)
{
- try
- {
- var bolls = _logSvc.GetLogOperationSoList(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.GetLogOperationSoList(model.MenuName, model.Type, model.Msg, model.StartTime, model.EndTime, 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 new SqlSugarPagedList() { Items = bolls, Total = count };
}
#endregion
@@ -910,18 +890,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetWaveMageList(GetWaveMageVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetWaveMageList(GetWaveMageVm model)
{
- try
- {
- var bolls = _waveSvc.GetWaveMageList(model.WaveNo, model.Status, model.LotNo, model.LogisticsId, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _waveSvc.GetWaveMageList(model, count);
- return Ok(new { code = 0, count, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
--
Gitblit v1.8.0