From 0ef4cc755bddd87799b8bfdd65c8123df6e149d0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 23:52:51 +0800
Subject: [PATCH] 锁定流程完成
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
index e9f4404..5b475ee 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
@@ -53,8 +53,7 @@
private final NodeDeptQueryService nodeDeptQueryService;
private final FlowCommonService flowCommonService;
private final OssTemplate ossTemplate;
- public static final String NODE_ID = "nodeId";
-
+ private final MachineService machineService;
/**
* 鍑嗗鏇挎崲娴佺▼闇�瑕佺殑鏁版嵁
@@ -110,22 +109,23 @@
*/
@Transactional
public void start(ReplaceFlowStartVO startVO){
-
-
NcNode programPackage = nodeService.getById(startVO.getNodeId());
Map<String, Object> vars = new HashMap<>();
+
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");
vars.put(FlowContants.TITLE,startVO.getTitle());
-
+ //浠ヤ笅琚玣lowCommonService.putFlowVariablesByNode(vars,programPackage);浠ｆ浛浜�
+ /*
//鏈哄簥缂栧彿
vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
- //Machine machine = machineService.getByCode(programPackge.getMachineCode());
+ Machine machine = machineService.getByCode(programPackage.getMachineCode());
//鏈哄簥鍨嬪彿
- //if(machine != null) {
- //vars.put(FlowContants.MACHINE_MODE, programPackge.getMachineMode());
- //}
+ if(machine != null) {
+ vars.put(FlowContants.MACHINE_MODE, machine.getName());
+ }
vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
@@ -137,13 +137,16 @@
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
- vars.put(NODE_ID, startVO.getNodeId());
-
+ vars.put(FlowContants.NODE_ID, startVO.getNodeId());
+ vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode()));
+ */
vars.put("comment", startVO.getComment());
+ vars.put(FlowContants.MY_PROCESS_NAME,"鏇挎崲娴佺▼");
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
- //replaceProgramFileService.lambdaUpdate().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).set(ReplaceProgramFile::getProcessInstanceId,inst.getProcessInstanceId());
-
+ //鏇存柊鑺傜偣鐨勬祦绋媔d锛岄伩鍏嶉噸澶嶅彂璧锋祦绋�
+ programPackage.setProcessInstanceId(inst.getId());
+ this.nodeService.updateById(programPackage);
/*
Task startTask = taskService.createTaskQuery()
.processInstanceId(inst.getId())
--
Gitblit v1.9.3