From eebd71b9197ba70f21d161958a1e5ae0539dcd47 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 22:48:23 +0800
Subject: [PATCH] 修复偏离单回传程序版本都是2的问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
index 50076e2..2fbc72b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
@@ -65,14 +65,13 @@
//澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣111
List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,pkgNode.getId()).list();
FlowProgramFile pfile;
- for(NcNode programNode : oriProgramNodes){
-
- programNode.setIsLastEdition(0);
- programNode.setVersionNumber(newPkgNode.getVersionNumber());
- pfile = flowProgramFileService.getById(programNode.getFlowProgramFileId());
+ for(NcNode oldProgramNode : oriProgramNodes){
+ oldProgramNode.setIsLastEdition(0);
+ oldProgramNode.setVersionNumber(pkgNode.getVersionNumber());
+ pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
if(!pfile.isProgram()){
//褰撳墠鍥哄寲绋嬪簭鍖呭悕涓嬬殑鈥滃叾浠栨枃浠垛�濋潪绋嬪簭鏂囦欢銆備笉璁剧疆涓鸿�佺増鏈紝鐩存帴鎸埌鍥哄寲鏍戜笅,涓や釜缃戠粶涔嬮棿鍙氦鎹㈢▼搴忔枃浠讹紝鍏朵粬鏂囦欢鍙兘淇濈暀
- programNode.setIsLastEdition(1);
+ oldProgramNode.setIsLastEdition(1);
}
}
@@ -95,10 +94,6 @@
newProgNode.setIsCured(0);
nodeService.save(newProgNode);
- //淇敼鏂囦欢鍐呭鏇存柊娉ㄩ噴锛屽苟鏇存柊鏂囦欢鏁版嵁鐨勫湴鍧�
- //setGhAnnotation(flowProgramFile,machine.getMachineGroupCode(),annoDicts);
-
- //flowProgramFileService.updateById(flowProgramFile);
}
addApproveTable(pkgNode,props);
--
Gitblit v1.9.3