wxw
2 天以前 f6d9155a4a0cf27fd5732314b70109cbc090ccf8
Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
1个文件已修改
10 ■■■■ 已修改文件
Wms/Wms/Controllers/BasisController.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/BasisController.cs
@@ -64,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
@@ -362,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;
@@ -626,7 +626,7 @@
            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 });
            return Ok(new { code = 0, count = count.Value, msg = "物料信息", data = bolls });
        }
        /// <summary>