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

yangys

2025-09-13 3ffe33aaa24386337e3638558eca731c62f25521

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

@@ -4,20 +4,17 @@
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.log.exception.ServiceException;
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.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,17 +25,18 @@
   private final NcNodeService nodeService;
   private final RuntimeService runtimeService;
   private final IdentityService identityService;
   private final MachineService machineService;
   private final ProduceDivisionService produceDivisionService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final FlowCommonService flowCommonService;
   private final FlowProgramFileService flowProgramFileService;
   /**
    * 启动解锁流程
    */
   @Transactional
   public void startUnlock(Long nodeId){
   public void startUnlock(Long nodeId,String unlockReason){
      NcNode programPackage = nodeService.getById(nodeId);
      if(flowCommonService.isProcessInstanceActive(programPackage.getProcessInstanceId())){
         throw new ServiceException("流程正在进行");
      }
      Map<String, Object> vars = new HashMap<>();
      flowCommonService.putFlowVariablesByNode(vars,programPackage);

@@ -51,6 +49,7 @@

      vars.put(FlowContants.MY_PROCESS_NAME,"解锁流程");
      vars.put("comment", "解锁程序"+programPackage.getName());
      vars.put("unlockReason", unlockReason);
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.UNLOCK_PROCESS_KEY,nodeId+"",vars);