| | |
| | | */ |
| | | @Transactional |
| | | public NcNode createNodeTreeToMachine(FlowProgramProperties programProperties) { |
| | | |
| | | NcNode root; |
| | | if(programProperties.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)){ |
| | | if(Func.isEmpty(programProperties.getDeviation())){ |
| | |
| | | //零组件号节点 |
| | | NcNode drawingNoNode = createNodeIfNotExists(programProperties.getDrawingNo(),NcNode.TYPE_DRAWING_NO, productModelNode,programProperties); |
| | | //工艺版次节点 |
| | | NcNode craftEditionNode = createNodeIfNotExists(programProperties.getCraftEdition(),NcNode.TYPE_CRAFT_EDITION, drawingNoNode,programProperties); |
| | | //NcNode craftEditionNode = createNodeIfNotExists(programProperties.getCraftEdition(),NcNode.TYPE_CRAFT_EDITION, drawingNoNode,programProperties); |
| | | //工序号节 |
| | | NcNode processNoNode = createNodeIfNotExists(programProperties.getProcessNo(),NcNode.TYPE_PROCESS_NO, craftEditionNode,programProperties); |
| | | NcNode processNoNode = createNodeIfNotExists(programProperties.getProcessNo(),NcNode.TYPE_PROCESS_NO, drawingNoNode,programProperties); |
| | | //工序版次节点 |
| | | NcNode processEditionNode = createNodeIfNotExists(programProperties.getProcessEdition(),NcNode.TYPE_PROCESS_EDITION, processNoNode,programProperties); |
| | | //加工机床节点 |
| | |
| | | @Transactional |
| | | public NcNode createTreeToPackage(FlowProgramProperties programProperties) { |
| | | NcNode machineCodeNode = createNodeTreeToMachine(programProperties); |
| | | NcNode processEditionNode = this.ncNodeService.getById(machineCodeNode.getParentId()); |
| | | //获取工序版次下其他机床名,存在则删除 |
| | | ncNodeService.lambdaUpdate().eq(NcNode::getNodeType,NcNode.TYPE_MACHINE_CODE) |
| | | .eq(NcNode::getParentId,processEditionNode.getId()).eq(NcNode::getIsLastEdition,1) |
| | | .ne(NcNode::getName,machineCodeNode.getName()).remove(); |
| | | |
| | | //保持加工机床是最新下发任务的机床,不是新建一个机床节点,插叙工序版次下是否有其他的机床(零件号一致,工序号,工序版次一致) |
| | | //获取 |
| | | //加工机床和程序包名在同一级节点,同在工序版次下级 |
| | | String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo()); |
| | | return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, machineCodeNode,programProperties); |
| | | return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, processEditionNode,programProperties); |
| | | |
| | | } |
| | | |
| | |
| | | * @param nodeType 节点类型 |
| | | * @param parentNode 父节点 |
| | | * @param programProperties 流程程序属性 |
| | | * @return |
| | | * @return 创建或已存在的节点或 |
| | | */ |
| | | NcNode createNodeIfNotExists(String name,String nodeType,NcNode parentNode,FlowProgramProperties programProperties) { |
| | | Optional<NcNode> nodeOpt = this.ncNodeService.lambdaQuery().eq(NcNode::getName,name).eq(NcNode::getNodeType,nodeType) |