From fe185a5eb4669e925af908153bdf21778551fdb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 20:23:36 +0800
Subject: [PATCH] 增加固化流程文件内容比对接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 04274a5..f71268b 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
@@ -34,8 +34,6 @@
private final RuntimeService runtimeService;
- private final HistoryService historyService;
- private final TaskService taskService;
private final IdentityService identityService;
private final NodeDeptQueryService nodeDeptQueryService;
private final NcNodeService ncNodeService;
@@ -43,7 +41,7 @@
private final FlowProgramFileService flowProgramFileService;
private final ProduceDivisionService produceDivisionService;
private final MachineService machineService;
-
+ private final FlowCommonService flowCommonService;
/**
* 鍚姩鍥哄寲娴佺▼
@@ -61,7 +59,7 @@
private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
Map<String, Object> vars = new HashMap<>();
NcNode programPackage = this.ncNodeService.getById(nodeId);
-
+ vars.put(FlowContants.NODE_ID,programPackage.getId());
vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
//鏈哄簥鍨嬪彿
//vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
@@ -84,14 +82,16 @@
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
+ /*
- ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
vars.put(FlowContants.CHECKER,div.getCheckerId());
vars.put(FlowContants.SENIOR,div.getSeniorId());
vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
-
- vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
+ */
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
+ vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
--
Gitblit v1.9.3