From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 1354c20..8304ada 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
@@ -60,7 +60,8 @@
programProperties.setProcessInstanceId(processInstanceId);
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
-
+ this.copyFlowPropertiesFromMap(programProperties, 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)));
@@ -84,12 +85,16 @@
if(vars.containsKey(FlowContants.CURED_NODE_ID)){
programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.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)));
+ */
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
.singleResult();
@@ -106,6 +111,46 @@
programProperties.setProcessInstanceId(processInstanceId);
Map<String, Object> vars =historicInstance.getProcessVariables();
+ this.copyFlowPropertiesFromMap(programProperties,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.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.setMachineMode(String.valueOf(vars.get(FlowContants.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)));
+ }
+ if(vars.containsKey(FlowContants.CURED_NODE_ID)){
+ programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.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.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
+ return programProperties;
+ }
+
+ 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)));
@@ -130,6 +175,9 @@
if(vars.containsKey(FlowContants.CURED_NODE_ID)){
programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.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)));
@@ -137,8 +185,6 @@
programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
- programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
- return programProperties;
}
/**
* 娴佺▼鏄惁鍦ㄨ繘琛�
--
Gitblit v1.9.3