From 8db9b68d0bf4b7ec2e80b580f5931a40788caac7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 21:48:46 +0800
Subject: [PATCH] 替换流程bug修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 22 +++++++++++-----------
1 files changed, 11 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 d9f363c..c7b2f6a 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
@@ -17,16 +17,9 @@
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-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.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springblade.mdm.program.vo.DncSendBackData;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +41,7 @@
private final HistoryService historyService;
private final TaskService taskService;
private final IdentityService identityService;
-
+ private final NodeDeptQueryService nodeDeptQueryService;
private final NcNodeService ncNodeService;
private final FlowProgramFileService flowProgramFileService;
@@ -79,6 +72,10 @@
vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
//鏈哄簥鍨嬪彿
vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));
+
+ String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
+ vars.put(FlowContants.WORKSHOP,workshop);
+
vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
@@ -186,8 +183,9 @@
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
+ vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
- ProduceDivision div = produceDivisionService.getByDrawingNo(programPackage.getDrawingNo());
+ ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
if(div != null) {
vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
vars.put(FlowContants.CHECKER,div.getCheckerId());
@@ -202,6 +200,8 @@
vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
@@ -211,7 +211,7 @@
for(FlowProgramFile flowProgramFile : fileList){
flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
}
- this.flowProgramFileService.updateBatchById(fileList);
+ this.flowProgramFileService.saveBatch(fileList);
log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
--
Gitblit v1.9.3