From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
index f6fe576..6cd2f89 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
@@ -16,6 +16,7 @@
import org.springblade.mdm.gkw.programnode.vo.ProgramNameVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
+import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.programannotation.*;
import org.springblade.mdm.utils.ProgramFileNameParser;
@@ -48,6 +49,8 @@
private ListenerHelper listenerHelper;
@Autowired
private OssTemplate ossTemplate;
+ @Autowired
+ private NcNodeHisService ncNodeHisService;
/**
* DispatchFinishListener涓皟鐢�
@@ -66,20 +69,23 @@
ncNodeService.updateById(packageNode);
//鐗堟湰鍙锋牴鎹浂缁勪欢鍙�+宸ュ簭鍙凤紝宸ュ簭鐗堟锛屾満搴婄粍 鐩存帴鏌ヨ鏁伴噺锛�+1鑾峰彇
- Integer newVersion = ncNodeService.calculateVersionNumber(packageNode);
- packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
+ Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
+ packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
+ packageNode.setVersionNumber(newVersion);
+ ncNodeService.updateById(packageNode);
}else{
//鍙敤锛岀┖鍗囩増锛堜慨鏀瑰叾宸ュ簭鐗堟锛夛紝鍘熸潵鐨勮妭鐐规竻闄�
moveToNewProcessEdition(packageNode,props);
-
//鏇存柊宸插浐鍖栫殑锛屽悓鍚嶃�佷笉鍚屾満搴婄粍鐨勭▼搴忎负閿佸畾鐘舵��
ncNodeService.lockSameNameOtherMachineGroupProgramPackage(packageNode);
}
}else{
- //鏅�氳瘯鍒�
- packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
+ //鏅�氳瘯鍒�/涓存椂鏇存敼鍗�
+ packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
+ Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
long hisSerial = ncNodeService.calculateHistorySerial(packageNode);
packageNode.setHisSerial(hisSerial);
+ packageNode.setVersionNumber(newVersion);
ncNodeService.updateById(packageNode);
}
@@ -111,7 +117,6 @@
this.ncNodeService.updateById(packageNode);
Machine machine = machineService.getByCode(packageNode.getMachineCode());
//绉诲姩绋嬪簭鑺傜偣
- //List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
List<NcNode> programNodes = ncNodeService.getProgramFilesByPackageId(packageNode.getId());
for(NcNode programNode : programNodes){
FlowProgramFile progFile = this.flowProgramFileService.getById(programNode.getFlowProgramFileId());
--
Gitblit v1.9.3