修复审批表，确认表内容

yangys

2025-09-23 3baca21e0e6563f8379359ef2ba78c224eb4bc80

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

@@ -2,17 +2,14 @@

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
@@ -34,8 +31,6 @@

   private final RuntimeService runtimeService;

   private final HistoryService historyService;
   private final TaskService taskService;
   private final IdentityService identityService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final NcNodeService ncNodeService;
@@ -43,7 +38,7 @@
   private final FlowProgramFileService flowProgramFileService;
   private final ProduceDivisionService produceDivisionService;
   private final MachineService machineService;

   private final FlowCommonService flowCommonService;

   /**
    * 启动固化流程
@@ -61,47 +56,49 @@
   private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
      Map<String, Object> vars = new HashMap<>();
      NcNode programPackage = this.ncNodeService.getById(nodeId);
      vars.put(FlowConstant.NODE_ID,programPackage.getId());

      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //机床型号
      //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
      flowCommonService.putFlowVariablesByNode(vars,programPackage);
      /*
      vars.put(FlowVariableContants.MACHINE_CODE,programPackage.getMachineCode());

      //机床型号
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      if(machine != null) {
         vars.put(FlowContants.MACHINE_MODE,machine.getName());
         vars.put(FlowVariableContants.MACHINE_MODE,machine.getName());
      }

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

      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION, programPackage.getCraftEdition());
      vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
      vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
      vars.put(FlowVariableContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowVariableContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowVariableContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowVariableContants.CRAFT_EDITION, programPackage.getCraftEdition());
      vars.put(FlowVariableContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowVariableContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(FlowVariableContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(FlowVariableContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
      */

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

      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      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());

      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
      vars.put(FlowVariableConstant.ASSIGNEE,vars.get(FlowVariableConstant.PROGRAMMER));

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

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

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

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
      if(programPackage.getDeviation() != null) {
         vars.put(FlowVariableConstant.MY_PROCESS_NAME, "临时更改单回传");
         vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-临时更改单回传");//自动增加标题
      }else {
         vars.put(FlowVariableConstant.MY_PROCESS_NAME, "固化流程");
         vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-固化");//自动增加标题
      }
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowConstant.CURE_PROCESS_KEY,"0",vars);

      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());