mes接口调整

yangys

2025-09-10 143e74027f8b68fb7fa4dcd0026ccfa1e0e16788

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java

@@ -2,28 +2,21 @@
package org.springblade.mdm.program.service;

import com.alibaba.csp.sentinel.util.StringUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
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.vo.DncSendBackData;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
@@ -51,15 +44,6 @@
   private final FlowProgramFileService flowProgramFileService;
   private final ProgramAnnotationService programAnnotationService;


   /**
    * 分页查询
    * @param query 查询参数
    * @return
    */
   public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {
      return this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
   }

   /**
    * 导出dnc压缩包
@@ -113,7 +97,7 @@
         deviationSerial = ncNodeService.getDeviationSerialForNode(packageNode);
      }

      List<DictBiz> annotationDictList= programAnnotationService.getAnnotionList();
      List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
      for (NcNode node : programNodes) {
         String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
         programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -121,10 +105,10 @@
            InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
            String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
            InputStream addedInsFinal;
            InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getMachineGroupCode());
            InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getControlSystem());
            if(StringUtils.isNotBlank(programPackageNode.getDeviation())) {
               //偏离单，增加偏离单号
               addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getMachineGroupCode(), annotationDictList);;
               addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;
            }else{
               addedInsFinal = addedIns2;
            }