增加审批界面任务车间的查询和显示

yangys

2025-08-10 8318e40770d53c87e2d5921d2d11f8de47c61e76

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

@@ -12,6 +12,7 @@
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
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;
@@ -34,12 +35,12 @@
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;

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

   /**
    * 启动派工流程
    * @param startVO
    * @param startVO 表单数据
    * @return 流程实例id
    */
   @Transactional
@@ -52,9 +53,12 @@
      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());
@@ -65,15 +69,19 @@
      vars.put("planLockDays",startVO.getPlanLockDays());
      vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());

      if(StringUtils.isNotBlank(startVO.getDeviation())) {
         vars.put(FlowContants.DEVIATION, startVO.getDeviation());//偏离单
      }
      String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());

      NcNode programPkg = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPkgName);
      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){
         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);
@@ -83,12 +91,8 @@
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);

      if(programPkg != null) {//存在已固化程序，复制原来的程序文件。创建节点仍然在编程人员提交以后
         //programPkg.setIsLastEdition(0);
         //this.ncNodeService.updateById(programPkg);

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

      return inst.getProcessInstanceId();