From 490820d080cfa8e7da823607b2e2ba5a57e1e392 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 4 Sep 2025 20:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/service/impl/DesDesignChangeServiceImpl.java    | 3 ++-
 .../design/service/impl/DesVolumeFileServiceImpl.java      | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java
index 2311b6d0..7ad3bd7b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java
@@ -649,7 +649,8 @@ public class DesDesignChangeServiceImpl extends ServiceImpl<DesDesignChangeMappe
 
                 //查询蓝图最大版本号
                 List<DesVolumeFile> list = volumeFileService.list(Wrappers.lambdaQuery(DesVolumeFile.class)
-                    .eq(DesVolumeFile::getType, DesVolumeFile.BLUEPRINT)
+                    .in(DesVolumeFile::getType, Arrays.asList(DesVolumeFile.BLUEPRINT, DesVolumeFile.WASTE))
+                    .eq(DesVolumeFile::getVolumeCatalogId, volumeCatalog.getDesign())
                     .orderByDesc(DesVolumeFile::getVersion)
                 );
                 String version = "1.0";
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java
index d9550f7a..1ead862f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java
@@ -309,9 +309,10 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
 
             // 根据文件类型和文件名判断是否存在文件，存在则版本号往上增
             List<DesVolumeFile> existingFiles = baseMapper.selectList(new LambdaQueryWrapper<DesVolumeFile>()
-                .eq(DesVolumeFile::getType, type)
+                .eq(DesVolumeFile.PROCESS.equals(type),DesVolumeFile::getType, type)
+                .in(DesVolumeFile.BLUEPRINT.equals(type),DesVolumeFile::getType, Arrays.asList(DesVolumeFile.BLUEPRINT, DesVolumeFile.WASTE))
                 .eq(DesVolumeFile::getVolumeCatalogId, file.getVolumeCatalogId())
-                .eq(DesVolumeFile::getFileName, fileName)
+//                .eq(DesVolumeFile::getFileName, fileName)
                 .orderByDesc(DesVolumeFile::getVersion));
 
             String versionStr = "1.0"; // 默认版本号
@@ -327,7 +328,7 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
                 // 过程图纸：基于蓝图版本号，如蓝图是1.0，则过程图为1.1, 1.2...1.9, 1.10
                 // 先查找对应的蓝图文件最新版本
                 List<DesVolumeFile> blueprintFiles = baseMapper.selectList(new LambdaQueryWrapper<DesVolumeFile>()
-                    .eq(DesVolumeFile::getType, DesVolumeFile.BLUEPRINT) // 蓝图类型
+                    .in(DesVolumeFile::getType, Arrays.asList(DesVolumeFile.BLUEPRINT, DesVolumeFile.WASTE)) // 蓝图类型
                     .eq(DesVolumeFile::getVolumeCatalogId, file.getVolumeCatalogId())
 //                    .eq(DesVolumeFile::getFileName, fileName)
                     .orderByDesc(DesVolumeFile::getVersion));