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

yangys

2025-09-13 3ffe33aaa24386337e3638558eca731c62f25521

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

@@ -2,15 +2,13 @@

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.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.service.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.flow.entity.FlowProgramFile;
@@ -59,10 +57,9 @@
   private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
      Map<String, Object> vars = new HashMap<>();
      NcNode programPackage = this.ncNodeService.getById(nodeId);

      vars.put(FlowContants.NODE_ID,programPackage.getId());
      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //机床型号
      //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);

      //机床型号
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      if(machine != null) {
@@ -72,6 +69,7 @@
      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
      vars.put(FlowContants.WORKSHOP,workshop);

      vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
@@ -82,13 +80,7 @@
      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

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

      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());
      */
      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
      //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
@@ -97,10 +89,15 @@
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

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

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

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

      //更新程序包名节点的流程实例id