From 18d9c0bdc04e71cf3903c30c139f59dab744cf3f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 15:09:35 +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 2dbcd42..00a9793 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
@@ -47,12 +47,17 @@
String programPkgName = NcNodeService.genProgramName(props.getDrawingNo(),props.getProcessNo());
createProgramNodes(props);
- String processEdition = props.getProcessEdition();
//TODO 鍋忕鍗曪紝鍜屽凡缁忓浐鍖栫殑绋嬪簭锛屾病鏈夊鐞�,:宸茬粡澶勭悊娌℃湁楠岃瘉
NcNode packageNode;
- if(FlowContants.Y.equals(props.getHasCuredProgram()) && FlowContants.Y.equals(props.getCureProgramUseable())){
- //鏈夊浐鍖栵紝涓旂▼搴忓彲鐢紝浠庡浐鍖栨爲鏌ヨ鑺傜偣
- packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
+ if(FlowContants.Y.equals(props.getHasCuredProgram())){
+ //鏈夊浐鍖栵紝涓旂▼搴忓彲鐢紝浠庡浐鍖栨爲鏌ヨ鑺傜偣.浣跨敤娴佺▼涓繚瀛樼殑鑺傜偣
+ //packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
+ if(FlowContants.Y.equals(props.getCureProgramUseable())) {
+ packageNode = ncNodeService.getById(props.getCuredNodeId());
+ }else{
+ //涓嶅彲鐢紝鍘诲浐鍖栨壘鏈�鏂拌妭鐐�
+ packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
+ }
}else if(Func.isNotBlank(props.getDeviation())){
//鏈夊亸绂诲崟
packageNode = ncNodeService.getLastEditionDeviationProgramPackage(programPkgName,props.getProcessEdition());
@@ -72,13 +77,13 @@
*/
void createProgramNodes(FlowProgramProperties progProperties){
if(FlowContants.N.equals(progProperties.getHasCuredProgram())) {
- //鏃犲浐鍖�(璇曞垏鎴栬�呭亸绂�)
+ //鏃犲浐鍖�:(璇曞垏鎴栬�呭亸绂�)
ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties);
}else{
//鏈夊浐鍖栵紝绋嬪簭涓嶅彲鐢�
if(FlowContants.N.equals(progProperties.getCureProgramUseable())) {
//鍥哄寲绋嬪簭涓嶅彲鐢紝闇�瑕侀噸鏂板缓绔嬬▼搴忓寘鍚嶅拰鏂囦欢鑺傜偣;鍙敤鎯呭喌鍦ㄦ祦绋嬪鎵逛腑宸茬粡鍗囩骇杩囪妭鐐逛簡
- NcNode curedProgramPackage = ncNodeService.getById(Func.toLong(progProperties.getCuredNodeId()));
+ NcNode curedProgramPackage = ncNodeService.getById(progProperties.getCuredNodeId());
NcNode newCuredPkgNode = new NcNode();
BeanUtils.copyProperties(curedProgramPackage, newCuredPkgNode);
--
Gitblit v1.9.3