| | |
| | | |
| | | 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); |
| | | packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition()); |
| | | }else if(Func.isNotBlank(props.getDeviation())){ |
| | | //有偏离单 |
| | | packageNode = ncNodeService.getLastEditionDeviationProgramPackage(programPkgName); |
| | | packageNode = ncNodeService.getLastEditionDeviationProgramPackage(programPkgName,props.getProcessEdition()); |
| | | }else{ |
| | | //普通试切,或者有固化不可用 |
| | | packageNode = ncNodeService.getLastEditionTryingProgramPackage(programPkgName); |
| | | packageNode = ncNodeService.getLastEditionTryingProgramPackage(programPkgName,props.getProcessEdition()); |
| | | } |
| | | |
| | | addApproveTable(packageNode,props); |