调整审批记录的保存方式

yangys

2025-07-08 f379dade90ec59e08c037cba4917308e3dfdb928

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

@@ -71,20 +71,18 @@
public class NcProgramService  extends BizServiceImpl<NcProgramMapper, NcProgram> {

   private final MachineService machineService;

   private final OssTemplate ossTemplate;
   private final NcNodeService nodeService;

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


@@ -103,7 +101,7 @@
      prog.setName(file.getOriginalFilename());
      prog.setNcNodeId(uploadVO.getNodeId());
      prog.setOssName(bfile.getName());
      prog.setPartNo(uploadVO.getPartNo());
      prog.setDrawingNo(uploadVO.getDrawingNo());
      prog.setProcessEdition(uploadVO.getProcessEdition());
      prog.setIsLastEdition(1);
      boolean isTextFile = false;
@@ -134,7 +132,7 @@
      prog.setName(file.getOriginalFilename());
      prog.setNcNodeId(uploadVO.getNodeId());
      prog.setOssName(bfile.getName());
      prog.setPartNo(uploadVO.getPartNo());
      prog.setDrawingNo(uploadVO.getDrawingNo());
      prog.setProcessEdition(uploadVO.getProcessEdition());
      prog.setIsLastEdition(1);
      prog.setMachineCode(uploadVO.getMachineCode());
@@ -153,7 +151,7 @@
      node.setName(prog.getName());
      node.setMachineCode(uploadVO.getMachineCode());
      node.setParentId(uploadVO.getNodeId());
      node.setPartNo(uploadVO.getPartNo());
      node.setDrawingNo(uploadVO.getDrawingNo());
      node.setProcessName(uploadVO.getProcessName());

      nodeService.save(node);