isDeviation重命名

yangys

2025-08-10 62d40df264b71f81b441f7996e11583c28ad83a6

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

@@ -3,11 +3,9 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
@@ -23,14 +21,12 @@
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.NcProgram;
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.mdm.utils.FileContentUtil;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dict;
import org.springframework.stereotype.Service;

@@ -110,13 +106,15 @@
      zipOut.putNextEntry(zipEntry);
      zipOut.closeEntry();

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

      FlowProgramFile programFile;
      NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
      String status = "未固化";
      if(programPackageNode.hasCured()){
         status = "已固化";
      String status = "试切";
      if(programPackageNode.isDeviationProgram()){
         status = "偏离";
      }else if(programPackageNode.hasCured()){
         status = "固化";
      }
      List<Dict> annotationList = getAnnotionList();
      for (NcNode node : programNodes) {