修改constant类名

yangys

2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013

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

@@ -12,8 +12,8 @@
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.flow.constants.FlowConstant;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
@@ -52,8 +52,8 @@
    */
   @Transactional
   public FlowStartResult start(TaskAssignVO startVO){
      if(!FlowContants.Y.equals(startVO.getIsTempFlow())){
         startVO.setIsTempFlow(FlowContants.N);
      if(!FlowConstant.Y.equals(startVO.getIsTempFlow())){
         startVO.setIsTempFlow(FlowConstant.N);
      }
      Map<String, Object> vars = new HashMap<>();

@@ -61,100 +61,100 @@
      if(startVO.getProducePlanId() != null && startVO.getProducePlanId()!=0){
         //界面上选择了分工表的情况，直接根据id获取
         div = produceDivisionService.getById(startVO.getProducePlanId());
         vars.put(FlowVariableContants.TEAM_LEADER,div.getTeamLeaderId());
         vars.put(FlowVariableContants.PROGRAMMER,div.getProgrammerId());
         vars.put(FlowVariableContants.CHECKER,div.getCheckerId());
         vars.put(FlowVariableContants.SENIOR,div.getSeniorId());
         vars.put(FlowVariableConstant.TEAM_LEADER,div.getTeamLeaderId());
         vars.put(FlowVariableConstant.PROGRAMMER,div.getProgrammerId());
         vars.put(FlowVariableConstant.CHECKER,div.getCheckerId());
         vars.put(FlowVariableConstant.SENIOR,div.getSeniorId());

         vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
         vars.put(FlowConstant.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));

      }else {
         div = flowCommonService.putDefaultAssignees(vars, startVO.getDrawingNo(), null);
      }
      vars.put(FlowVariableContants.TITLE,startVO.getTitle());
      vars.put(FlowVariableConstant.TITLE,startVO.getTitle());

      addLastStepUserName(startVO,vars);

      //机床编号
      vars.put(FlowVariableContants.MACHINE_CODE,startVO.getMachineCode());
      vars.put(FlowVariableConstant.MACHINE_CODE,startVO.getMachineCode());
      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
      vars.put(FlowVariableContants.WORKSHOP,workshop);
      vars.put(FlowVariableConstant.WORKSHOP,workshop);
      //机床型号

      Machine machine = machineService.getByCode(startVO.getMachineCode());
      if(machine == null){
         throw new ServiceException("错误的设备编码："+startVO.getMachineCode());
      }
      vars.put(FlowVariableContants.MACHINE_MODE,machine.getName());
      vars.put(FlowVariableContants.MACHINE_GROUP_CODE,machine.getMachineGroupCode());
      vars.put(FlowVariableConstant.MACHINE_MODE,machine.getName());
      vars.put(FlowVariableConstant.MACHINE_GROUP_CODE,machine.getMachineGroupCode());

      vars.put(FlowVariableContants.PROCESS_NO,startVO.getProcessNo());
      vars.put(FlowVariableContants.PROCESS_NAME,startVO.getProcessName());
      vars.put(FlowVariableContants.PROCESS_EDITION,startVO.getProcessEdition());
      vars.put(FlowVariableContants.CRAFT_EDITION,startVO.getCraftEdition());
      vars.put(FlowVariableConstant.PROCESS_NO,startVO.getProcessNo());
      vars.put(FlowVariableConstant.PROCESS_NAME,startVO.getProcessName());
      vars.put(FlowVariableConstant.PROCESS_EDITION,startVO.getProcessEdition());
      vars.put(FlowVariableConstant.CRAFT_EDITION,startVO.getCraftEdition());
      vars.put("planStartTime",startVO.getPlanStartTime());
      vars.put(FlowVariableContants.DRAWING_NO,startVO.getDrawingNo());
      vars.put(FlowVariableContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
      vars.put(FlowVariableConstant.DRAWING_NO,startVO.getDrawingNo());
      vars.put(FlowVariableConstant.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
      vars.put("planLockDays",startVO.getPlanLockDays());
      vars.put(FlowVariableContants.PRODUCT_MODEL,startVO.getProductModel());
      vars.put(FlowVariableConstant.PRODUCT_MODEL,startVO.getProductModel());

      if(StringUtils.isNotBlank(startVO.getDeviation())) {
         vars.put(FlowVariableContants.DEVIATION, startVO.getDeviation());//偏离单
         vars.put(FlowVariableConstant.DEVIATION, startVO.getDeviation());//偏离单
      }
      String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo(),startVO.getProcessEdition());
      vars.put(FlowVariableContants.PROGRAM_PACKAGE_NAME,programPkgName);
      vars.put(FlowVariableConstant.PROGRAM_PACKAGE_NAME,programPkgName);

      vars.put(FlowVariableContants.IS_TEMP_FLOW,FlowContants.Y.equals(startVO.getIsTempFlow())?FlowContants.Y:FlowContants.N);
      vars.put(FlowVariableConstant.IS_TEMP_FLOW, FlowConstant.Y.equals(startVO.getIsTempFlow())? FlowConstant.Y: FlowConstant.N);
      NcNode curedProgramPackage = null;
      if(!startVO.isTemporaryFlow() && !startVO.isDeviationFlow()) {
         //正常流程(非临时流程) 且不是 偏离单,才匹配固化程序
         curedProgramPackage = ncNodeService.getLastCuredProgramWithoutProcessEdition(startVO.getDrawingNo(),startVO.getProcessNo(),startVO.getMachineCode());
         //设置是否有固化程序标记
         vars.put(FlowVariableContants.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowContants.Y : FlowContants.N);
         vars.put(FlowVariableConstant.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowConstant.Y : FlowConstant.N);
         //工序版次是否一致，是否在有效期内
         if (curedProgramPackage != null) {
            vars.put(FlowVariableContants.CURED_NODE_ID, curedProgramPackage.getId());
            vars.put(FlowVariableContants.CURED_LOCKED, curedProgramPackage.hasLocked()?FlowContants.Y:FlowContants.N);
            vars.put(FlowVariableContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? FlowContants.Y : FlowContants.N);
            vars.put(FlowVariableConstant.CURED_NODE_ID, curedProgramPackage.getId());
            vars.put(FlowVariableConstant.CURED_LOCKED, curedProgramPackage.hasLocked()? FlowConstant.Y: FlowConstant.N);
            vars.put(FlowVariableConstant.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? FlowConstant.Y : FlowConstant.N);
            vars.put("curedProcessEdition", curedProgramPackage.getProcessEdition());
            vars.put(FlowVariableContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y : FlowContants.N);
            vars.put(FlowVariableConstant.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowConstant.Y : FlowConstant.N);
         } else {
            vars.put(FlowVariableContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
            vars.put(FlowVariableContants.VALIDITY_PERIOD, FlowContants.Y);
            vars.put(FlowVariableConstant.IS_PROCESS_EDITION_SAME, FlowConstant.Y);
            vars.put(FlowVariableConstant.VALIDITY_PERIOD, FlowConstant.Y);
         }

      }else{
         //临时流程/偏离单，不匹配固化程序
         vars.put(FlowVariableContants.HAS_CURED_PROGRAM,FlowContants.N);
         vars.put(FlowVariableConstant.HAS_CURED_PROGRAM, FlowConstant.N);
      }
      String myProcessName = "试切下发流程";
      if(vars.getOrDefault(FlowVariableContants.IS_TEMP_FLOW,FlowContants.N).equals(FlowContants.Y)){
      if(vars.getOrDefault(FlowVariableConstant.IS_TEMP_FLOW, FlowConstant.N).equals(FlowConstant.Y)){
         myProcessName = "试切补充流程";
      }else if(StringUtils.isNotBlank(startVO.getDeviation()) ){
         myProcessName = "偏离单";
      }else if(vars.getOrDefault(FlowVariableContants.HAS_CURED_PROGRAM,FlowContants.N).equals(FlowContants.Y)){
      }else if(vars.getOrDefault(FlowVariableConstant.HAS_CURED_PROGRAM, FlowConstant.N).equals(FlowConstant.Y)){
         myProcessName = "固化下发流程";
      }

      vars.put(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
      vars.put(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);

      String businessKey = Func.toStr(startVO.getTaskDispatchId());//业务表key
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst;
      if(startVO.isTemporaryFlow()){
         vars.put(FlowVariableContants.ASSIGNEE,div.getProgrammerId());//第一个用户编制上传文件
         vars.put(FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(div.getProgrammerId()));//编程员姓名
         vars.put(FlowVariableConstant.ASSIGNEE,div.getProgrammerId());//第一个用户编制上传文件
         vars.put(FlowConstant.PROGRAMMER_NAME,userCommonService.getUserNameById(div.getProgrammerId()));//编程员姓名

         inst = runtimeService.startProcessInstanceByKey(FlowContants.APPEND_PROCESS_KEY,businessKey,vars);
         inst = runtimeService.startProcessInstanceByKey(FlowConstant.APPEND_PROCESS_KEY,businessKey,vars);
      }else{
         vars.put(FlowVariableContants.ASSIGNEE,div.getTeamLeaderId());//第一个用户组长
         inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
         vars.put(FlowVariableConstant.ASSIGNEE,div.getTeamLeaderId());//第一个用户组长
         inst = runtimeService.startProcessInstanceByKey(FlowConstant.TRY_PROCESS_KEY,businessKey,vars);
      }
      FlowStartResult result = new FlowStartResult();
      result.setProcessInstanceId(inst.getProcessInstanceId());
      //生成程序编号
      String programNo = programSeqService.generageProgramNo();
      runtimeService.setVariable(inst.getProcessInstanceId(),FlowContants.PROGRAM_NO,programNo);
      runtimeService.setVariable(inst.getProcessInstanceId(), FlowVariableConstant.PROGRAM_NO,programNo);
      result.setProgramNo(programNo);

      if(curedProgramPackage != null) {//存在已固化程序，复制原来的程序文件。
@@ -173,12 +173,12 @@
    */
   private void addLastStepUserName(TaskAssignVO startVO, Map<String, Object> vars) {
      if(startVO.getDispatchBy() != null) {
         vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, startVO.getDispatchBy());
         vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, startVO.getDispatchBy());
      }else{
         if(startVO.getCreateUser() != null) {
            vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, this.userCommonService.getUserNameById(startVO.getCreateUser()));
            vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, this.userCommonService.getUserNameById(startVO.getCreateUser()));
         }else{
            vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME,"MES系统");
            vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME,"MES系统");
         }
      }
   }