| | |
| | | String operateResult = this.getApproveResult(variables); |
| | | |
| | | if(task.getTaskDefinitionKey().equals("programmingTask")) {//编制节点 |
| | | flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult)); |
| | | flowProgramFileService.checkProgramFiles(processInstanceId,FlowContants.Y.equals(operateResult)); |
| | | } |
| | | if (StringUtil.isNoneBlank(processInstanceId, comment)) { |
| | | taskService.addComment(taskId, processInstanceId, comment); |
| | |
| | | } |
| | | addApproveRecord(taskId,comment,variables); |
| | | |
| | | //在编制任务时,创建节点(没有节点则创建,有就直接使用 |
| | | /* |
| | | if(task.getTaskDefinitionKey().equals("programmingTask") && FlowContants.Y.equals(operateResult)) { |
| | | FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId); |
| | | ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties); |
| | | //原来版次的程序,此时应该清除,是不是要挪过来呢?版次已经不对了 |
| | | //TODO 老节点清除吗 |
| | | |
| | | //走到编制节点,如果是有固化程序且通过了,说明需要升版(重新编写),将固化的原来的程序设置lastEdition=0 |
| | | if(FlowContants.Y.equals(progProperties.getHasCuredProgram())) { |
| | | NcNode curedProgramPackage = ncNodeService.getById(Func.toLong(progProperties.getCuredNodeId())); |
| | | curedProgramPackage.setIsLastEdition(0); |
| | | curedProgramPackage.setIsLocked(1); |
| | | ncNodeService.updateById(curedProgramPackage); |
| | | } |
| | | |
| | | }*/ |
| | | if(task.getTaskDefinitionKey().equals("approveTask") && FlowContants.Y.equals(operateResult)) { |
| | | //试切流程,或者 偏离流程 高师通过的时候创建节点 |
| | | //createProgramNodes(processInstanceId); |
| | |
| | | //if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){ |
| | | if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){ |
| | | //工序版次不一致,并且审核通过(可用)是,才更新为新的versionNumber |
| | | FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId); |
| | | //FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId); |
| | | variables.put(FlowContants.CURE_PROGRAM_USEABLE,operateResult); |
| | | |
| | | if(FlowContants.Y.equals(operateResult) && FlowContants.N.equals(progProperties.getIsProcessEditionSame())) { |
| | | //if(FlowContants.Y.equals(operateResult) && FlowContants.N.equals(progProperties.getIsProcessEditionSame())) { |
| | | //确认程序可用 且 工序版次不一致,进入校对。这里需要升级程序的版本号 |
| | | Long curedNodeId = progProperties.getCuredNodeId(); |
| | | ncNodeService.upgradeVersionNumber(curedNodeId); |
| | | } |
| | | // Long curedNodeId = progProperties.getCuredNodeId(); |
| | | // ncNodeService.upgradeVersionNumber(curedNodeId); |
| | | //} |
| | | } |
| | | taskService.complete(taskId, variables); |
| | | } |