增加流程与程序关联查询

yangys

2025-06-30 813f0f6d391b7f24682204c22c059ef69b124fa6

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

@@ -8,7 +8,9 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
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.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,6 +34,8 @@
   @Autowired
   private NcProgramService ncProgramService;
   @Autowired
   private NcNodeService ncNodeService;
   @Autowired
   private MachineService machineService;
   /**
    * 固化流程的key
@@ -44,40 +48,16 @@
    */
   public void start(long programId){
      Map<String, Object> vars = new HashMap<>();
      NcProgram prog = ncProgramService.getById(programId);
      Machine machine = machineService.getByCode(prog.getMachineCode());
      //NcProgram prog = ncProgramService.getById(programId);
      NcNode progNode = ncNodeService.getById(programId);
      Machine machine = machineService.getByCode(progNode.getMachineCode());
      vars.put("machineCode",machine.getCode());
      vars.put("machineMode",machine.getName());
      vars.put("processEdition",prog.getProcessEdition());
      //vars.put("processNo",startVO.getProcessNo());prog.getProcessEdition()
      //vars.put("processName",startVO.getProcessName());
      /*
      Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
      Map<String, Object> vars = new HashMap<>(preAssignee);
      vars.put("processEdition",progNode.getProcessEdition());
      vars.put("programId",programId);
      vars.put("program",progNode);

      vars.put("machineCode",startVO.getMachineCode());
      vars.put("machineMode",startVO.getMachineMode());

      vars.put("processNo",startVO.getProcessNo());
      vars.put("processName",startVO.getProcessName());
      vars.put("processEdition",startVO.getProcessEdition());

      vars.put("craftEdition",startVO.getCraftEdition());
      vars.put("planStartTime",startVO.getPlanStartTime());
      vars.put("drawingNo",startVO.getDrawingNo());
      vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
      vars.put("planLockDays",startVO.getPlanLockDays());

      //零组件代码
      String partNo = generatePartNo(startVO);
      vars.put("partNo",partNo);

      NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
      vars.put("curedNcProgram",curedNcProgram);

      //设置是否有固化程序标记
      vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
      */
      String businessKey = "0";//业务表key

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
@@ -87,20 +67,4 @@
      //log.info()
   }

   /**
    * 生成零组件编号
    * 图号、图号版次、工序号、工序名称、工艺版次、工序版次 组合起来获得零组件号
    * @param startVO
    * @return
    */
   String generatePartNo(TaskAssignVO startVO){
      //TODO 这个格式未确定，需要确认
      return String.format("%s-%s-%s-%s-%s-%s",
         startVO.getDrawingNo(),
         startVO.getDrawingNoEdition(),
         startVO.getProcessNo(),
         startVO.getProcessName(),
         startVO.getCraftEdition(),
         startVO.getProcessEdition());
   }
}