From 79e81a02076cdd1e828eb06029cd51eb37522f42 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 09:11:37 +0800
Subject: [PATCH] 首页下载问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
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 d80b701..f7d2847 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
@@ -31,7 +31,7 @@
private final NcNodeService ncNodeService;
private final FlowCommonService flowCommonService;
private final FlowProgramFileService flowProgramFileService;
- private final ProgramSeqService programSeqService;
+
public static final String TRY_NAME = "璇曞垏";
public static final String CURE_NAME = "鍥哄寲";
public static final String DEVIATION_NAME = "鍋忕";
@@ -41,7 +41,7 @@
* @param programProperties 绋嬪簭灞炴��
*/
@Transactional
- public NcNode createNodeTreeToMachine(FlowProgramProperties programProperties) {
+ public NcNode createNodeTreeToMachineGroup(FlowProgramProperties programProperties) {
NcNode root;
if(programProperties.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)){
if(Func.isEmpty(programProperties.getDeviation()) ||
@@ -78,9 +78,9 @@
//宸ュ簭鐗堟鑺傜偣
NcNode processEditionNode = createNodeIfNotExists(programProperties.getProcessEdition(),NcNode.TYPE_PROCESS_EDITION, processNoNode,programProperties,null);
//鍔犲伐鏈哄簥鑺傜偣
- return createNodeIfNotExists(programProperties.getMachineCode(),NcNode.TYPE_MACHINE_CODE, processEditionNode,programProperties,null);
+ return createNodeIfNotExists(programProperties.getMachineGroupCode(),NcNode.TYPE_MACHINE_GROUP, processEditionNode,programProperties,null);
}
-
+ /*
@Transactional
public NcNode createNodeTreeToProcessEdition(FlowProgramProperties programProperties) {
NcNode root;
@@ -121,6 +121,7 @@
//鍔犲伐鏈哄簥鑺傜偣
return createNodeIfNotExists(programProperties.getMachineCode(),NcNode.TYPE_MACHINE_CODE, processEditionNode,programProperties,null);
}
+ */
/**
* 鏍规嵁娴佺▼淇℃伅锛岃嚜鍔ㄥ垱寤哄悇涓妭鐐�,鍖呮嫭绋嬪簭鑺傜偣
* @param programProperties 绋嬪簭灞炴��
@@ -179,18 +180,21 @@
*/
@Transactional
public NcNode createTreeToPackage(FlowProgramProperties programProperties,Integer versionNumber) {
- NcNode machineCodeNode = createNodeTreeToMachine(programProperties);
- NcNode processEditionNode = this.ncNodeService.getById(machineCodeNode.getParentId());
+ NcNode machineGroupNode = createNodeTreeToMachineGroup(programProperties);
+ //NcNode processEditionNode = this.ncNodeService.getById(machineCodeNode.getParentId());
//鑾峰彇宸ュ簭鐗堟涓嬪叾浠栨満搴婂悕锛屽瓨鍦ㄥ垯鍒犻櫎
- ncNodeService.lambdaUpdate().eq(NcNode::getNodeType,NcNode.TYPE_MACHINE_CODE)
+ /*
+ ncNodeService.lambdaUpdate().eq(NcNode::getNodeType,NcNode.TYPE_MACHINE_GROUP)
.eq(NcNode::getParentId,processEditionNode.getId()).eq(NcNode::getIsLastEdition,1)
.ne(NcNode::getName,machineCodeNode.getName()).remove();
+ */
+
//淇濇寔鍔犲伐鏈哄簥鏄渶鏂颁笅鍙戜换鍔＄殑鏈哄簥锛屼笉鏄柊寤轰竴涓満搴婅妭鐐癸紝鎻掑彊宸ュ簭鐗堟涓嬫槸鍚︽湁鍏朵粬鐨勬満搴婏紙闆朵欢鍙蜂竴鑷达紝宸ュ簭鍙凤紝宸ュ簭鐗堟涓�鑷达級
//鑾峰彇
- //鍔犲伐鏈哄簥鍜岀▼搴忓寘鍚嶅湪鍚屼竴绾ц妭鐐�,鍚屽湪宸ュ簭鐗堟涓嬬骇
- String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo());
- return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, processEditionNode,programProperties,versionNumber);
+ //绋嬪簭鍖呭悕鍦ㄦ満搴婄粍涓嬬骇 20250913
+ String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo(),programProperties.getProcessEdition());
+ return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, machineGroupNode,programProperties,versionNumber);
}
@@ -230,13 +234,14 @@
ncNode.setProcessEdition(programProperties.getProcessEdition());
ncNode.setProcessName(programProperties.getProcessName());
ncNode.setMachineCode(programProperties.getMachineCode());
+ ncNode.setMachineGroupCode(programProperties.getMachineGroupCode());
ncNode.setProductModel(programProperties.getProductModel());
ncNode.setDeviation(programProperties.getDeviation());
if(NcNode.TYPE_PROGRAM_PACKAGE.equals(nodeType)) {//绋嬪簭鍖呰妭鐐癸紝鍒嗛厤绋嬪簭缂栧彿
- String programNo = programSeqService.generageProgramNo();
- ncNode.setProgramNo(programNo);
+
+ ncNode.setProgramNo(programProperties.getProgramNo());
}
}
--
Gitblit v1.9.3