From 3357f4b98b68460c920df66260b0e641b60569be Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 19:14:25 +0800
Subject: [PATCH] 修复工控网导入判断是否有固化程序的判断
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index fa2d695..f681814 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -110,13 +110,15 @@
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
- List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNcNodeId()).list();
+ List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
- String status = "鏈浐鍖�";
- if(programPackageNode.hasCured()){
- status = "宸插浐鍖�";
+ String status = "璇曞垏";
+ if(programPackageNode.isDeviation()){
+ status = "鍋忕";
+ }else if(programPackageNode.hasCured()){
+ status = "鍥哄寲";
}
List<Dict> annotationList = getAnnotionList();
for (NcNode node : programNodes) {
--
Gitblit v1.9.3