From 3907579a69079b5ee462d17799e3995d9cd77fd4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 21:54:38 +0800
Subject: [PATCH] 延时问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 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 f71268b..9b92de6 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
@@ -2,17 +2,16 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
@@ -60,47 +59,47 @@
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);
+
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
+ /*
+ vars.put(FlowVariableContants.MACHINE_CODE,programPackage.getMachineCode());
+
//鏈哄簥鍨嬪彿
Machine machine = machineService.getByCode(programPackage.getMachineCode());
if(machine != null) {
- vars.put(FlowContants.MACHINE_MODE,machine.getName());
+ vars.put(FlowVariableContants.MACHINE_MODE,machine.getName());
}
String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
- vars.put(FlowContants.WORKSHOP,workshop);
+ vars.put(FlowVariableContants.WORKSHOP,workshop);
- vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
- vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
- vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
- vars.put(FlowContants.CRAFT_EDITION, programPackage.getCraftEdition());
- vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
- vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
+ vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
+ vars.put(FlowVariableContants.PROCESS_NO,programPackage.getProcessNo());
+ vars.put(FlowVariableContants.PROCESS_NAME,programPackage.getProcessName());
+ vars.put(FlowVariableContants.PROCESS_EDITION,programPackage.getProcessEdition());
+ vars.put(FlowVariableContants.CRAFT_EDITION, programPackage.getCraftEdition());
+ vars.put(FlowVariableContants.DRAWING_NO,programPackage.getDrawingNo());
+ vars.put(FlowVariableContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
- 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());
+ vars.put(FlowVariableContants.PRODUCT_MODEL,programPackage.getProductModel());
+ vars.put(FlowVariableContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
*/
- flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
- //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
- vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ vars.put(FlowVariableContants.ASSIGNEE,vars.get(FlowVariableContants.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowVariableContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
+ vars.put(FlowVariableContants.TITLE,programPackage.getName()+"-鍋忕鍥炰紶");//鑷姩澧炲姞鏍囬
+ }else {
+ vars.put(FlowVariableContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowVariableContants.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ }
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
--
Gitblit v1.9.3