替换流程bug修复

yangys

2025-08-16 8db9b68d0bf4b7ec2e80b580f5931a40788caac7

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java

@@ -17,16 +17,9 @@
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -48,7 +41,7 @@
   private final HistoryService historyService;
   private final TaskService taskService;
   private final IdentityService identityService;

   private final NodeDeptQueryService nodeDeptQueryService;
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;
@@ -79,6 +72,10 @@
            vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
            //机床型号
            vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));

            String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
            vars.put(FlowContants.WORKSHOP,workshop);

            vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
            vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
            vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
@@ -186,19 +183,24 @@

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());

      ProduceDivision div = produceDivisionService.getByDrawingNo(programPackage.getDrawingNo());
      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      if(div != null) {
         vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
         vars.put(FlowContants.CHECKER,div.getCheckerId());
         vars.put(FlowContants.SENIOR,div.getSeniorId());
         vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());

         vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
      }

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题

      vars.put(FlowContants.MY_PROCESS_NAME, "固化流程");

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);

@@ -209,7 +211,7 @@
      for(FlowProgramFile flowProgramFile : fileList){
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
      }
      this.flowProgramFileService.updateBatchById(fileList);
      this.flowProgramFileService.saveBatch(fileList);

      log.info("启动固化流程完成，实例id={}", inst.getId());
   }