导出dnc增加工序版次

yangys

2025-08-16 66db2ddb74b0f1afba2ccb237ac949959501283f

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

@@ -13,18 +13,13 @@
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.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -46,16 +41,16 @@
   private final HistoryService historyService;
   private final TaskService taskService;
   private final IdentityService identityService;

   private final NodeDeptQueryService nodeDeptQueryService;
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;

   private final ProduceDivisionService produceDivisionService;
   @Transactional
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFilesMap) {
      //根据分组启动流程，并插入关联表
      programPackageList.forEach(pkg -> {
         this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
         this.startOne(pkg,allFlowProgramFilesMap.get(pkg.getId()));
      });
   }

@@ -77,6 +72,10 @@
            vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
            //机床型号
            vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));

            String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
            vars.put(FlowContants.WORKSHOP,workshop);

            vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
            vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
            vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
@@ -125,6 +124,7 @@
    * @param vars 找到审批人后填充的map
    * @param historicTasks 历史任务集合
    */
   @Deprecated
   void fillHistoryAssignees(Map<String, Object> vars,List<HistoricTaskInstance> historicTasks){
      String programmer = null;
      String checker = null;
@@ -159,6 +159,62 @@
      vars.put(FlowContants.SENIOR,senior);
      vars.put(FlowContants.ASSIGNEE,programmer);
   }

   public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
      pkgIdFileMap.forEach((nodeId, fileList) -> {
         this.startOneNew(nodeId,fileList);
      });

   }

   private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
      Map<String, Object> vars = new HashMap<>();
      NcNode programPackage = this.ncNodeService.getById(nodeId);

      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //机床型号
      //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION, programPackage.getCraftEdition());
      vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

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

      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      if(div != null) {
         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());

         vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
      }

      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, "固化流程");

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);

      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());
      ncNodeService.updateById(programPackage);

      for(FlowProgramFile flowProgramFile : fileList){
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
      }
      this.flowProgramFileService.saveBatch(fileList);

      log.info("启动固化流程完成，实例id={}", inst.getId());
   }
   /**
    * 将程序按照机器代码分组
    * @param ncProgramIdList