mdm.git - Gitblit

			@@ -8,7 +8,7 @@
			import org.springblade.core.oss.model.BladeFile;
			import org.springblade.mdm.basesetting.machine.entity.Machine;
			import org.springblade.mdm.basesetting.machine.service.MachineService;
			import org.springblade.mdm.flow.constants.FlowContants;
			import org.springblade.mdm.flow.constants.FlowConstant;
			import org.springblade.mdm.flow.entity.FlowProgramFile;
			import org.springblade.mdm.flow.excution.ListenerHelper;
			import org.springblade.mdm.flow.service.FlowProgramFileService;
			@@ -16,8 +16,8 @@
			import org.springblade.mdm.gkw.programnode.vo.ProgramNameVO;
			import org.springblade.mdm.program.entity.NcNode;
			import org.springblade.mdm.program.service.NcNodeAutoCreateService;
			import org.springblade.mdm.program.service.NcNodeHisService;
			import org.springblade.mdm.program.service.NcNodeService;
			import org.springblade.mdm.program.service.ProgramAnnotationService;
			import org.springblade.mdm.program.service.programannotation.*;
			import org.springblade.mdm.utils.ProgramFileNameParser;
			import org.springframework.beans.BeanUtils;
			@@ -27,7 +27,6 @@
			import java.io.ByteArrayInputStream;
			import java.io.IOException;
			import java.io.InputStream;
			import java.time.LocalDateTime;
			import java.util.List;

			/**
			@@ -47,11 +46,11 @@
			@Autowired
			private NcNodeAutoCreateService ncNodeAutoCreateService;
			@Autowired
			private ProgramAnnotationService programAnnotationService;
			@Autowired
			private ListenerHelper listenerHelper;
			@Autowired
			private OssTemplate ossTemplate;
			@Autowired
			private NcNodeHisService ncNodeHisService;

			/**
			* DispatchFinishListener中调用
			@@ -59,35 +58,34 @@
			*/
			public void handleData(FlowProgramProperties props) throws IOException {
			// 执行业务逻辑
			LocalDateTime now = LocalDateTime.now();
			NcNode packageNode;
			if(FlowContants.Y.equals(props.getHasCuredProgram())){
			if(FlowConstant.Y.equals(props.getHasCuredProgram())){
			//有固化
			packageNode = ncNodeService.getById(props.getCuredNodeId());

			if(FlowContants.N.equals(props.getCureProgramUseable())) {
			if(FlowConstant.N.equals(props.getCureProgramUseable())) {
			//程序不可用，原来的固化节点锁定
			packageNode.lock();
			ncNodeService.updateById(packageNode);

			//版本号根据零组件号+工序号，工序版次，机床组直接查询数量，+1获取
			Integer newVersion = ncNodeService.calculateVersionNumber(packageNode);
			//Integer newVersion = packageNode.genNewVersionNumber();

			packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
			Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
			packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
			packageNode.setVersionNumber(newVersion);
			ncNodeService.updateById(packageNode);
			}else{
			//String oriProcessEdition = packageNode.getProcessEdition();
			//可用，空升版（修改其工序版次），原来的节点清除
			moveToNewProcessEdition(packageNode,props);

			//更新已固化的，同名、不同机床组的程序为锁定状态
			ncNodeService.lockSameNameOtherMachineGroupProgramPackage(packageNode);
			}
			}else{
			//普通试切
			packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
			//普通试切/临时更改单
			packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
			Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
			long hisSerial = ncNodeService.calculateHistorySerial(packageNode);
			packageNode.setHisSerial(hisSerial);
			packageNode.setVersionNumber(newVersion);
			ncNodeService.updateById(packageNode);
			}

			@@ -107,25 +105,9 @@

			FlowProgramProperties tempProps = new FlowProgramProperties();
			BeanUtils.copyProperties(props,tempProps);
			tempProps.setProcessDefinitionKey(FlowContants.CURE_PROCESS_KEY);//临时修改其为固化,在固化下创建节点
			tempProps.setProcessDefinitionKey(FlowConstant.CURE_PROCESS_KEY);//临时修改其为固化,在固化下创建节点
			NcNode machineGroupNode = ncNodeAutoCreateService.createNodeTreeToMachineGroup(tempProps);

			//移动历史节点到新的版次节点下
			/*
			List<NcNode> packageHisNodes = ncNodeService.getTryNodeHistory(packageNode);//该包的历史节点列表
			for(NcNode hisPackageNode : packageHisNodes){
			hisPackageNode.setParentId(machineGroupNode.getId());
			hisPackageNode.setParentIds(machineGroupNode.getParentIds()+","+machineGroupNode.getId());

			List<NcNode> oriProgramNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();

			for(NcNode oldProgramNode : oriProgramNodes){
			oldProgramNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
			}
			ncNodeService.updateBatchById(oriProgramNodes);
			}
			ncNodeService.updateBatchById(packageHisNodes);
			*/
			//移动程序包名节点
			packageNode.setProcessEdition(tempProps.getProcessEdition());
			packageNode.setParentId(machineGroupNode.getId());
			@@ -135,7 +117,6 @@
			this.ncNodeService.updateById(packageNode);
			Machine machine = machineService.getByCode(packageNode.getMachineCode());
			//移动程序节点
			//List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
			List<NcNode> programNodes = ncNodeService.getProgramFilesByPackageId(packageNode.getId());
			for(NcNode programNode : programNodes){
			FlowProgramFile progFile = this.flowProgramFileService.getById(programNode.getFlowProgramFileId());
			@@ -178,14 +159,9 @@
			try(InputStream ins = ossTemplate.statFileStream(flowProgramFile.getOssName());){
			ByteArrayInputStream byteInputStream = new ByteArrayInputStream(IOUtils.toByteArray(ins));

			//List<DictBiz> annoDictList = programAnnotationService.getAnnotionDictList();

			AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(controlSystem,this.annotationConfig);
			/*
			AnnotationProperties annoProps = annotationConfig.getConfigMap().get(controlSystem);
			if(annoProps == null){
			annoProps = AnnotationProperties.getDefault();
			}*/

			InputStream finishedStream = annoProcessor.putFilenameAnnotation(filename,byteInputStream);
			//InputStream finishedStream = AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, "GH", annoProps.getStatusLineIndex(), controlSystem, annoDictList);
			try(finishedStream) {