yangys
2025-08-23 23a0651f9559ed6d68eea7d9e2c3f165db6138e5
固化流程,去掉导出工控网的数据记录
已修改2个文件
24 ■■■■ 文件已修改
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
@@ -66,8 +66,6 @@
        List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,pkgNode.getId()).list();
        FlowProgramFile pfile;
        for(NcNode oldProgramNode : oriProgramNodes){
            //oldProgramNode.setIsLastEdition(0);
            //oldProgramNode.setVersionNumber(pkgNode.getVersionNumber());
            pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
            if(!pfile.isProgram()){
                //当前固化程序包名下的“其他文件”非程序文件。不设置为老版本,复制到固化树下,两个网络之间只交换程序文件,其他文件只能保留
@@ -104,27 +102,9 @@
        }
        addApproveTable(pkgNode,props);
        updateApproveRecordNodeId(instId, pkgNode.getId());
        log.info("偏离回传Listener完成");
    }
    /**
     * 保存审批完成的记录
     * @param packageNode
     * @param props
     */
    void addApproveTable(NcNode packageNode,FlowProgramProperties props){
        NcProgramApproved approved = new NcProgramApproved();
        approved.setProgramName(packageNode.getName());
        approved.setNcNodeId(packageNode.getId());//程序包节点id
        approved.setTitle(props.getTitle());
        approved.setProgrammerId(props.getProgrammerId());
        approvedService.save(approved);
    }
    void updateApproveRecordNodeId(String processInstanceId,Long nodeId){
        //更新审批记录的ncNodeId
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
@@ -89,7 +89,9 @@
            log.error("固化流程完成异常",e);
            throw new ServiceException("普通固化执行异常"+e.getMessage());
        }
        addApproveTable(pkgNode,flowProps);
        //固化流程,不用再导出
        //addApproveTable(pkgNode,flowProps);
        updateApproveRecordNodeId(flowProps.getProcessInstanceId(), pkgNode.getId());
    }