优化库内移库，堆垛机和穿梭车交互逻辑

dengjunjie

2025-06-17 f40ba2a9fb9d3c2ece08e9a7cd987d4744dccab2

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_RoleService.cs

@@ -98,33 +98,33 @@
            if (App.User.RoleId == RoleId) return WebResponseContent.Instance.Error("无操作权限");
            return base.UpdateData(saveModel);
        }
        public override PageGridData<Sys_Role> GetPageData(PageDataOptions options)
        {
            PageGridData<Sys_Role> pageGridData = new PageGridData<Sys_Role>();
            if (App.User.IsSuperAdmin)
            {
                var GridData = base.GetPageData(options);
                pageGridData = new PageGridData<Sys_Role>()
                {
                    Rows = options.Order?.ToLower() == OrderByType.Asc.ToString().ToLower() ? GridData.Rows.OrderBy(x => x.RoleId).ToList() : GridData.Rows,
                    Total = GridData.Total
                };
                return pageGridData;
            }
        //public override PageGridData<Sys_Role> GetPageData(PageDataOptions options)
        //{
        //    PageGridData<Sys_Role> pageGridData = new PageGridData<Sys_Role>();
        //    if (App.User.IsSuperAdmin)
        //    {
        //        var GridData = base.GetPageData(options);
        //        pageGridData = new PageGridData<Sys_Role>()
        //        {
        //            Rows = options.Order?.ToLower() == OrderByType.Asc.ToString().ToLower() ? GridData.Rows.OrderBy(x => x.RoleId).ToList() : GridData.Rows,
        //            Total = GridData.Total
        //        };
        //        return pageGridData;
        //    }

            var roleIds = GetAllChildren(App.User.RoleId).Select(x => x.Id);
            //树形菜单传查询角色下所有用户
            string where = ValidatePageOptions(options);
        //    var roleIds = GetAllChildren(App.User.RoleId).Select(x => x.Id);
        //    //树形菜单传查询角色下所有用户
        //    string where = ValidatePageOptions(options);

            int total = 0;
            pageGridData = new PageGridData<Sys_Role>()
            {
                Rows = BaseDal.Db.Queryable<Sys_Role>().Where(x => roleIds.Contains(x.RoleId)).Where(where).OrderBy(x => x.RoleId).ToPageList(options.Page, options.Rows),
                Total = total
            };
        //    int total = 0;
        //    pageGridData = new PageGridData<Sys_Role>()
        //    {
        //        Rows = BaseDal.Db.Queryable<Sys_Role>().Where(x => roleIds.Contains(x.RoleId)).Where(where).OrderBy(x => x.RoleId).ToPageList(options.Page, options.Rows),
        //        Total = total
        //    };

            return pageGridData;
        }
        //    return pageGridData;
        //}
        /// <summary>
        /// ç¼–辑权限时，获取指定角色的所有菜单权限
        /// </summary>
@@ -167,7 +167,9 @@
            string message = "";
            try
            {
                if (!GetAllChildren(App.User.RoleId).Exists(x => x.Id == roleId))
                var RoleNodes = GetAllChildren(App.User.RoleId);
                RoleNodes = RoleNodes.Where(x => x.Id != App.User.RoleId).ToList();
                if (!RoleNodes.Exists(x => x.Id == roleId) /*&& !App.User.IsRoleIdSuperAdmin(App.User.RoleId)*/)
                    return WebResponseContent.Instance.Error("没有权限修改此角色的权限信息");
                //当前用户的权限
                List<Permissions> permissions = _MenuRepository.GetPermissions(App.User.RoleId);
@@ -212,9 +214,9 @@

                }
                //更新权限
                _RoleAuthRepository.UpdateData(updateAuths);
                _RoleAuthRepository.UpdateData(updateAuths.Where(x => x.AuthId > 0).ToList());
                //新增的权限
                _RoleAuthRepository.AddData(updateAuths);
                _RoleAuthRepository.AddData(updateAuths.Where(x => x.AuthId <= 0).ToList());

                //获取权限取消的权限
                int[] authIds = roleAuths.Where(x => userPermissions.Select(u => u.Id)