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/program/vo/NcProgramExportDncPageVO.java | 2 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java | 4 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java | 6 ++++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 10 ++++++++++
5 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java
index ec04dbf..462f6b5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java
@@ -91,8 +91,12 @@
ncNodeService.save(newCuredNode);
//鏂扮殑娴佺▼瀵瑰簲鐨勬枃浠舵洿鏂板埌鏂拌妭鐐逛笅
+ /*
List<FlowProgramFile> newFlowFileList = flowProgramFileService.lambdaQuery()
.eq(FlowProgramFile::getProcessInstanceId, progProperties.getProcessInstanceId()).list();
+
+ */
+ List<FlowProgramFile> newFlowFileList = flowProgramFileService.listByProcessInstanceId(progProperties.getProcessInstanceId());
for (FlowProgramFile newFlowFile : newFlowFileList) {
NcNode newProgramNode = new NcNode();
newProgramNode.setName(newFlowFile.getName());
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()){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
index 48f83b5..1dd1748 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
@@ -134,4 +134,14 @@
IOUtils.copy(ins,response.getOutputStream());
}
}
+
+ /**
+ * 鑾峰彇鍏充簬娴佺▼鐨勬墍鏈夋枃浠�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 娴佺▼鍏宠仈鐨勬枃浠跺垪琛�
+ */
+ public List<FlowProgramFile> listByProcessInstanceId(String processInstanceId){
+ return lambdaQuery()
+ .eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
index 2a47aa7..a267909 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
@@ -11,7 +11,7 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="exportDncPageQuery" resultType="org.springblade.mdm.program.vo.NcProgramExportDncPageVO">
- select a.id,a.title,n.name,a.nc_node_id,n.drawing_no,n.drawing_no_edition,n.process_name,a.create_time,a.update_time from mdm_nc_program_approved a
+ select a.id,a.title,n.name,a.nc_node_id,n.process_no,n.drawing_no,n.drawing_no_edition,n.process_name,a.create_time,a.update_time from mdm_nc_program_approved a
inner join mdm_nc_node n on a.nc_node_id=n.id
<where>
a.is_deleted=0 and a.status=#{query.status}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
index b05ec19..cb5fefc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
@@ -21,4 +21,6 @@
private String drawingNoEdition;
@Schema(description = "宸ュ簭鍚嶇О")
private String processName;
+ @Schema(description = "宸ュ簭鍙�")
+ private String processNo;
}
--
Gitblit v1.9.3