From 51054f0da5dd4718212064510fff045815388b90 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 16:31:03 +0800
Subject: [PATCH] 增加临时流程处理
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java
index a3152e3..dbc7384 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java
@@ -3,7 +3,6 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
-import org.checkerframework.checker.units.qual.N;
import org.flowable.engine.delegate.DelegateExecution;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
@@ -23,6 +22,7 @@
import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dict;
+import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -46,9 +46,6 @@
private final OssTemplate ossTemplate;
private final ProgramAnnotationService programAnnotationService;
private final MachineService machineService;
-
- public static final String GH = "GH";
-
/**
* 榛樿鏈夋晥鏈熼棿锛堟湀鏁帮級,2骞�
@@ -77,13 +74,15 @@
NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId, processInstanceId).one();
if(pkgNode.isDeviationProgram()){
//鍋忕鐨勭▼搴忕洿鎺ラ攣瀹�
- pkgNode.setIsLocked(1);
+ //pkgNode.setIsLocked(1);
+ pkgNode.lock();
nodeService.updateById(pkgNode);
}else {
//璇曞垏鐨�
pkgNode.setIsCured(1);
+ pkgNode.setIsLocked(NcNode.UNLOCK);
//璁剧疆杩囨湡鏃ユ湡
- pkgNode.upgradeVersionNUmber();
+ pkgNode.upgradeVersionNumber();
pkgNode.setExpireDate(calculateExpireDate());
nodeService.updateById(pkgNode);
@@ -101,9 +100,13 @@
//鍒涘缓鑺傜偣鍒版満搴婄骇鍒�.(鍥哄寲鏍�)
NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(programProperties);
+ pkgNode.setParentId(machineNode.getParentId());
+ pkgNode.setParentIds(machineNode.getParentIds());//鏇存柊涓婄骇鑺傜偣锛屼笅闈㈣繕瑕佺敤搴斾负鍦╤istoryProgramPackageNodes涓殑鍜岃繖涓笉鏄竴涓疄渚�
//鏈哄簥涓嬬幇鍦ㄦ病鏈夋枃浠朵簡锛岀▼搴忓寘鍚嶅崌绾т笌鏈哄簥鍚岀骇浜嗭紝鏀逛负鎵惧埌鏈哄簥鍚岀骇绋嬪簭鍖呭悕鏇存柊浜�
+ //TODO 杩欎釜parentIds鏄笉鏄笉澶燂紵锛屼笉澶燂紝涓�涓満搴婁笅澶氫釜绋嬪簭鍖呯殑鎯呭喌涓嶈鍚э紝浣嗘槸鎸夌収鏍戯紝澶氫釜绋嬪簭鍖呬笉澶幇瀹�
this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, machineNode.getParentIds())
.in(NcNode::getNodeType, Arrays.asList(NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE))
+ .ne(NcNode::getId,pkgNode.getId())//涓嶈鏇存柊鏂板浐鍖栫殑鑺傜偣new
.set(NcNode::getIsLastEdition,0).set(NcNode::getIsLocked,1).update();
for(NcNode hisPackageNode : historyProgramPackageNodes){
@@ -113,18 +116,26 @@
hisPackageNode.setParentId(machineNode.getParentId());
hisPackageNode.setParentIds(machineNode.getParentIds());//绋嬪簭鍖呬笌鏈哄簥鑺傜偣鍚岀骇
- //澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣
+ //澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣111
List<NcNode> programNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();
+ FlowProgramFile pfile;
for(NcNode programNode : programNodes){
- programNode.setIsLastEdition(0);
programNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
+ programNode.setIsLastEdition(0);
+
+ pfile = flowProgramFileService.getById(programNode.getFlowProgramFileId());
+ if(programNode.getParentId().equals(pkgNode.getId()) && !pfile.isProgram()){
+ //褰撳墠鍥哄寲绋嬪簭鍖呭悕涓嬬殑鈥滃叾浠栨枃浠垛�濋潪绋嬪簭鏂囦欢銆備笉璁剧疆涓鸿�佺増鏈紝鐩存帴鎸埌鍥哄寲鏍戜笅,涓や釜缃戠粶涔嬮棿鍙氦鎹㈢▼搴忔枃浠讹紝鍏朵粬鏂囦欢鍙兘淇濈暀
+ programNode.setIsLastEdition(1);
+ }
+
}
nodeService.updateBatchById(programNodes);
}
nodeService.updateBatchById(historyProgramPackageNodes);
Machine machine = machineService.getByCode(pkgNode.getMachineCode());
- List<Dict> annoDicts = programAnnotationService.getAnnotionList();
+ List<DictBiz> annoDicts = programAnnotationService.getAnnotionList();
//鏂扮殑娴佺▼鏂囦欢锛岄渶瑕佸湪鍖呰妭鐐逛笅鏂板缓锛屼笉鑳界敤鑰佺殑
List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,pkgNode.getProcessInstanceId()).list();
for(FlowProgramFile flowProgramFile : files){
@@ -132,6 +143,12 @@
newProgNode.setName(flowProgramFile.getName());
newProgNode.setNodeType(NcNode.TYPE_PROGRAM_FILE);
newProgNode.setParentId(pkgNode.getId());
+ newProgNode.setDrawingNo(pkgNode.getDrawingNo());
+ newProgNode.setDrawingNoEdition(pkgNode.getDrawingNoEdition());
+ newProgNode.setMachineCode(pkgNode.getMachineCode());
+ newProgNode.setProcessEdition(pkgNode.getProcessEdition());
+ newProgNode.setProcessName(pkgNode.getProcessName());
+ newProgNode.setProcessNo(pkgNode.getProcessNo());
newProgNode.setParentIds(pkgNode.getParentIds()+","+pkgNode.getId());
newProgNode.setIsLastEdition(1);
newProgNode.setVersionNumber(pkgNode.getVersionNumber());
@@ -147,28 +164,31 @@
}
}
+
/**
* 璁剧疆鍥哄寲娉ㄩ噴,瀹炵幇鏂瑰紡锛岃幏鍙栨枃浠跺瓧鑺備笅锛屼慨鏀瑰悗鏇挎崲鏂囦欢
* @param flowProgramFile oss 鏂囦欢
*
*/
- void setGhAnnotation(FlowProgramFile flowProgramFile,String machineGroup,List<Dict> annoDicts) throws IOException {
+ void setGhAnnotation(FlowProgramFile flowProgramFile,String machineGroup,List<DictBiz> annoDicts) throws IOException {
String ossName = flowProgramFile.getOssName();
//
try(InputStream ins = ossTemplate.statFileStream(ossName);){
byte[] bytes = IOUtils.toByteArray(ins);
ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes);
+ InputStream finishedStream = programAnnotationService.setGHAnnotation(byteInputStream,machineGroup,annoDicts);
+ /*
String annoTxt = programAnnotationService.generateAnnotation("GH",machineGroup,annoDicts);
- int statusLineIndex = 2;
- String line2 = FileContentUtil.readLineAt(byteInputStream,statusLineIndex);//绗笁琛屽簲璇ユ槸鐘舵�佹敞閲�
+ //int statusLineIndex = 2;
+ String line2 = FileContentUtil.readLineAt(byteInputStream,ProgramAnnotationService.STATUS_LINE_INDEX);//绗笁琛屽簲璇ユ槸鐘舵�佹敞閲�
byteInputStream.reset();
InputStream finishedStream;
if(programAnnotationService.isAnnotation(line2,machineGroup,annoDicts)){
- finishedStream = FileContentUtil.replaceAtLine(byteInputStream,statusLineIndex,annoTxt);
+ finishedStream = FileContentUtil.replaceAtLine(byteInputStream,ProgramAnnotationService.STATUS_LINE_INDEX,annoTxt);
}else{
- finishedStream = FileContentUtil.insertLine(byteInputStream,statusLineIndex,annoTxt);
- }
+ finishedStream = FileContentUtil.insertLine(byteInputStream,ProgramAnnotationService.STATUS_LINE_INDEX,annoTxt);
+ }*/
try(finishedStream) {
finishedStream.reset();
BladeFile bfile = ossTemplate.putFile(flowProgramFile.getName(), finishedStream);
--
Gitblit v1.9.3