From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 89 ++++++++------------------------------------
1 files changed, 17 insertions(+), 72 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 a79f69a..7bea079 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
@@ -13,7 +13,9 @@
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.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.system.feign.IUserClient;
@@ -31,7 +33,7 @@
private final ProduceDivisionService produceDivisionService;
private final NodeDeptQueryService nodeDeptQueryService;
private final MachineService machineService;
- private final IUserClient userClient;
+ private final UserCommonService userCommonService;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
* @param processInstanceId
@@ -56,40 +58,7 @@
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();
@@ -107,44 +76,16 @@
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;
}
+ /**
+ * 浠巑ap涓祴鍊兼祦绋嬩究鍒╁埌vo
+ * @param programProperties vo
+ * @param vars 鍙橀噺map
+ */
void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
@@ -180,6 +121,12 @@
programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ programProperties.setProgramNo(programProperties.getDrawingNo()+"-"+programProperties.getProcessNo()+"-"+programProperties.getProcessEdition());
+
+ programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
+ programProperties.setActCheckerId(Func.toLong(vars.get(FlowVariableContants.ACT_CHECKER)));
+ programProperties.setActSeniorId(Func.toLong(vars.get(FlowVariableContants.ACT_SENIOR)));
+ programProperties.setProgrammerName(Func.toStr(vars.get("programmerName")));
}
/**
* 娴佺▼鏄惁鍦ㄨ繘琛�
@@ -211,6 +158,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @return assignee
*/
+ /*
public String previusAssignee(String processInstanceId) {
// 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
@@ -224,7 +172,7 @@
assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
}
return assignee;
- }
+ }*/
/**
* 灏嗛粯璁ゅ鎵圭敤鎴锋斁鍏ap涓�
@@ -241,10 +189,7 @@
vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
}
- R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
- if(programmerResult.isSuccess()) {
- vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
- }
+ vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
return div;
}
--
Gitblit v1.9.3