修改字段错误

yangys

2025-06-30 cf7234b1fc2c5827fdb126ba2f7db2456f2c1da6

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

@@ -37,8 +37,10 @@
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.ProgramSeq;
import org.springblade.mdm.program.mapper.NcProgramMapper;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.mapper.ProgramSeqMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
@@ -50,6 +52,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;

@@ -67,13 +70,15 @@

   private final OssTemplate ossTemplate;
   private final NcNodeService nodeService;

   private final ProgramSeqMapper seqMapper;
   /**
    * 查询现有固化的程序，暂定条件：零组件号相同，且是同一机床组
    * @param partNo
    * @param machineCode
    * @return
    */
   public NcProgram getCuredNcProgram(String partNo,String machineCode) {
   public List<NcProgram> getCuredNcProgram(String partNo,String machineCode) {
      Machine machine = machineService.getByCode(machineCode);
      return this.getBaseMapper().getCuredNcProgram(partNo,machine.getMachineGroupCode());
   }
@@ -81,20 +86,23 @@

   /**
    * 上传程序文件到指定节点
    * @param file
    * @param nodeId
    * @param category 文件分类（程序文件/其他文件）
    * @param uploadVO 上传文件表单数据
    */
   public void uploadProgramFile(NcProgramUploadVO uploadVO) {


      MultipartFile file = uploadVO.getFile();
      BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
      String link = bfile.getLink();
      //保存profame
      NcProgram prog = new NcProgram();
      prog.setCode(generageCode());
      prog.setName(file.getOriginalFilename());
      prog.setNcNodeId(uploadVO.getNodeId());
      prog.setOssName(bfile.getName());
      prog.setDrawingNo(uploadVO.getDrawingNo());
      prog.setPartNo(uploadVO.getPartNo());
      prog.setProcessEdition(uploadVO.getProcessEdition());
      prog.setIsLastEdition(1);
      boolean isTextFile = false;
      try {
         isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -108,6 +116,13 @@
      this.save(prog);
   }

   String generageCode(){
      ProgramSeq program = new ProgramSeq();
      seqMapper.insert(program);

      DecimalFormat df = new DecimalFormat("0000000000");
      return df.format(program.getId());
   }
   /**
    * 删除一个程序
    * @param id
@@ -136,7 +151,7 @@

   public List<NcProgramVO> listByNode(Long nodeId) {
      NcNode node = nodeService.getById(nodeId);
      List<NcProgram> pList = this.list(Wrappers.lambdaQuery(NcProgram.class).eq(NcProgram::getNcNodeId, nodeId).orderByDesc(NcProgram::getCreateTime));
      List<NcProgram> pList = this.list(Wrappers.lambdaQuery(NcProgram.class).eq(NcProgram::getNcNodeId, nodeId).eq(NcProgram::getIsLastEdition,1).orderByDesc(NcProgram::getCreateTime));

      List<NcProgramVO> result = new ArrayList<>();

@@ -149,4 +164,23 @@

      return result;
   }

   /**
    * 升版(升级工序版次),升级工序版本（包括程序和其他附件）
    * @param id 程序文件id
    * @param newProcessEdition 新版次
    */
   public void upgradeProcessEdition(long id,String newProcessEdition) {
      NcProgram prog = this.getById(id);
      //将现有程序更新为非最新版本
      this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getId,id).set(NcProgram::getIsLastEdition,0));

      NcProgram newVerProg = new NcProgram();
      BeanUtils.copyProperties(prog, newVerProg);
      newVerProg.setId(null);
      newVerProg.setIsLastEdition(1);
      newVerProg.setProcessEdition(newProcessEdition);

      this.save(newVerProg);
   }
}