新增层级结构工艺规程版本、结构树表、新权限表 修改原有权限验证 删除原有代码

lyh

2025-03-06 c06fab29ca7826a6dc9736c1ba8ce1e26a11c829

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java

@@ -14,15 +14,18 @@
public class ProductTreeWrapper {

    public static List<CommonGenericTree> loadTree(List<ProductInfo> productInfoList, List<ComponentExt> componentInfoList,
                                                   List<PartsInfo> partsInfoList,List<ProcessStream> processStreams, List<WorkStep> workStepList) {
                                                   List<PartsInfo> partsInfoList,List<ProcessSpecVersion> processSpecVersionList,
                                                   List<ProcessStream> processStreams, List<WorkStep> workStepList) {
        List<CommonGenericTree> tree = new ArrayList<CommonGenericTree>();// TreeNode集合，存放所有树对象。
        Map<String, CommonGenericTree> productMap = new HashMap<>();
        Map<String, CommonGenericTree> componentMap = new HashMap<>();
        Map<String, CommonGenericTree> partsMap = new HashMap<>();
        Map<String, CommonGenericTree> pvsMap = new HashMap<>();
        Map<String, CommonGenericTree> processMap = new HashMap<>();
        CommonGenericTree<ProductInfo> node;
        CommonGenericTree<ComponentInfo> componentNode;
        CommonGenericTree<PartsInfo> partsNode;
        CommonGenericTree<ProcessSpecVersion> pvsNode;
        CommonGenericTree<ProcessStream> processNode;
        CommonGenericTree<WorkStep> workStepNode;
        for(ProductInfo productInfo : productInfoList) {
@@ -64,15 +67,33 @@
            partsMap.put(parts.getPartsId(), partsNode);
        }

        //工序存在部件或者零件下
        //工艺规程版本存在零件下
        for(ProcessSpecVersion processSpecVersion : processSpecVersionList) {
            pvsNode = new CommonGenericTree();
            pvsNode.setId(processSpecVersion.getId());
            pvsNode.setLabel("[" + processSpecVersion.getProcessSpecVersionCode()+ "]" + processSpecVersion.getProcessSpecVersionName());
            pvsNode.setParentId(null);
            pvsNode.setIconClass("");
            pvsNode.setType(4);
            pvsNode.setRField(processSpecVersion.getPartsId());
            pvsNode.setEntity(processSpecVersion);
            if(partsMap.containsKey(pvsNode.getRField())) {
                partsNode = partsMap.get(pvsNode.getRField());
                pvsNode.setParentId(partsNode.getId());
                partsNode.addChildren(pvsNode);
            }
            pvsMap.put(processSpecVersion.getId(),pvsNode);
        }

        //工序存在部件或者工艺规程版本下
        for(ProcessStream processStream : processStreams) {
            processNode = new CommonGenericTree();
            processNode.setId(processStream.getProcessId());
            processNode.setLabel("[" + processStream.getProcessCode()+ "]" + processStream.getProcessName());
            processNode.setParentId(null);
            processNode.setIconClass("");
            processNode.setType(4);
            if (StrUtil.isEmpty(processStream.getPartsId())) {
            processNode.setType(5);
            if (StrUtil.isEmpty(processStream.getPsvId())) {
                //没有partsId，部件下的工序
                processNode.setRField(processStream.getComponentId());
                processNode.setEntity(processStream);
@@ -82,13 +103,13 @@
                    componentNode.addChildren(processNode);
                }
            }else {
                //有partsId，零件下的工序
                processNode.setRField(processStream.getPartsId());
                //有psvId，零件下的工序
                processNode.setRField(processStream.getPsvId());
                processNode.setEntity(processStream);
                if(partsMap.containsKey(processNode.getRField())) {
                    partsNode = partsMap.get(processNode.getRField());
                    processNode.setParentId(partsNode.getId());
                    partsNode.addChildren(processNode);
                if(pvsMap.containsKey(processNode.getRField())) {
                    pvsNode = pvsMap.get(processNode.getRField());
                    processNode.setParentId(pvsNode.getId());
                    pvsNode.addChildren(processNode);
                }
            }
            processMap.put(processStream.getProcessId(),processNode);
@@ -97,11 +118,11 @@
        //工步存在工序下
        for (WorkStep workStep : workStepList) {
            workStepNode = new CommonGenericTree();
            workStepNode.setId(workStep.getStepId());
            workStepNode.setId(workStep.getId());
            workStepNode.setLabel("[" + workStep.getStepCode() + "]" + workStep.getStepName());
            workStepNode.setParentId(null);
            workStepNode.setIconClass("");
            workStepNode.setType(5);
            workStepNode.setType(6);
            workStepNode.setRField(workStep.getProcessId());
            workStepNode.setEntity(workStep);
            if (processMap.containsKey(workStepNode.getRField())) {