From 016f6009aef19985e5e50be497651cb77795c868 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 18:26:42 +0800
Subject: [PATCH] 偏离单审批完成文件内容未更新问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 0d495f4..c2b1ab3 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
@@ -59,10 +59,9 @@
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);
+
//鏈哄簥鍨嬪彿
Machine machine = machineService.getByCode(programPackage.getMachineCode());
if(machine != null) {
@@ -82,13 +81,7 @@
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
- /*
- 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());
- */
flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
//ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
@@ -97,10 +90,15 @@
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
+ vars.put(FlowContants.TITLE,programPackage.getName()+"-鍋忕鍥炰紶");//鑷姩澧炲姞鏍囬
+ }else {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ }
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
--
Gitblit v1.9.3