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/BllCheckController.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 812b777..5ac84ab 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -70,7 +70,7 @@
{
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鐩樼偣鍗曚俊鎭�", data = bolls });
}
/// <summary>
@@ -84,7 +84,7 @@
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鐩樼偣鍗曟槑缁嗕俊鎭�", data = bolls });
}
/// <summary>
/// 鑾峰彇搴撳瓨鏄庣粏淇℃伅锛堢洏鐐归�夋嫨鏄庣粏鏁版嵁婧愶級
@@ -96,7 +96,7 @@
{
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鑾峰彇搴撳瓨鏄庣粏淇℃伅", data = bolls });
}
/// <summary>
@@ -175,7 +175,7 @@
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鐩樼偣璁板綍", data = list });
}
catch (Exception e)
{
@@ -201,7 +201,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)
{
@@ -222,7 +222,7 @@
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鍑哄簱鎿嶄綔鏃ュ織淇℃伅", data = bolls });
}
catch (Exception e)
{
@@ -336,7 +336,7 @@
{
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 });
+ return Ok(new { code = 0, count = count.Value, msg = "鑾峰彇搴撳鎵樼洏淇℃伅鎴愬姛", data = mateDataStockDtos });
}
/// <summary>
--
Gitblit v1.8.0