增加个人已办列表

yangys

2025-08-10 ec621697d17850ffb536f8361b2bb662d1918555

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

@@ -2,22 +2,23 @@

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import org.flowable.common.engine.impl.identity.Authentication;
import org.apache.commons.lang3.StringUtils;
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.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.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
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;
@@ -30,55 +31,101 @@
   private final AutoAssignUsersService autoAssignUsersService;

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

   private static final String PROCESS_KEY = "dispatch";
   private final FlowProgramFileService flowProgramFileService;

   //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);
      vars.put(FlowContants.ASSIGNEE,preAssignee.get(FlowContants.TEAM_LEADER));//第一个审批用户：组长

      vars.put("machineCode",startVO.getMachineCode());
      vars.put("machineMode",startVO.getMachineMode());
      vars.put(FlowContants.TITLE,startVO.getTitle());
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());

      vars.put("processNo",startVO.getProcessNo());
      vars.put("processName",startVO.getProcessName());
      vars.put("processEdition",startVO.getProcessEdition());

      vars.put("craftEdition",startVO.getCraftEdition());
      //机床型号
      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("drawingNo",startVO.getDrawingNo());
      vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
      vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
      vars.put("planLockDays",startVO.getPlanLockDays());
      vars.put("productModel",startVO.getProductModel());
      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 curedProgramPackage = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
      //设置是否有固化程序标记
      vars.put("hasCuredProgram",!curedNcPrograms.isEmpty() ? "Y":"N");


      String businessKey = "0";//业务表key

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);

      //如果有已固化程序，则将程序id插入流畅关联表
      for(NcProgram ncProgram : curedNcPrograms){
         ProcessProgRef ref = new ProcessProgRef();
         ref.setProcessInstanceId(pinst.getId());
         ref.setNcProgramId(ncProgram.getId());

         processProgRefService.save(ref);
      vars.put(FlowContants.HAS_CURED_PROGRAM,curedProgramPackage != null ? FlowContants.Y:FlowContants.N);
      //工序版次是否一致，是否在有效期内
      if(curedProgramPackage != null){
         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);
      }

      //log.info()
      String businessKey = "0";//业务表key
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);

      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 processInstanceId 新启动的流程id
    */
   private void copyFlowProgramFiles(String oldProcessInstanceId,String processInstanceId) {
      List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery()
         .eq(FlowProgramFile::getProcessInstanceId,oldProcessInstanceId).list();

      for (FlowProgramFile file : fileList) {
         FlowProgramFile newFile = new FlowProgramFile();
         BeanUtils.copyProperties(file, newFile);
         EntityUtil.clearBaseProperties(newFile);

         newFile.setProcessInstanceId(processInstanceId);

         this.flowProgramFileService.save(newFile);
      }
   }

   /**