From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 148 +++++++++++++++++++++++++++++++------------------
1 files changed, 94 insertions(+), 54 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 b2ff051..7133f50 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
@@ -4,26 +4,20 @@
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.history.HistoricTaskInstance;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.mdm.basesetting.machine.MachineService;
+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.commons.service.UserCommonService;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import java.util.List;
import java.util.Map;
@AllArgsConstructor
@@ -34,6 +28,7 @@
private final ProduceDivisionService produceDivisionService;
private final NodeDeptQueryService nodeDeptQueryService;
private final MachineService machineService;
+ private final UserCommonService userCommonService;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
* @param processInstanceId
@@ -57,32 +52,7 @@
programProperties.setProcessInstanceId(processInstanceId);
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
-
- programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
- 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)));
- }
- programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
-
- programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
+ this.copyFlowPropertiesFromMap(programProperties, vars);
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
@@ -91,7 +61,70 @@
programProperties.setProcessDefinitionKey(processDefinitionKey);
return programProperties;
}
+ public FlowProgramProperties getProgramPropertiesFromHis(String processInstanceId) {
+ HistoricProcessInstance historicInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+ FlowProgramProperties programProperties = new FlowProgramProperties();
+ programProperties.setProcessInstanceId(processInstanceId);
+
+ Map<String, Object> vars =historicInstance.getProcessVariables();
+ this.copyFlowPropertiesFromMap(programProperties,vars);
+
+ programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
+ return programProperties;
+ }
+
+ /**
+ * 浠巑ap涓祴鍊兼祦绋嬩究鍒╁埌vo
+ * @param programProperties vo
+ * @param vars 鍙橀噺map
+ */
+ void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
+
+ programProperties.setTitle(String.valueOf(vars.get(FlowVariableConstant.TITLE)));
+ programProperties.setIsTempFlow(Func.toStr(vars.get(FlowVariableConstant.IS_TEMP_FLOW)));
+ programProperties.setDrawingNo(String.valueOf(vars.get(FlowVariableConstant.DRAWING_NO)));
+ programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowVariableConstant.DRAWING_NO_EDITION)));
+ programProperties.setProductModel(String.valueOf(vars.get(FlowVariableConstant.PRODUCT_MODEL)));
+
+ programProperties.setProcessNo(String.valueOf(vars.get(FlowVariableConstant.PROCESS_NO)));
+ programProperties.setProcessEdition(String.valueOf(vars.get(FlowVariableConstant.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowVariableConstant.PROCESS_NAME)));
+ programProperties.setMachineCode(String.valueOf(vars.get(FlowVariableConstant.MACHINE_CODE)));
+ programProperties.setMachineGroupCode(String.valueOf(vars.get(FlowVariableConstant.MACHINE_GROUP_CODE)));
+ programProperties.setMachineMode(String.valueOf(vars.get(FlowVariableConstant.MACHINE_MODE)));
+ //鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
+
+ programProperties.setCraftEdition(String.valueOf(vars.get(FlowVariableConstant.CRAFT_EDITION)));
+ programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowVariableConstant.HAS_CURED_PROGRAM)));
+ programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowVariableConstant.IS_PROCESS_EDITION_SAME)));
+ if(vars.containsKey(FlowVariableConstant.DEVIATION)) {
+ programProperties.setDeviation(String.valueOf(vars.get(FlowVariableConstant.DEVIATION)));
+ }
+ if(vars.containsKey(FlowVariableConstant.CURED_NODE_ID)){
+ programProperties.setCuredNodeId(Func.toLong(vars.get(FlowVariableConstant.CURED_NODE_ID)));
+ }
+ if(vars.containsKey(FlowConstant.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowConstant.NODE_ID)));
+ }
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowConstant.CURE_PROGRAM_USEABLE)));
+
+ programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowVariableConstant.TEAM_LEADER)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowVariableConstant.PROGRAMMER)));
+ programProperties.setCheckerId(Func.toLong(vars.get(FlowVariableConstant.CHECKER)));
+ programProperties.setSeniorId(Func.toLong(vars.get(FlowVariableConstant.SENIOR)));
+
+ programProperties.setProgramNo(Func.toStr(vars.get(FlowVariableConstant.PROGRAM_NO)));
+
+ programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableConstant.ACT_PROGRAMMER)));
+ programProperties.setActCheckerId(Func.toLong(vars.get(FlowVariableConstant.ACT_CHECKER)));
+ programProperties.setActSeniorId(Func.toLong(vars.get(FlowVariableConstant.ACT_SENIOR)));
+ programProperties.setProgrammerName(Func.toStr(vars.get("programmerName")));
+
+ programProperties.setProgramOnMachine(Func.toStr(vars.get(FlowVariableConstant.PROGRAM_ON_MACHINE)));
+ }
/**
* 娴佺▼鏄惁鍦ㄨ繘琛�
* @param processInstanceId 瀹炰緥id
@@ -122,6 +155,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @return assignee
*/
+ /*
public String previusAssignee(String processInstanceId) {
// 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
@@ -135,7 +169,7 @@
assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
}
return assignee;
- }
+ }*/
/**
* 灏嗛粯璁ゅ鎵圭敤鎴锋斁鍏ap涓�
@@ -144,14 +178,15 @@
*/
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(FlowVariableConstant.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowVariableConstant.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowVariableConstant.CHECKER,div.getCheckerId());
+ vars.put(FlowVariableConstant.SENIOR,div.getSeniorId());
if(StringUtils.isNotBlank(defaultAssignee)) {
- vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
+ vars.put(FlowVariableConstant.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
}
+ vars.put(FlowConstant.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
return div;
}
@@ -162,26 +197,31 @@
*/
public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
//鏈哄簥缂栧彿
- vars.put(FlowContants.MACHINE_CODE,programPackageNode.getMachineCode());
+ vars.put(FlowVariableConstant.MACHINE_CODE,programPackageNode.getMachineCode());
+ vars.put(FlowVariableConstant.MACHINE_GROUP_CODE,programPackageNode.getMachineGroupCode());
+
Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
//鏈哄簥鍨嬪彿
if(machine != null) {
- vars.put(FlowContants.MACHINE_MODE, machine.getName());
+ vars.put(FlowVariableConstant.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(FlowVariableConstant.PROCESS_NO,programPackageNode.getProcessNo());
+ vars.put(FlowVariableConstant.PROCESS_NAME,programPackageNode.getProcessName());
+ vars.put(FlowVariableConstant.PROCESS_EDITION,programPackageNode.getProcessEdition());
+ vars.put(FlowVariableConstant.CRAFT_EDITION,programPackageNode.getCraftEdition());
- vars.put(FlowContants.DRAWING_NO,programPackageNode.getDrawingNo());
- vars.put(FlowContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());
+ vars.put(FlowVariableConstant.DRAWING_NO,programPackageNode.getDrawingNo());
+ vars.put(FlowVariableConstant.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());
- vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackageNode.getName());
+ vars.put(FlowVariableConstant.PROGRAM_PACKAGE_NAME,programPackageNode.getName());
- vars.put(FlowContants.PRODUCT_MODEL,programPackageNode.getProductModel());
- vars.put(FlowContants.NODE_ID, programPackageNode.getId());
- vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));
+ vars.put(FlowVariableConstant.PRODUCT_MODEL,programPackageNode.getProductModel());
+ vars.put(FlowConstant.NODE_ID, programPackageNode.getId());
+ vars.put(FlowVariableConstant.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));
+ if(programPackageNode.isDeviationProgram()) {
+ vars.put(FlowVariableConstant.DEVIATION, programPackageNode.getDeviation());
+ }
}
}
--
Gitblit v1.9.3