From 016f6009aef19985e5e50be497651cb77795c868 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 18:26:42 +0800
Subject: [PATCH] 偏离单审批完成文件内容未更新问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 c19f79a..a19af2a 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
@@ -12,9 +12,15 @@
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.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.program.entity.NcNode;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
+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;
@@ -28,6 +34,9 @@
private final RuntimeService runtimeService;
private final HistoryService historyService;
private final ProduceDivisionService produceDivisionService;
+ private final NodeDeptQueryService nodeDeptQueryService;
+ private final MachineService machineService;
+ private final IUserClient userClient;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
* @param processInstanceId
@@ -53,6 +62,7 @@
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
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)));
@@ -76,6 +86,7 @@
}
programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
@@ -145,8 +156,41 @@
vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
}
+ R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
+ if(programmerResult.isSuccess()) {
+ vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
+ }
return div;
}
+
+ /**
+ * 鏍规嵁绋嬪簭鍖呭悕鑺傜偣锛屽～鍏呭彉閲弇ap
+ * @param vars
+ * @param programPackageNode
+ */
+ public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
+ //鏈哄簥缂栧彿
+ vars.put(FlowContants.MACHINE_CODE,programPackageNode.getMachineCode());
+ Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
+ //鏈哄簥鍨嬪彿
+ if(machine != null) {
+ vars.put(FlowContants.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(FlowContants.DRAWING_NO,programPackageNode.getDrawingNo());
+ vars.put(FlowContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());
+
+ vars.put(FlowContants.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()));
+
+ }
}
--
Gitblit v1.9.3