admin
3 天以前 a01a9cff8bdf5ba57daf1b43bbb2415cb21063b9
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