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/FlowCommonService.java | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index 7bea079..825010a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -88,38 +88,38 @@
*/
void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
- programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
- programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
- programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
- programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
- programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));
+ programProperties.setTitle(String.valueOf(vars.get(FlowVariableContants.TITLE)));
+ programProperties.setIsTempFlow(Func.toStr(vars.get(FlowVariableContants.IS_TEMP_FLOW)));
+ programProperties.setDrawingNo(String.valueOf(vars.get(FlowVariableContants.DRAWING_NO)));
+ programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowVariableContants.DRAWING_NO_EDITION)));
+ programProperties.setProductModel(String.valueOf(vars.get(FlowVariableContants.PRODUCT_MODEL)));
- programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
- programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
- programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
- programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
+ programProperties.setProcessNo(String.valueOf(vars.get(FlowVariableContants.PROCESS_NO)));
+ programProperties.setProcessEdition(String.valueOf(vars.get(FlowVariableContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowVariableContants.PROCESS_NAME)));
+ programProperties.setMachineCode(String.valueOf(vars.get(FlowVariableContants.MACHINE_CODE)));
- programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
+ programProperties.setMachineMode(String.valueOf(vars.get(FlowVariableContants.MACHINE_MODE)));
//鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
- programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
- programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
- programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
- if(vars.containsKey(FlowContants.DEVIATION)) {
- programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
+ programProperties.setCraftEdition(String.valueOf(vars.get(FlowVariableContants.CRAFT_EDITION)));
+ programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowVariableContants.HAS_CURED_PROGRAM)));
+ programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowVariableContants.IS_PROCESS_EDITION_SAME)));
+ if(vars.containsKey(FlowVariableContants.DEVIATION)) {
+ programProperties.setDeviation(String.valueOf(vars.get(FlowVariableContants.DEVIATION)));
}
- if(vars.containsKey(FlowContants.CURED_NODE_ID)){
- programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
+ if(vars.containsKey(FlowVariableContants.CURED_NODE_ID)){
+ programProperties.setCuredNodeId(Func.toLong(vars.get(FlowVariableContants.CURED_NODE_ID)));
}
if(vars.containsKey(FlowContants.NODE_ID)){
programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
}
programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
- programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
- programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
- programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
- programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowVariableContants.TEAM_LEADER)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowVariableContants.PROGRAMMER)));
+ programProperties.setCheckerId(Func.toLong(vars.get(FlowVariableContants.CHECKER)));
+ programProperties.setSeniorId(Func.toLong(vars.get(FlowVariableContants.SENIOR)));
programProperties.setProgramNo(programProperties.getDrawingNo()+"-"+programProperties.getProcessNo()+"-"+programProperties.getProcessEdition());
@@ -181,12 +181,12 @@
*/
public ProduceDivision putDefaultAssignees(Map<String, Object> vars,String drawingNo,String defaultAssignee){
ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(drawingNo);
- vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
- vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
- vars.put(FlowContants.CHECKER,div.getCheckerId());
- vars.put(FlowContants.SENIOR,div.getSeniorId());
+ vars.put(FlowVariableContants.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowVariableContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowVariableContants.CHECKER,div.getCheckerId());
+ vars.put(FlowVariableContants.SENIOR,div.getSeniorId());
if(StringUtils.isNotBlank(defaultAssignee)) {
- vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
+ vars.put(FlowVariableContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
}
vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
@@ -200,25 +200,25 @@
*/
public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
//鏈哄簥缂栧彿
- vars.put(FlowContants.MACHINE_CODE,programPackageNode.getMachineCode());
+ vars.put(FlowVariableContants.MACHINE_CODE,programPackageNode.getMachineCode());
Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
//鏈哄簥鍨嬪彿
if(machine != null) {
- vars.put(FlowContants.MACHINE_MODE, machine.getName());
+ vars.put(FlowVariableContants.MACHINE_MODE, machine.getName());
}
- vars.put(FlowContants.PROCESS_NO,programPackageNode.getProcessNo());
- vars.put(FlowContants.PROCESS_NAME,programPackageNode.getProcessName());
- vars.put(FlowContants.PROCESS_EDITION,programPackageNode.getProcessEdition());
- vars.put(FlowContants.CRAFT_EDITION,programPackageNode.getCraftEdition());
+ vars.put(FlowVariableContants.PROCESS_NO,programPackageNode.getProcessNo());
+ vars.put(FlowVariableContants.PROCESS_NAME,programPackageNode.getProcessName());
+ vars.put(FlowVariableContants.PROCESS_EDITION,programPackageNode.getProcessEdition());
+ vars.put(FlowVariableContants.CRAFT_EDITION,programPackageNode.getCraftEdition());
- vars.put(FlowContants.DRAWING_NO,programPackageNode.getDrawingNo());
- vars.put(FlowContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());
+ vars.put(FlowVariableContants.DRAWING_NO,programPackageNode.getDrawingNo());
+ vars.put(FlowVariableContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());
- vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackageNode.getName());
+ vars.put(FlowVariableContants.PROGRAM_PACKAGE_NAME,programPackageNode.getName());
- vars.put(FlowContants.PRODUCT_MODEL,programPackageNode.getProductModel());
+ vars.put(FlowVariableContants.PRODUCT_MODEL,programPackageNode.getProductModel());
vars.put(FlowContants.NODE_ID, programPackageNode.getId());
- vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));
+ vars.put(FlowVariableContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));
}
}
--
Gitblit v1.9.3