锁定流程完成

yangys

2025-08-17 0ef4cc755bddd87799b8bfdd65c8123df6e149d0

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

@@ -12,9 +12,13 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
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.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -28,6 +32,8 @@
   private final RuntimeService runtimeService;
   private final HistoryService historyService;
   private final ProduceDivisionService produceDivisionService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final MachineService machineService;
   /**
    * 根据流程实例id获取definitionKey
    * @param processInstanceId
@@ -76,6 +82,7 @@
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));

      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
         .processInstanceId(processInstanceId)
@@ -147,6 +154,35 @@

      return div;
   }

   /**
    * 根据程序包名节点，填充变量map
    * @param vars
    * @param programPackageNode
    */
   public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,programPackageNode.getMachineCode());
      Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
      //机床型号
      if(machine != null) {
         vars.put(FlowContants.MACHINE_MODE, machine.getName());
      }
      vars.put(FlowContants.PROCESS_NO,programPackageNode.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackageNode.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackageNode.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION,programPackageNode.getCraftEdition());

      vars.put(FlowContants.DRAWING_NO,programPackageNode.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());

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

      vars.put(FlowContants.PRODUCT_MODEL,programPackageNode.getProductModel());
      vars.put(FlowContants.NODE_ID, programPackageNode.getId());
      vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));

   }
}