工控网导出使用实际编程人匹配

yangys

2025-09-04 86079d1c2bd7981165487e6e08d2399b80687f6e

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

@@ -27,8 +27,6 @@
   @Autowired
   private NcProgramApprovedService approvedService;
   @Autowired
   private ApproveRecordService approveRecordService;
   @Autowired
   private FlowProgramFileService flowProgramFileService;
   @Autowired
   private NcNodeService ncNodeService;
@@ -40,7 +38,6 @@
    */
   public void handleData(FlowProgramProperties props) {
      // 执行业务逻辑
      String instId = props.getProcessInstanceId();
      NcNode packageNode;
      if(FlowContants.Y.equals(props.getHasCuredProgram())){
         //有固化
@@ -58,8 +55,8 @@
            //可用，升版（修改其工序版本），原来的节点清除
            moveToNewProcessEdition(packageNode,props);
         }

      }else{
         //普通试切
         packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
      }

@@ -68,6 +65,11 @@
      log.info("普通流程已完成in DispatchFinishListener");
   }

   /**
    * 节点移动到新的工序版本下
    * @param packageNode 程序包名节点
    * @param props 流程属性
    */
   private void moveToNewProcessEdition(NcNode packageNode, FlowProgramProperties props) {
      ncNodeService.deleteMachineNodeByParentId(packageNode.getParentId());

@@ -121,7 +123,7 @@
      approved.setProgramName(packageNode.getName());
      approved.setNcNodeId(packageNode.getId());//程序包节点id
      approved.setTitle(props.getTitle());
      approved.setProgrammerId(props.getProgrammerId());
      approved.setProgrammerId(props.getActProgrammerId());
      approved.setProcessInstanceId(props.getProcessInstanceId());
      approvedService.save(approved);