From 96c7b6dbf240ed5447a37100c7158a35d36d8b2e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 22:58:33 +0800
Subject: [PATCH] dnc回传记录处理

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/DispatchFinishListener.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 4e7670b..98d88a7 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
@@ -72,14 +72,13 @@
 	 * @param progProperties 娴佺▼灞炴��
 	 */
 	void createProgramNodes(FlowProgramProperties progProperties){
-		//FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId);
 		if(!FlowContants.Y.equals(progProperties.getHasCuredProgram())) {
 			//璇曞垏鎴栬�呭亸绂�
 			ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties);
 		}else{
 			//鏈夊浐鍖�
 			//TODO 杩樿鍖哄垎鏄惁鍙敤鍒ゅ畾鏄惁鍙敤銆傚彲鐢ㄧ晫
-			if(!FlowContants.Y.equals(progProperties.getCureProgramUseable())) {
+			if(FlowContants.N.equals(progProperties.getCureProgramUseable())) {
 				//鍥哄寲绋嬪簭涓嶅彲鐢紝闇�瑕侀噸鏂板缓绔嬬▼搴忓寘鍚嶅拰鏂囦欢鑺傜偣;鍙敤鎯呭喌鍦ㄦ祦绋嬪鎵逛腑宸茬粡鍗囩骇杩囪妭鐐逛簡
 				NcNode curedProgramPackage = ncNodeService.getById(Func.toLong(progProperties.getCuredNodeId()));
 
@@ -94,13 +93,16 @@
 				List<FlowProgramFile> newFlowFileList = flowProgramFileService.listByProcessInstanceId(progProperties.getProcessInstanceId());
 				for (FlowProgramFile newFlowFile : newFlowFileList) {
 					NcNode newProgramNode = new NcNode();
+					BeanUtils.copyProperties(curedProgramPackage, newProgramNode);
+					EntityUtil.clearBaseProperties(newProgramNode);
+
 					newProgramNode.setName(newFlowFile.getName());
 					newProgramNode.setNodeType(NcNode.TYPE_PROGRAM_FILE);
-					newProgramNode.setParentId(newCuredNode.getParentId());
+					newProgramNode.setParentId(newCuredNode.getId());
 					newProgramNode.setIsLastEdition(1);
 					newProgramNode.setIsLocked(0);
 					newProgramNode.setParentIds(newCuredNode.getParentIds() + "," + newCuredNode.getId());
-
+					newProgramNode.setFlowProgramFileId(newFlowFile.getId());
 					ncNodeService.save(newProgramNode);
 				}
 

--
Gitblit v1.9.3