From 66db2ddb74b0f1afba2ccb237ac949959501283f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 23:26:32 +0800
Subject: [PATCH] 导出dnc增加工序版次
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java
index 1117d0c..36287da 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java
@@ -47,7 +47,7 @@
Long nodeId = runtimeService.getVariable(execution.getId(),ReplaceFlowService.NODE_ID,Long.class);
log.info("浜嬩欢鍚嶇О{}锛宨nstid={}" , execution.getEventName(),instId);
List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, instId).list();
- NcNode newProgramPackage = replaceProgram(nodeId,programFiles);
+ NcNode newProgramPackage = replaceProgram(nodeId,instId,programFiles);
addToApproved(newProgramPackage,Func.toStr(execution.getVariables().get(FlowContants.TITLE)));
@@ -72,7 +72,7 @@
* @param programFiles 鏂扮殑鏂囦欢
* @return 鏂扮殑绋嬪簭鍖呭悕鑺傜偣
*/
- NcNode replaceProgram(Long nodeId, List<FlowProgramFile> programFiles){
+ NcNode replaceProgram(Long nodeId,String processInstanceId, List<FlowProgramFile> programFiles){
//鍘熻妭鐐规敼涓鸿�佺増鏈�
NcNode oldPackageNode = ncNodeService.getById(nodeId);
oldPackageNode.setIsLastEdition(0);
@@ -86,9 +86,11 @@
EntityUtil.clearBaseProperties(newPackageNode);
newPackageNode.setIsLastEdition(1);
newPackageNode.setVersionNumber(oldPackageNode.genNewVersionNumber());
+ newPackageNode.setProcessInstanceId(processInstanceId);
ncNodeService.save(newPackageNode);
+ //鑰佹枃浠讹紝鏇存柊鎴愯�佺増鏈�
List<NcNode> programFileNodes = ncNodeService.getProgramFilesByPackageId(nodeId);
NcNode fileNodeOne = null;
if(!programFileNodes.isEmpty()){
--
Gitblit v1.9.3