From 101f1f6d1869fa279a88130f2d0978c6ac4e2329 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 11 Oct 2024 17:17:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-11=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/BomManagementServiceImpl.java  | 12 ++++++++----
 .../service/impl/RoutingManagementServiceImpl.java   | 10 +++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
index fe32321e..407ced48 100644
--- a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
@@ -397,8 +397,12 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             List<BomHeaderEntity> historyBom = bomManagementMapper.selectList(new QueryWrapper<BomHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("bom_type", data.getBomType()));
             Date newEffPhaseInDate = bomHeader.getEffPhaseInDate();
             Date newEffPhaseOutDate = bomHeader.getEffPhaseOutDate();
+            // 过滤掉自己
+            List<BomHeaderEntity> filteredList = historyBom.stream()
+                    .filter(a -> a.getEngChgLevel() != data.getEngChgLevel())
+                    .collect(Collectors.toList());
             boolean b = false;
-            for (BomHeaderEntity existingBomHeader  : historyBom) {
+            for (BomHeaderEntity existingBomHeader  : filteredList) {
                 Date existingEffPhaseInDate = existingBomHeader.getEffPhaseInDate();
                 Date existingEffPhaseOutDate = existingBomHeader.getEffPhaseOutDate();
 
@@ -408,7 +412,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                     break;
                 }
                 // 如果新对象的结束时间在现有对象的时间范围内，则重叠
-                else if (newEffPhaseInDate != null && newEffPhaseOutDate.after(existingEffPhaseInDate) && newEffPhaseOutDate.before(existingEffPhaseOutDate)) {
+                else if (newEffPhaseOutDate != null && newEffPhaseOutDate.after(existingEffPhaseInDate) && newEffPhaseOutDate.before(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
@@ -429,7 +433,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 }
             }
             if (b) {
-                throw new RuntimeException("日期重叠，不允许Build！");
+                throw new RuntimeException("日期冲突，不允许Build！");
             }
         }
 
@@ -951,7 +955,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                         bomHeader.setEffPhaseOutDate(calendar.getTime());
                         bomManagementMapper.updateInDate(bomHeader);
                     } else {
-                        throw new RuntimeException("日期冲突！");
+                        //throw new RuntimeException("日期冲突！");
                     }
                 }
                 // 修改上版本的 partRevision 的失效日期
diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
index b17394b5..df1ecce1 100644
--- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
@@ -990,11 +990,11 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         }
         data.setRoutingRevision(routingRevision);
 
-        // 校验日期是否冲突
-        List<RoutingHeaderEntity> headerEntities = routingManagementMapper.queryHeaderPhaseDate(data);
-        if (!headerEntities.isEmpty()) {
-            throw new RuntimeException("日期冲突！");
-        }
+//        // 校验日期是否冲突
+//        List<RoutingHeaderEntity> headerEntities = routingManagementMapper.queryHeaderPhaseDate(data);
+//        if (!headerEntities.isEmpty()) {
+//            throw new RuntimeException("日期冲突！");
+//        }
 
         // 1.3 新增routing主信息
         routingManagementMapper.saveRoutingHeader(data);