From e853c35455332a4652ec604c650ca82c411c864d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 15:24:46 +0800
Subject: [PATCH] 流程常量位置重构
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 ba90311..8942b3e 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
@@ -11,6 +11,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
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;
@@ -58,45 +59,45 @@
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(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.NODE_ID, Func.toStr(nodeId));
- 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(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(FlowVariableContants.PRODUCT_MODEL,programPackage.getProductModel());
- vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
+ 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));
+ 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(FlowVariableContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
if(programPackage.getDeviation() != null) {
- vars.put(FlowContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
- vars.put(FlowContants.TITLE,programPackage.getName()+"-鍋忕鍥炰紶");//鑷姩澧炲姞鏍囬
+ vars.put(FlowVariableContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
+ vars.put(FlowVariableContants.TITLE,programPackage.getName()+"-鍋忕鍥炰紶");//鑷姩澧炲姞鏍囬
}else {
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
- vars.put(FlowContants.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ vars.put(FlowVariableContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowVariableContants.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
}
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
--
Gitblit v1.9.3