From a3a9933cf1b49006edf470615236f94ebdaa4cb9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 九月 2025 17:04:24 +0800
Subject: [PATCH] 增加车床程序处理；退回改为实际编程员
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 14 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 a19af2a..481f0f6 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,15 +4,12 @@
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;
@@ -22,8 +19,6 @@
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
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;
@@ -60,6 +55,97 @@
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)));
+ 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)));
+ */
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+ String processDefinitionKey = processInstance.getProcessDefinitionKey();
+ 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.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)));
@@ -84,18 +170,17 @@
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();
- String processDefinitionKey = processInstance.getProcessDefinitionKey();
- programProperties.setProcessDefinitionKey(processDefinitionKey);
- return programProperties;
}
-
/**
* 娴佺▼鏄惁鍦ㄨ繘琛�
* @param processInstanceId 瀹炰緥id
@@ -126,6 +211,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @return assignee
*/
+ /*
public String previusAssignee(String processInstanceId) {
// 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
@@ -139,7 +225,7 @@
assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
}
return assignee;
- }
+ }*/
/**
* 灏嗛粯璁ゅ鎵圭敤鎴锋斁鍏ap涓�
--
Gitblit v1.9.3