替换流程完成后增加了审批记录，可导出；程序版本号+1

yangys

2025-08-12 0db6d993345160e624293382a2c66aebe159c10b

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

@@ -3,29 +3,24 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.flow.core.feign.IFlowClient;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
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.service.NodeDeptQueryService;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,18 +34,18 @@

   private final IdentityService identityService;
   private final NcNodeService ncNodeService;
   //private final ProcessProgRefService processProgRefService;
   //private final NcProgramService ncProgramService;

   private final FlowProgramFileService flowProgramFileService;

   private final NodeDeptQueryService nodeDeptQueryService;
   //public static final String PROCESS_KEY = "dispatch";

   /**
    * 启动派工流程
    * @param startVO
    * @param startVO 表单数据
    * @return 流程实例id
    */
   public void start(TaskAssignVO startVO){
   @Transactional
   public String start(TaskAssignVO startVO){

      Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
      Map<String, Object> vars = new HashMap<>(preAssignee);
@@ -59,37 +54,37 @@
      vars.put(FlowContants.TITLE,startVO.getTitle());
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());

      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
      vars.put("workshop",workshop);
      //机床型号
      vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());


      vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());

      vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());

      vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());

      vars.put(FlowContants.CRAFT_EDITION,startVO.getCraftEdition());
      vars.put("planStartTime",startVO.getPlanStartTime());


      vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());

      vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
      vars.put("planLockDays",startVO.getPlanLockDays());
      vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());


      //List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
      if(StringUtils.isNotBlank(startVO.getDeviation())) {
         vars.put(FlowContants.DEVIATION, startVO.getDeviation());//偏离单
      }
      String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPkgName);

      NcNode programPkg = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
      //TODO 查询固化程序是，应该去掉有偏离单的？
      NcNode curedProgramPackage = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
      //设置是否有固化程序标记
      vars.put(FlowContants.HAS_CURED_PROGRAM,programPkg != null ? FlowContants.Y:FlowContants.N);
      vars.put(FlowContants.HAS_CURED_PROGRAM,curedProgramPackage != null ? FlowContants.Y:FlowContants.N);
      //工序版次是否一致，是否在有效期内
      if(programPkg != null){
         vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(programPkg.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
         vars.put(FlowContants.VALIDITY_PERIOD, programPkg.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
      if(curedProgramPackage != null && Func.isBlank(startVO.getDeviation())){//偏离单优先，如果有偏离单，那么找到固化程序的也不算固化了
         vars.put(FlowContants.CURED_NODE_ID,curedProgramPackage.getId());
         vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
         vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
      }else{
         vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
         vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
@@ -99,19 +94,35 @@
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);

      if(programPkg != null) {
         copyFlowProgramFiles(programPkg,inst.getProcessInstanceId());
      if(curedProgramPackage != null) {//存在已固化程序，复制原来的程序文件。创建节点仍然在编程人员提交以后
         copyFlowProgramFiles(curedProgramPackage.getProcessInstanceId(),inst.getProcessInstanceId());
      }

      return inst.getProcessInstanceId();
   }

   /**
    * 根据原有固化程序包名节点，复制一个，赋予新的流程实例id
    * @param programPkg 原有固化的程序包名节点
    * @param processInstanceId 流程实例id
    */

   void cloneNodes(NcNode programPkg,String processInstanceId){
      NcNode newProgramPkg = new NcNode();
      BeanUtils.copyProperties(programPkg,newProgramPkg);
      EntityUtil.clearBaseProperties(newProgramPkg);

      newProgramPkg.setProcessInstanceId(processInstanceId);
      this.ncNodeService.save(newProgramPkg);
   }

   /**
    * 复制流程程序文件
    * @param programPkg 原始的固化程序包名节点
    * @param processInstanceId 新启动的流程id
    */
   private void copyFlowProgramFiles(NcNode programPkg,String processInstanceId) {
   private void copyFlowProgramFiles(String oldProcessInstanceId,String processInstanceId) {
      List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery()
         .eq(FlowProgramFile::getProcessInstanceId,programPkg.getProcessInstanceId()).list();
         .eq(FlowProgramFile::getProcessInstanceId,oldProcessInstanceId).list();

      for (FlowProgramFile file : fileList) {
         FlowProgramFile newFile = new FlowProgramFile();