mdm.git - Gitblit

			@@ -3,6 +3,9 @@

			import lombok.AllArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springblade.core.log.exception.ServiceException;
			import org.springblade.core.tool.utils.Func;
			import org.springblade.mdm.flow.constants.FlowContants;
			import org.springblade.mdm.flow.entity.FlowProgramFile;
			import org.springblade.mdm.flow.service.FlowCommonService;
			import org.springblade.mdm.flow.service.FlowProgramFileService;
			@@ -27,81 +30,133 @@
			private final FlowCommonService flowCommonService;
			private final FlowProgramFileService flowProgramFileService;
			private final ProgramSeqService programSeqService;
			public static final String SHIQIE_NAME = "试切";
			public static final String GUHUA_NAME = "固化";
			public static final String PIANLI_NAME = "偏离";
			public static final String TRY_NAME = "试切";
			public static final String CURE_NAME = "固化";
			public static final String DEVIATION_NAME = "偏离";

			/**
			* 根据流程信息，自动创建各个节点
			* @param processInstanceId
			* 创建树到机床级别
			* @param programProperties 程序属性
			*/
			@Transactional
			public void createNodeTree(String processInstanceId) {
			FlowProgramProperties programProperties = flowCommonService.getProgramProperties(processInstanceId);

			//,int rootNodeCatgory = 1:试切，2固化，3偏离
			NcNode programPkdNode = createTreeToProgramPackageByRootCategory(1,programProperties);

			List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
			for (FlowProgramFile programFile : programFiles) {
			createProgramFileNode(programFile,programPkdNode,programProperties);
			public NcNode createNodeTreeToMachine(FlowProgramProperties programProperties) {
			NcNode root;
			if(programProperties.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)){
			if(Func.isEmpty(programProperties.getDeviation())){
			//试切
			root = rootNodeByName(TRY_NAME);
			if (root == null) {
			root = createTryNode();
			}
			}else{
			//有偏离
			root = rootNodeByName(DEVIATION_NAME);
			if(root == null){
			root = createDeviationNode();
			}
			}
			}else if(programProperties.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
			root = rootNodeByName(CURE_NAME);
			if(root == null){
			root = createCureNode();
			}
			}else{
			throw new ServiceException("流程定义不在范围内");
			}
			//创建产品型号节点
			NcNode productModelNode = createNodeIfNotExists(programProperties.getProductModel(),NcNode.TYPE_PRODUCT_MODEL, root,programProperties);
			//零组件号节点
			NcNode drawingNoNode = createNodeIfNotExists(programProperties.getDrawingNo(),NcNode.TYPE_DRAWING_NO, productModelNode,programProperties);
			//工艺版次节点
			//NcNode craftEditionNode = createNodeIfNotExists(programProperties.getCraftEdition(),NcNode.TYPE_CRAFT_EDITION, drawingNoNode,programProperties);
			//工序号节
			NcNode processNoNode = createNodeIfNotExists(programProperties.getProcessNo(),NcNode.TYPE_PROCESS_NO, drawingNoNode,programProperties);
			//工序版次节点
			NcNode processEditionNode = createNodeIfNotExists(programProperties.getProcessEdition(),NcNode.TYPE_PROCESS_EDITION, processNoNode,programProperties);
			//加工机床节点
			return createNodeIfNotExists(programProperties.getMachineCode(),NcNode.TYPE_MACHINE_CODE, processEditionNode,programProperties);
			}
			/**
			* 根据流程信息，自动创建各个节点,包括程序节点
			* @param programProperties 程序属性
			*/
			@Transactional
			public void createNodeTreeWithProgram(FlowProgramProperties programProperties) {
			//,int rootNodeCatgory = 1:试切，2固化，3偏离
			NcNode programPkdNode = createTreeToPackage(programProperties);
			//删除之前创建过的程序文件节点(因为重复在编制节点审批)，避免重复数据
			//this.ncNodeService.lambdaUpdate().eq(NcNode::getParentId, programPkdNode.getId()).remove();
			ncNodeService.deleteSubNodes(programPkdNode.getId());

			List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, programProperties.getProcessInstanceId()).list();
			for (FlowProgramFile programFile : programFiles) {
			createProgramFileNode(programFile, programPkdNode, programProperties);//所有文件包括程序和其他，都需要建立节点
			//if(programFile.isProgram()) {

			//}
			}
			createOtherNode(programFiles);
			}
			void createOtherNode(List<FlowProgramFile> programFiles){
			//111mqita 节点
			}
			/**
			* 建立程序文件节点
			* @param programFile 流程文件
			* @param programPkdNode 程序包名节点，程序节点的上级
			* @param programProperties 流程发起的程序的属性
			*/
			private void createProgramFileNode(FlowProgramFile programFile, NcNode programPkdNode, FlowProgramProperties programProperties) {
			//此处应避免重复创建

			NcNode node = new NcNode();
			node.setNodeType(NcNode.TYPE_PROGRAM_FILE);
			node.setName(programFile.getName());//文件名，
			node.setParentId(programPkdNode.getId());
			node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());

			node.setIsLastEdition(1);
			node.setDrawingNo(programPkdNode.getDrawingNo());
			node.setDrawingNoEdition(programProperties.getDrawingNoEdition());
			node.setCraftEdition(programProperties.getCraftEdition());
			node.setProcessName(programProperties.getProcessName());
			node.setProcessNo(programProperties.getProcessNo());
			node.setProcessEdition(programProperties.getProcessEdition());
			node.setMachineCode(programProperties.getMachineCode());
			node.setProductModel(programProperties.getProductModel());
			node.setFlowProgramFileId(programFile.getId());
			node.setVersionNumber(1);
			node.setParentId(programPkdNode.getId());
			node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());
			/*
			if("program".equals(programFile.getFileType())){

			}else{
			//其他文件，和程序包名同级并列

			}*/

			ncNodeService.save(node);
			}

			NcNode createTreeToProgramPackageByRootCategory(int category,FlowProgramProperties programProperties) {
			NcNode root;
			if(category == 1){
			//试切
			root = rootNodeByName(SHIQIE_NAME);
			if(root == null){
			root = createShiqieNode();
			}
			}else if(category == 2){
			root = rootNodeByName(GUHUA_NAME);
			if(root == null){
			root = createCureNode();
			}
			}else{
			root = rootNodeByName(PIANLI_NAME);
			if(root == null){
			root = createPianliNode();
			}
			}
			/**
			* 创建节点到程序包级别
			* @param programProperties 程序属性
			* @return 程序包名节点（最末级）
			*/
			@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();

			//创建产品型号节点
			//NcNode productModelNode = createProductModelNode(programProperties.getProductModel(), root);
			NcNode productModelNode = createNodeIfNotExists(programProperties.getProductModel(),NcNode.TYPE_PRODUCT_MODEL, root,programProperties);
			//零组件号节点
			NcNode drawingNoNode = createNodeIfNotExists(programProperties.getDrawingNo(),NcNode.TYPE_DRAWING_NO, productModelNode,programProperties);
			//工艺版次节点
			NcNode craftEditionNode = createNodeIfNotExists(programProperties.getCraftEdition(),NcNode.TYPE_CRAFT_EDITION, drawingNoNode,programProperties);
			//工序号节
			NcNode processNoNode = createNodeIfNotExists(programProperties.getProcessNo(),NcNode.TYPE_PROCESS_NO, craftEditionNode,programProperties);
			//工序版次节点
			NcNode processEditionNode = createNodeIfNotExists(programProperties.getProcessEdition(),NcNode.TYPE_PROCESS_EDITION, processNoNode,programProperties);
			//加工机床节点
			NcNode machineCodeNode = createNodeIfNotExists(programProperties.getMachineCode(),NcNode.TYPE_MACHINE_CODE, processEditionNode,programProperties);
			//程序包名节点
			String programPkgName = programProperties.getDrawingNo()+"-"+programProperties.getProcessNo();//零件号加工序号
			return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, machineCodeNode,programProperties);
			//保持加工机床是最新下发任务的机床，不是新建一个机床节点，插叙工序版次下是否有其他的机床（零件号一致，工序号，工序版次一致）
			//获取
			//加工机床和程序包名在同一级节点,同在工序版次下级
			String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo());
			return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, processEditionNode,programProperties);

			}

			/**
			@@ -110,10 +165,11 @@
			* @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).eq(NcNode::getParentId,parentNode.getId()).oneOpt();
			Optional<NcNode> nodeOpt = this.ncNodeService.lambdaQuery().eq(NcNode::getName,name).eq(NcNode::getNodeType,nodeType)
			.eq(NcNode::getParentId,parentNode.getId()).eq(NcNode::getIsLastEdition,1).oneOpt();
			if(nodeOpt.isPresent()){
			return nodeOpt.get();
			}else {
			@@ -122,7 +178,7 @@
			ncNode.setParentId(parentNode.getId());
			ncNode.setParentIds(parentNode.getParentIds() + "," + parentNode.getId());
			ncNode.setNodeType(nodeType);

			ncNode.setVersionNumber(1);

			//程序包节点和程序文件节点数据
			if(NcNode.TYPE_PROGRAM_PACKAGE.equals(nodeType) \|\| NcNode.TYPE_PROGRAM_FILE.equals(nodeType)){
			@@ -138,6 +194,8 @@
			ncNode.setProcessName(programProperties.getProcessName());
			ncNode.setMachineCode(programProperties.getMachineCode());
			ncNode.setProductModel(programProperties.getProductModel());

			ncNode.setDeviation(programProperties.getDeviation());
			}

			ncNode.setIsLastEdition(1);
			@@ -148,15 +206,6 @@
			}
			}

			/**
			* 根节点是否存在，根节点只有试切/分离/固化 3个
			* @param name 节点名称
			* @return
			*/
			boolean rootNodeExists(String name){
			return ncNodeService.lambdaQuery().eq(NcNode::getName, name).eq(NcNode::getParentId, 0).count()>0;
			}

			NcNode rootNodeByName(String name){
			Optional<NcNode> rootOpt = ncNodeService.lambdaQuery().eq(NcNode::getName, name).eq(NcNode::getParentId, 0).oneOpt();
			return rootOpt.orElse(null);
			@@ -165,13 +214,14 @@
			/**
			* 创建试切节点（根）
			*/
			NcNode createShiqieNode() {
			NcNode createTryNode() {
			NcNode ncNode = new NcNode();
			ncNode.setId(1L);
			ncNode.setName(SHIQIE_NAME);
			ncNode.setName(TRY_NAME);
			ncNode.setParentId(0L);
			ncNode.setParentIds("");
			ncNode.setParentIds("0");
			ncNode.setNodeType("10");
			ncNode.setVersionNumber(1);
			ncNodeService.save(ncNode);

			return ncNode;
			@@ -183,24 +233,28 @@
			NcNode createCureNode() {
			NcNode ncNode = new NcNode();
			ncNode.setId(2L);
			ncNode.setName(GUHUA_NAME);
			ncNode.setName(CURE_NAME);
			ncNode.setParentId(0L);
			ncNode.setParentIds("");
			ncNode.setParentIds("0");
			ncNode.setNodeType("10");
			ncNode.setVersionNumber(1);
			ncNodeService.save(ncNode);

			return ncNode;
			}

			NcNode createPianliNode() {
			NcNode createDeviationNode() {
			NcNode ncNode = new NcNode();
			ncNode.setId(3L);
			ncNode.setName(PIANLI_NAME);
			ncNode.setName(DEVIATION_NAME);
			ncNode.setParentId(0L);
			ncNode.setParentIds("");
			ncNode.setParentIds("0");
			ncNode.setNodeType("10");
			ncNode.setVersionNumber(1);
			ncNodeService.save(ncNode);

			return ncNode;
			}


			}