| | |
| | | String programPkgName = NcNodeService.genProgramName(props.getDrawingNo(),props.getProcessNo()); |
| | | createProgramNodes(props); |
| | | |
| | | String processEdition = props.getProcessEdition(); |
| | | //TODO 偏离单,和已经固化的程序,没有处理,:已经处理没有验证 |
| | | NcNode packageNode; |
| | | if(FlowContants.Y.equals(props.getHasCuredProgram()) && FlowContants.Y.equals(props.getCureProgramUseable())){ |
| | | //有固化,且程序可用,从固化树查询节点 |
| | | packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition()); |
| | | //有固化,且程序可用,从固化树查询节点.使用流程中保存的节点 |
| | | //packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition()); |
| | | packageNode = ncNodeService.getById(props.getCuredNodeId()); |
| | | }else if(Func.isNotBlank(props.getDeviation())){ |
| | | //有偏离单 |
| | | packageNode = ncNodeService.getLastEditionDeviationProgramPackage(programPkgName,props.getProcessEdition()); |
| | |
| | | */ |
| | | void createProgramNodes(FlowProgramProperties progProperties){ |
| | | if(FlowContants.N.equals(progProperties.getHasCuredProgram())) { |
| | | //无固化(试切或者偏离) |
| | | //无固化:(试切或者偏离) |
| | | ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties); |
| | | }else{ |
| | | //有固化,程序不可用 |