From bc2abaf0794769f9376369fb9defb17a2233e35f Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期一, 03 十一月 2025 09:51:29 +0800
Subject: [PATCH] 格式化代码
---
Wms/Wms/Controllers/BasisController.cs | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index c93cd90..80b24a2 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
{
@@ -63,9 +64,9 @@
/// <param name="department">閮ㄩ棬</param>
/// <param name="setting">鍔熻兘璁惧畾</param>
/// <param name="operation">鎿嶄綔鏃ュ織</param>
- public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer,
- IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc,
- IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting,
+ public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer,
+ IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc,
+ IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting,
IInterfaceServer interfaceS, IOperationSysServer operation, UserManager userManager)
{
_customerSvc = customerSvc;//瀹㈡埛Svc
@@ -361,7 +362,7 @@
{
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
- var model = await _roleRightServer.GetRoleMenuList();
+ var model = await _roleRightServer.GetRoleMenuList();
stopwatch.Stop();
var time = stopwatch.ElapsedMilliseconds;
@@ -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<IActionResult> GetPackagList(int page)
{
- return await _mate.GetPackagList();
+ var data = await _mate.GetPackagList(page);
+ return Ok(new { code = 0, count = data.Count, msg = "鐗╂枡淇℃伅", data = data });
}
#endregion
--
Gitblit v1.8.0