From edd4eb1d5eed4085bbe80cb65116fe585a13c42f Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期一, 23 六月 2025 22:49:34 +0800 Subject: [PATCH] dnc导入完善 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java index 6b01c31..de98c65 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java @@ -4,6 +4,8 @@ import org.flowable.engine.RuntimeService; import org.flowable.engine.runtime.ProcessInstance; 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.flow.excution.AutoAssignUsersService; import org.springblade.mdm.flow.vo.TaskAssignVO; import org.springblade.mdm.program.entity.NcProgram; @@ -29,13 +31,26 @@ @Autowired private NcProgramService ncProgramService; + @Autowired + private MachineService machineService; /** * 鍥哄寲娴佺▼鐨刱ey */ private static final String PROCESS_KEY = "program-cure"; + /** + * 鍚姩鍥哄寲娴佺▼ + * @param programId 绋嬪簭id + */ public void start(long programId){ Map<String, Object> vars = new HashMap<>(); + NcProgram prog = ncProgramService.getById(programId); + Machine machine = machineService.getByCode(prog.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); -- Gitblit v1.9.3