From e1937ea7d68c72e61095538d5fec4e7d795f78c9 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 16 十月 2025 10:48:18 +0800
Subject: [PATCH] 修改物料管理显示和编辑
---
Wms/Wms/Controllers/BasisController.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index c93cd90..4ecab44 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -23,6 +23,7 @@
using Utility;
using Model.ModelVm.LogVm;
using System.Diagnostics;
+using Model.ModelVm.BllSoVm;
namespace Wms.Controllers
{
@@ -617,10 +618,15 @@
/// <param name="environment">瀛樺偍鐜</param>
/// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
- [HttpGet]
- public async Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
+ [HttpPost]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<IActionResult> GetMateList(GetMaterialsVm model)
{
- return await _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _mate.GetMateList(model, count);
+
+ //return new SqlSugarPagedList() { Items = bolls, Total = count };
+ return Ok(new { code = 0, count=count.Value, msg = "鐗╂枡淇℃伅", data = bolls });
}
/// <summary>
@@ -711,9 +717,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<List<SysPackag>> GetPackagList()
+ public async Task<List<SysPackag>> GetPackagList(int page)
{
- return await _mate.GetPackagList();
+ var data = await _mate.GetPackagList(page);
+ return data;
}
#endregion
--
Gitblit v1.8.0