From 26a97440e1dc83fb6950dd00c38caeab39e67325 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 25 Jan 2025 13:57:34 +0800
Subject: [PATCH] =?UTF-8?q?2025-01-25=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/service/impl/PartInformationServiceImpl.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 8ee3d823..65c84be7 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -431,6 +431,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 bomHeader.setBomType("Purchase");
             }
             bomHeader.setEffPhaseInDate(data.getCreateDate());
+            bomHeader.setEngRevision(partRevision.getEngRevision());
             bomHeader.setEngChgLevel(1);
             if ("Manufactured Recipe".equals(data.getPartType())) {
                 savePartRecipeInfo(bomHeader);
@@ -601,7 +602,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 bomHeader.setBomType("Purchase");
             }
             bomHeader.setEffPhaseInDate(data.getCreateDate());
-            bomHeader.setEngRevision("1");
+            bomHeader.setEngRevision(partRevision.getEngRevision());
             bomHeader.setEngChgLevel(1);
             if ("Manufactured Recipe".equals(data.getPartType())) {
                 savePartRecipeInfo(bomHeader);
@@ -2960,7 +2961,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                         throw new RuntimeException("不存在与该物料相同的BOM类型！");
                     }
                     // 对所选替代的版本进行去重
-                    TreeSet<BomDetailVo> bomHeaderList = bomAlternativeList.stream().collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BomDetailEntity::getEngChgLevel))));
+                    TreeSet<BomDetailVo> bomHeaderList = bomAlternativeList.stream().collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(BomDetailEntity::getEngChgLevel).thenComparing(BomDetailEntity::getBomType))));
                     for (BomDetailVo bomDetailVo : bomHeaderList) {
                         BomHeaderEntity bomHeader = new BomHeaderEntity();
                         bomHeader.setSite(ifsPart.getSite());