From a5f944c2bc0107e5df936937f1c33e5e03eb8fed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 19:15:48 +0800
Subject: [PATCH] 解锁增加解锁原因和展示
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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 2fbc72b..d7b6dd4 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
@@ -1,9 +1,7 @@
package org.springblade.mdm.flow.excution.cure;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.dispatch.FinishDataHandler;
@@ -11,7 +9,6 @@
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
@@ -42,7 +39,7 @@
private MachineService machineService;
/**
- * cureFinishOperateTask璋冪敤
+ * cureFinishOperateTask璋冪敤锛屽亸绂诲崟鍥炰紶瀹℃壒瀹屾垚澶勭悊涓氬姟
* @param props 灞炴��
*/
public void handleData(FlowProgramProperties props) {
@@ -66,16 +63,21 @@
List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,pkgNode.getId()).list();
FlowProgramFile pfile;
for(NcNode oldProgramNode : oriProgramNodes){
- oldProgramNode.setIsLastEdition(0);
- oldProgramNode.setVersionNumber(pkgNode.getVersionNumber());
pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
if(!pfile.isProgram()){
- //褰撳墠鍥哄寲绋嬪簭鍖呭悕涓嬬殑鈥滃叾浠栨枃浠垛�濋潪绋嬪簭鏂囦欢銆備笉璁剧疆涓鸿�佺増鏈紝鐩存帴鎸埌鍥哄寲鏍戜笅,涓や釜缃戠粶涔嬮棿鍙氦鎹㈢▼搴忔枃浠讹紝鍏朵粬鏂囦欢鍙兘淇濈暀
- oldProgramNode.setIsLastEdition(1);
+ //褰撳墠鍥哄寲绋嬪簭鍖呭悕涓嬬殑鈥滃叾浠栨枃浠垛�濋潪绋嬪簭鏂囦欢銆備笉璁剧疆涓鸿�佺増鏈紝澶嶅埗鍒板浐鍖栨爲涓�,涓や釜缃戠粶涔嬮棿鍙氦鎹㈢▼搴忔枃浠讹紝鍏朵粬鏂囦欢鍙兘淇濈暀
+ //鍏朵粬鏂囦欢锛岄渶瑕佸鍒跺埌鏂板缓鐨勫浐鍖栬妭鐐逛笅
+ NcNode newOtherFileNode = new NcNode();
+ BeanUtils.copyProperties(oldProgramNode,newOtherFileNode);
+ EntityUtil.clearBaseProperties(newOtherFileNode);
+ newOtherFileNode.setParentId(newPkgNode.getId());
+ newOtherFileNode.setParentIds(newPkgNode.getParentIds()+","+newPkgNode.getId());
+ newOtherFileNode.setIsLastEdition(1);
+ nodeService.save(newOtherFileNode);
}
}
- nodeService.updateBatchById(oriProgramNodes);
+ //nodeService.updateBatchById(oriProgramNodes);
//鏂扮殑鏂囦欢浣滀负鏈�鏂扮増鏈�
List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,pkgNode.getProcessInstanceId()).list();
@@ -96,27 +98,9 @@
}
- addApproveTable(pkgNode,props);
updateApproveRecordNodeId(instId, pkgNode.getId());
log.info("鍋忕鍥炰紶Listener瀹屾垚");
}
-
- /**
- * 淇濆瓨瀹℃壒瀹屾垚鐨勮褰�
- * @param packageNode
- * @param props
- */
- void addApproveTable(NcNode packageNode,FlowProgramProperties props){
- NcProgramApproved approved = new NcProgramApproved();
-
- approved.setProgramName(packageNode.getName());
- approved.setNcNodeId(packageNode.getId());//绋嬪簭鍖呰妭鐐筰d
- approved.setTitle(props.getTitle());
- approved.setProgrammerId(props.getProgrammerId());
- approvedService.save(approved);
-
- }
-
void updateApproveRecordNodeId(String processInstanceId,Long nodeId){
//鏇存柊瀹℃壒璁板綍鐨刵cNodeId
--
Gitblit v1.9.3