lyh
2025-02-20 3302ff7054d02f6b21452f2f2cd3658c8cad6b53
增加工序工步用户权限
已修改3个文件
45 ■■■■ 文件已修改
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -84,15 +84,6 @@
        if(componentInfo == null)
            ExceptionCast.cast(PartsInfoCode.PARTS_COMPONENT_NONE);
        partsInfo.setPartsStatus(1);
        //添加日志
        NcLogInfo ncLogInfo = new NcLogInfo();
        //模块
        ncLogInfo.setModuleInfo("产品结构树");
        //类型
        ncLogInfo.setOperateType(2);
        //日志内容
        ncLogInfo.setLogContent("零件名称:"+partsInfo.getPartsName()+",零件代号:"+partsInfo.getPartsCode());
        iNcLogInfoService.saveLogNcInfos(ncLogInfo);
        boolean b = super.save(partsInfo);
        List<PermissionStream> oldDepartPermList = permissionStreamService.getByComponentId(componentInfo.getProductId(), componentInfo.getComponentId());
        if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
@@ -129,23 +120,12 @@
        b = partsPermissionService.save(permission);
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
//        if(!b)
//            ExceptionCast.cast(CommonCode.FAIL);
        //添加用户权限
        PermissionStream stream = new PermissionStream();
        stream.setProductId(partsInfo.getProductId());
        stream.setComponentId(partsInfo.getComponentId());
        stream.setPartsId(partsInfo.getPartsId());
        stream.setUserId(userId);
//        //添加日志
//        NcLogInfo ncLogInfogx = new NcLogInfo();
//        //模块
//        ncLogInfogx.setModuleInfo("产品结构树");
//        //类型
//        ncLogInfogx.setOperateType(2);
//        //日志内容
//        ncLogInfogx.setLogContent("零件名称:"+partsInfo.getPartsName()+"生成默认工序,工序号:"+processStream.getProcessCode());
//        iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
        return permissionStreamService.save(stream);
    }
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -100,24 +100,14 @@
                ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
            }
        }
        //添加日志
        NcLogInfo ncLogInfo = new NcLogInfo();
        //模块
        ncLogInfo.setModuleInfo("产品结构树");
        //类型
        ncLogInfo.setOperateType(2);
        //日志内容
        ncLogInfo.setLogContent("工序名称:"+stream.getProcessName()+",工序号:"+stream.getProcessCode());
        iNcLogInfoService.saveLogNcInfos(ncLogInfo);
        boolean b = super.save(stream);
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
//        ProcessInfo processInfo = new ProcessInfo();
//        processInfo.setProcessName(stream.getProcessName());
//        processInfo.setDescription(stream.getDescription());
//        boolean processInfoB= processInfoService.addOrEdit(processInfo);
//        if(!processInfoB)
//            ExceptionCast.cast(CommonCode.FAIL);
        //添加用户权限
        ProcessionPermission permission = new ProcessionPermission();
        permission.setProcessId(stream.getProcessId());
        permission.setUserId(userId);
        processStreamPermissionService.save(permission);
        //添加权限验证
        PermissionStream permissionStream = new PermissionStream();
        permissionStream.setUserId(userId);
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -109,6 +109,11 @@
        boolean b =super.save(workStep);
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        //添加用户权限
        WorkStepPermission workStepPermission = new WorkStepPermission();
        workStepPermission.setUserId(userId);
        workStepPermission.setStepId(workStep.getId());
        workStepPermissionService.save(workStepPermission);
        //添加权限验证
        PermissionStream permissionStream = new PermissionStream();
        permissionStream.setUserId(userId);