修改表格打印的数控程序编号

yangys

2025-09-13 3ffe33aaa24386337e3638558eca731c62f25521

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

@@ -13,7 +13,9 @@
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.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.system.feign.IUserClient;
@@ -31,7 +33,7 @@
   private final ProduceDivisionService produceDivisionService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final MachineService machineService;
   private final IUserClient userClient;
   private final UserCommonService userCommonService;
   /**
    * 根据流程实例id获取definitionKey
    * @param processInstanceId
@@ -56,40 +58,7 @@

      Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
      this.copyFlowPropertiesFromMap(programProperties, vars);
      /*
      programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
      programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
      programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
      programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
      programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));

      programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
      programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//工序版次
      programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
      programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));

      programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
      //数据处理名称为版次以前，零件号加工序号：YZL4-1100-01-50 零组件号：YZL4-1100-01 工序号 50

      programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
      programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
      programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
      if(vars.containsKey(FlowContants.DEVIATION)) {
         programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
      }
      if(vars.containsKey(FlowContants.CURED_NODE_ID)){
         programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
      }
      if(vars.containsKey(FlowContants.NODE_ID)){
         programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
      programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
      programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
      */
      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
         .processInstanceId(processInstanceId)
         .singleResult();
@@ -107,44 +76,16 @@

      Map<String, Object> vars =historicInstance.getProcessVariables();
      this.copyFlowPropertiesFromMap(programProperties,vars);
      /*
      programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
      programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
      programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
      programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
      programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));

      programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
      programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//工序版次
      programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
      programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));

      programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
      //数据处理名称为版次以前，零件号加工序号：YZL4-1100-01-50 零组件号：YZL4-1100-01 工序号 50

      programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
      programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
      programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
      if(vars.containsKey(FlowContants.DEVIATION)) {
         programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
      }
      if(vars.containsKey(FlowContants.CURED_NODE_ID)){
         programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
      }
      if(vars.containsKey(FlowContants.NODE_ID)){
         programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
      programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
      programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
      */
      programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
      return programProperties;
   }

   /**
    * 从map中赋值流程便利到vo
    * @param programProperties vo
    * @param vars 变量map
    */
   void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){

      programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
@@ -180,6 +121,12 @@
      programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));

      programProperties.setProgramNo(programProperties.getDrawingNo()+"-"+programProperties.getProcessNo()+"-"+programProperties.getProcessEdition());

      programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
      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")));
   }
   /**
    * 流程是否在进行
@@ -242,10 +189,7 @@
         vars.put(FlowContants.ASSIGNEE, defaultAssignee);//第一个审批用户：组长
      }

      R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
      if(programmerResult.isSuccess()) {
         vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
      }
      vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
      return div;
   }