修复审批表，确认表内容

yangys

2025-09-23 3baca21e0e6563f8379359ef2ba78c224eb4bc80

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java

@@ -16,6 +16,7 @@
import org.springblade.mdm.gkw.programnode.vo.ProgramNameVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.programannotation.*;
import org.springblade.mdm.utils.ProgramFileNameParser;
@@ -48,6 +49,8 @@
   private ListenerHelper listenerHelper;
   @Autowired
   private OssTemplate ossTemplate;
   @Autowired
   private NcNodeHisService ncNodeHisService;

   /**
    * DispatchFinishListener中调用
@@ -66,20 +69,23 @@
            ncNodeService.updateById(packageNode);

            //版本号根据零组件号+工序号，工序版次，机床组 直接查询数量，+1获取
            Integer newVersion = ncNodeService.calculateVersionNumber(packageNode);
            packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
            Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
            packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
            packageNode.setVersionNumber(newVersion);
            ncNodeService.updateById(packageNode);
         }else{
            //可用，空升版（修改其工序版次），原来的节点清除
            moveToNewProcessEdition(packageNode,props);

            //更新已固化的，同名、不同机床组的程序为锁定状态
            ncNodeService.lockSameNameOtherMachineGroupProgramPackage(packageNode);
         }
      }else{
         //普通试切
         packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
         //普通试切/临时更改单
         packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
         Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
         long hisSerial = ncNodeService.calculateHistorySerial(packageNode);
         packageNode.setHisSerial(hisSerial);
         packageNode.setVersionNumber(newVersion);
         ncNodeService.updateById(packageNode);
      }

@@ -111,7 +117,6 @@
      this.ncNodeService.updateById(packageNode);
      Machine machine = machineService.getByCode(packageNode.getMachineCode());
      //移动程序节点
      //List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
      List<NcNode> programNodes = ncNodeService.getProgramFilesByPackageId(packageNode.getId());
      for(NcNode programNode : programNodes){
         FlowProgramFile progFile = this.flowProgramFileService.getById(programNode.getFlowProgramFileId());