From a7c8452ad33ae2f9fa6de326ee85054f60bad8c0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:18:52 +0800
Subject: [PATCH] 解决冲突
---
Wms/Wms/Controllers/BllCheckController.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 3ed9994..9a1220f 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -101,9 +101,9 @@
{
try
{
- var bolls = _stockCheckSvc.GetCheckStockDetailList(model.HouseNo, model.RoadwayNo, model.LocateNo, model.Msg);
+ 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 = bolls.Count, msg = "鑾峰彇搴撳瓨鏄庣粏淇℃伅", data = bolls });
+ return Ok(new { code = 0, count, msg = "鑾峰彇搴撳瓨鏄庣粏淇℃伅", data = bolls });
}
catch (Exception e)
{
--
Gitblit v1.8.0