dnc导入导出格式修改

yangys

2025-08-04 5173c99276023cac788875d5fa8d5cad84112777

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

@@ -10,6 +10,7 @@
import org.springblade.flow.core.feign.IFlowClient;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
@@ -33,7 +34,7 @@
   private final ProcessProgRefService processProgRefService;
   private final NcProgramService ncProgramService;

   private static final String PROCESS_KEY = "dispatch";
   public static final String PROCESS_KEY = "dispatch";

   /**
    * 启动派工流程
@@ -44,19 +45,27 @@
      Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
      Map<String, Object> vars = new HashMap<>(preAssignee);

      vars.put("machineCode",startVO.getMachineCode());
      vars.put("machineMode",startVO.getMachineMode());
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());

      vars.put("processNo",startVO.getProcessNo());
      vars.put("processName",startVO.getProcessName());
      vars.put("processEdition",startVO.getProcessEdition());
      //机床型号
      vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());

      vars.put("craftEdition",startVO.getCraftEdition());
      vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());

      vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());

      vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());

      vars.put(FlowContants.CRAFT_EDITION,startVO.getCraftEdition());
      vars.put("planStartTime",startVO.getPlanStartTime());
      vars.put("drawingNo",startVO.getDrawingNo());
      vars.put("drawingNoEdition",startVO.getDrawingNoEdition());


      vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());

      vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
      vars.put("planLockDays",startVO.getPlanLockDays());
      vars.put("productModel",startVO.getProductModel());
      vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());


      List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
@@ -74,7 +83,7 @@
         ProcessProgRef ref = new ProcessProgRef();
         ref.setProcessInstanceId(pinst.getId());
         ref.setNcProgramId(ncProgram.getId());

         ref.setProcessDefinitionKey(pinst.getProcessDefinitionKey());
         processProgRefService.save(ref);
      }