yangys
2025-09-17 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -98,7 +98,7 @@
      programProperties.setProcessEdition(String.valueOf(vars.get(FlowVariableContants.PROCESS_EDITION)));//工序版次
      programProperties.setProcessName(String.valueOf(vars.get(FlowVariableContants.PROCESS_NAME)));
      programProperties.setMachineCode(String.valueOf(vars.get(FlowVariableContants.MACHINE_CODE)));
      programProperties.setMachineGroupCode(String.valueOf(vars.get(FlowVariableContants.MACHINE_GROUP_CODE)));
      programProperties.setMachineMode(String.valueOf(vars.get(FlowVariableContants.MACHINE_MODE)));
      //数据处理名称为版次以前,零件号加工序号:YZL4-1100-01-50 零组件号:YZL4-1100-01 工序号 50
@@ -127,6 +127,8 @@
      programProperties.setActCheckerId(Func.toLong(vars.get(FlowVariableContants.ACT_CHECKER)));
      programProperties.setActSeniorId(Func.toLong(vars.get(FlowVariableContants.ACT_SENIOR)));
      programProperties.setProgrammerName(Func.toStr(vars.get("programmerName")));
      programProperties.setProgramOnMachine(Func.toStr(vars.get(FlowVariableContants.PROGRAM_ON_MACHINE)));
   }
   /**
    * 流程是否在进行
@@ -201,6 +203,8 @@
   public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
      //机床编号
      vars.put(FlowVariableContants.MACHINE_CODE,programPackageNode.getMachineCode());
      vars.put(FlowVariableContants.MACHINE_GROUP_CODE,programPackageNode.getMachineGroupCode());
      Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
      //机床型号
      if(machine != null) {