From fed6e94a542df2d0a8a792eca6e61e988660ace7 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Wed, 18 Dec 2024 16:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E3=80=91=E5=88=A0=E9=99=A4=E5=9C=BA=E6=99=AF=E7=9A=84=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessRouteTaskService.java      | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
index 0802e8b6..0512d98c 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
@@ -221,8 +221,8 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
                     .eq(ProcessRouteTaskProcessesEntity::getTaskRowId, processRouteTaskVO.getRowId())
                     .list();
         }
+        Set<String> processeWorkCenterSet = new HashSet<>(); // 工序号_工作中心 唯一标识
         if (CollUtil.isNotEmpty(processesVOList)) {
-            Set<String> processeWorkCenterSet = new HashSet<>(); // 工序号_工作中心 唯一标识
             List<ProcessRouteTaskProcessesEntity> taskProcessesEntityList = Convert.toList(ProcessRouteTaskProcessesEntity.class, processesVOList);
             taskProcessesEntityList.forEach(taskProcessesEntity -> {
                 taskProcessesEntity.setUpdatedByName(SessionUtil.getRealName());
@@ -240,14 +240,14 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
                 processeWorkCenterSet.add(taskProcessesEntity.getProcesse() + "_" + taskProcessesEntity.getWorkCenter());
             });
             processRouteTaskProcessesService.saveOrUpdateBatch(taskProcessesEntityList);
-            if (CollUtil.isNotEmpty(existsList)) {
-                existsList = existsList.stream().filter(exists -> !processeWorkCenterSet.contains(exists.getProcesse() + "_" + exists.getWorkCenter())).collect(Collectors.toList());
-            }
-            // 删除冗余工序
-            if (CollUtil.isNotEmpty(existsList)) {
-                List<Long> deleteRowIdList = existsList.stream().map(ProcessRouteTaskProcessesEntity::getRowId).collect(Collectors.toList());
-                processRouteTaskProcessesMapper.deleteBatchByIdList(deleteRowIdList);
-            }
+        }
+        if (CollUtil.isNotEmpty(existsList)) {
+            existsList = existsList.stream().filter(exists -> !processeWorkCenterSet.contains(exists.getProcesse() + "_" + exists.getWorkCenter())).collect(Collectors.toList());
+        }
+        // 删除冗余工序
+        if (CollUtil.isNotEmpty(existsList)) {
+            List<Long> deleteRowIdList = existsList.stream().map(ProcessRouteTaskProcessesEntity::getRowId).collect(Collectors.toList());
+            processRouteTaskProcessesMapper.deleteBatchByIdList(deleteRowIdList);
         }
         // 组件分配列表
         // 数据库已有的组件分配列表
@@ -258,8 +258,8 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
                     .list();
         }
         List<ProcessRouteTaskAssemblyVO> assemblyVOList = processRouteTaskVO.getAssemblyVOList();
+        Set<String> materialNoLevelSet = new HashSet<>(); // 物料号_层 唯一标识
         if (CollUtil.isNotEmpty(assemblyVOList)) {
-            Set<String> materialNoLevelSet = new HashSet<>(); // 物料号_层 唯一标识
             List<ProcessRouteTaskAssemblyEntity> taskAssemblyEntityList = Convert.toList(ProcessRouteTaskAssemblyEntity.class, assemblyVOList);
             taskAssemblyEntityList.forEach(taskAssemblyEntity -> {
                 taskAssemblyEntity.setUpdatedByName(SessionUtil.getRealName());
@@ -277,14 +277,14 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
                 materialNoLevelSet.add(taskAssemblyEntity.getMaterialNo() + "_" + taskAssemblyEntity.getLevel());
             });
             processRouteTaskAssemblyService.saveOrUpdateBatch(taskAssemblyEntityList);
-            if (CollUtil.isNotEmpty(existsListAss)) {
-                existsListAss = existsListAss.stream().filter(exists -> !materialNoLevelSet.contains(exists.getMaterialNo() + "_" + exists.getLevel())).collect(Collectors.toList());
-            }
-            // 删除冗余组件分配
-            if (CollUtil.isNotEmpty(existsListAss)) {
-                List<Long> deleteRowIdList = existsListAss.stream().map(ProcessRouteTaskAssemblyEntity::getRowId).collect(Collectors.toList());
-                processRouteTaskAssemblyMapper.deleteBatchByIdList(deleteRowIdList);
-            }
+        }
+        if (CollUtil.isNotEmpty(existsListAss)) {
+            existsListAss = existsListAss.stream().filter(exists -> !materialNoLevelSet.contains(exists.getMaterialNo() + "_" + exists.getLevel())).collect(Collectors.toList());
+        }
+        // 删除冗余组件分配
+        if (CollUtil.isNotEmpty(existsListAss)) {
+            List<Long> deleteRowIdList = existsListAss.stream().map(ProcessRouteTaskAssemblyEntity::getRowId).collect(Collectors.toList());
+            processRouteTaskAssemblyMapper.deleteBatchByIdList(deleteRowIdList);
         }
     }