From 26f07223e1b33a8eb5ee184041575e9b204cfebe Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 27 六月 2025 23:26:44 +0800
Subject: [PATCH] 上传程序文件
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 44 ++++++++++----------------------------------
1 files changed, 10 insertions(+), 34 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 14295ab..c166cec 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
@@ -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;
/**
* 鍥哄寲娴佺▼鐨刱ey
@@ -44,44 +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("programId",prog.getProcessEdition());
- vars.put("program",prog);
+ vars.put("processEdition",progNode.getProcessEdition());
+ vars.put("programId",programId);
+ vars.put("program",progNode);
- //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("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";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
--
Gitblit v1.9.3