庆安mdm
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yangys
2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013 
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java


@@ -6,19 +6,26 @@


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.FilenameUtils;


import org.apache.commons.lang3.StringUtils;


import org.flowable.engine.HistoryService;


import org.flowable.engine.history.HistoricProcessInstance;


import org.springblade.core.log.exception.ServiceException;


import org.springblade.core.mp.base.BizServiceImpl;


import org.springblade.core.oss.OssTemplate;


import org.springblade.mdm.basesetting.machine.service.MachineService;


import org.springblade.mdm.basesetting.machine.entity.Machine;


import org.springblade.mdm.flow.constants.FlowConstant;


import org.springblade.mdm.flow.entity.FlowProgramFile;


import org.springblade.mdm.flow.service.FlowProgramFileService;


import org.springblade.mdm.program.entity.NcNode;


import org.springblade.mdm.program.entity.NcNodeHis;


import org.springblade.mdm.program.entity.NcProgramApproved;


import org.springblade.mdm.program.entity.NcProgramExchange;


import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;


import org.springblade.mdm.program.service.programannotation.AnnotationData;


import org.springblade.mdm.program.service.programannotation.AnnotationProcessor;


import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;


import org.springblade.mdm.program.service.programannotation.ProcessorHelper;


import org.springblade.system.feign.IDictClient;


import org.springblade.system.pojo.entity.DictBiz;


import org.springframework.stereotype.Service;




import java.io.*;


@@ -40,11 +47,12 @@


   private final MachineService machineService;


   private final NcProgramApprovedService approvedService;


   private final NcNodeService ncNodeService;


   private final NcNodeHisService ncNodeHisService;


   private final OssTemplate ossTemplate;


   private final FlowProgramFileService flowProgramFileService;


   private final ProgramAnnotationService programAnnotationService;


   private final HistoryService historyService;






   private final MachineAnnotationConfig annotationConfig;


   /**


    * 导出dnc压缩包


    * @param approvedIdArray 待导出审批表id数组


@@ -59,6 +67,16 @@




            approved.setStatus(NcProgramApproved.STATUS_EXPORTED);


            approvedService.updateById(approved);




            NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());


            if(pkgNode.isDeviationProgram()){


               //偏离单的程序，如果审批导出记录是解锁形成的，还是需要锁定；普通试切过的，不锁定


               HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();


               if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){


                  pkgNode.lock("下发导出锁定");


                  ncNodeService.updateById(pkgNode);


               }


            }


         }




      }catch(Exception e){


@@ -73,19 +91,20 @@


    * @param approved


    */


   private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{


      NcNode packageNode = ncNodeService.getById(approved.getNcNodeId());


      NcNodeHis packageNodeHis = ncNodeHisService.getById(approved.getNcNodeId());




      String packageFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";


      String packageFolder = packageNodeHis.getName()+"/";


      ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"结尾表示文件夹


      zipOut.putNextEntry(zipEntry);


      zipOut.closeEntry();




      Machine machine = machineService.getByCode(packageNode.getMachineCode());//程序包节点，获取注释用


      Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//程序包节点，获取注释用




      List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();


      //List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();


      List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();




      FlowProgramFile programFile;


      NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());


      NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());


      String status = "SQ";


      if(programPackageNode.isDeviationProgram()){


         status = "PL";


@@ -93,17 +112,27 @@


         status = "GH";


      }


      long deviationSerial = -1;//偏离单序号 ，-1为非偏离单，不需要加入


      if(packageNode.isDeviationProgram()) {


         deviationSerial = ncNodeService.getDeviationSerialForNode(packageNode);


      if(packageNodeHis.isDeviationProgram()) {


         deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);


      }




      List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();


      for (NcNode node : programNodes) {


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


      for (NcNodeHis node : programNodes) {


         String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);


         programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());


         if(programFile.isProgram()) {//程序文件，才会加入压缩包


            InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());


            String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();




            AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);


            AnnotationData annoData = new AnnotationData();


            annoData.setSendPath(sendDir);


            annoData.setProgramStatus(status);


            annoData.setDeviation(programPackageNode.getDeviation());


            annoData.setFilename(programFile.getName());


            InputStream addedInsFinal = annoProcessor.putAnnotation(annoData,inputStream);


            addedInsFinal.reset();


            /*


            InputStream addedInsFinal;


            InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getControlSystem());


            if(StringUtils.isNotBlank(programPackageNode.getDeviation())) {


@@ -111,7 +140,7 @@


               addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;


            }else{


               addedInsFinal = addedIns2;


            }


            }*/


            this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);


         }


      }


@@ -125,7 +154,7 @@


    * @param deviationSerial 偏离单序号


    * @return zip中的文件路径


    */


   String genFilePathInZip(String packageFolder,NcNode programNode,long deviationSerial){


   String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){


      //为文件名增加偏离单号


      String filePathInZip;