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/cure/NormalCureFinishDataHandler.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
index 295993f..ec8432e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
@@ -85,6 +85,19 @@
//List<NcNode> historyProgramPackageNodes = nodeService.getTryNodeHistory(pkgNode);
try {
moveNodeToCuredTree(pkgNode, flowProps);//, historyProgramPackageNodes
+
+ //鍥哄寲涓嶉攣瀹氾紝鍚庣画杩樺彲鑳戒娇鐢ㄨ鍥哄寲绋嬪簭
+ //nodeService.lockSameNameOtherMachineGroupProgramPackage(pkgNode);
+ /*
+ nodeService.lambdaUpdate().eq(NcNode::getDrawingNo,pkgNode.getDrawingNo())
+ .eq(NcNode::getProcessNo,pkgNode.getProcessNo())
+ .eq(NcNode::getName,pkgNode.getName())
+ .ne(NcNode::getMachineGroupCode,pkgNode.getMachineGroupCode())
+ .eq(NcNode::getIsCured,1)
+ .set(NcNode::getIsLocked,NcNode.LOCKED)
+ .set(NcNode::getRemark,"鍥炰紶鍥哄寲鍚屽悕绋嬪簭閿佸畾")
+ .update();
+ */
}catch(Exception e) {
log.error("鍥哄寲娴佺▼瀹屾垚寮傚父",e);
throw new ServiceException("鏅�氬浐鍖栨墽琛屽紓甯�"+e.getMessage());
@@ -227,8 +240,6 @@
cureNode.upgradeVersionNumber();
}
- //nodeService.save(cureNode);
-
return cureNode;
}
/**
@@ -243,13 +254,12 @@
byte[] bytes = IOUtils.toByteArray(ins);
ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes);
- //InputStream finishedStream = programAnnotationService.setGHAnnotation(byteInputStream,controlSystem,annoDicts);
List<DictBiz> annoDictList = programAnnotationService.getAnnotionDictList();
AnnotationProperties annoProps = config.getConfigMap().get(controlSystem);
if(annoProps == null){
annoProps = AnnotationProperties.getDefault();
}
- InputStream finishedStream =AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, "GH", annoProps.getStatusLineIndex(), controlSystem, annoDictList);
+ InputStream finishedStream =AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, AnnotationUtil.GH, annoProps.getStatusLineIndex(), controlSystem, annoDictList);
try(finishedStream) {
finishedStream.reset();
BladeFile bfile = ossTemplate.putFile(flowProgramFile.getName(), finishedStream);
--
Gitblit v1.9.3