From 19d19e04f7184fdfc906de5d8041b60b9fed36f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 15:46:22 +0800
Subject: [PATCH] 节点层级调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 4 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 5 +++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index d9f363c..19f7eab 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -211,7 +211,7 @@
for(FlowProgramFile flowProgramFile : fileList){
flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
}
- this.flowProgramFileService.updateBatchById(fileList);
+ this.flowProgramFileService.saveBatch(fileList);
log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
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 28d7183..738fe60 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
@@ -84,7 +84,7 @@
if(!hisPackageNode.getId().equals(pkgNode.getId())){
hisPackageNode.setIsLastEdition(0);
}
- hisPackageNode.setParentId(machineNode.getId());
+ hisPackageNode.setParentId(machineNode.getParentId());
hisPackageNode.setParentIds(machineNode.getParentIds());//绋嬪簭鍖呬笌鏈哄簥鑺傜偣鍚岀骇
//澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 3dcb48c..43455e4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -173,7 +173,7 @@
String zipFileName = bladeRedis.get(filekey);
log.info("filekey={},鏂囦欢鍚�={}",filekey,zipFileName);
- Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
+ //Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);
@@ -251,7 +251,7 @@
newFlowFile.setProgramName(packageNode.getName());
newFlowFile.setProcessInstanceId(null);//鍏堢疆涓虹┖锛屽惎鍔ㄦ祦绋嬪悗璁剧疆璇ュ��
newFlowFile.setFileType("program");
-
+ newFlowFile.setName(fileName);
InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
BladeFile newOssFile = ossTemplate.putFile("mdm",fileName,ins);
newFlowFile.setOssName(newOssFile.getName());
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
index dbf595f..8eb75a3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
@@ -119,10 +119,11 @@
node.setProductModel(programProperties.getProductModel());
node.setFlowProgramFileId(programFile.getId());
node.setVersionNumber(1);
+ node.setParentId(programPkdNode.getId());
+ node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());
/*
if("program".equals(programFile.getFileType())){
- node.setParentId(programPkdNode.getId());
- node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());
+
}else{
//鍏朵粬鏂囦欢锛屽拰绋嬪簭鍖呭悕鍚岀骇骞跺垪
--
Gitblit v1.9.3