From e7d9cc18d4040d5cca8c1349c9efc879c0c49922 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Wed, 18 Dec 2024 16:10:39 +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 --- .../ProcessRouteTaskAssemblyMapper.java | 4 +++ .../ProcessRouteTaskProcessesMapper.java | 4 +++ .../service/ProcessRouteTaskService.java | 34 +++++++++++++++++++ .../master/ProcessRouteTaskAssemblyMapper.xml | 7 ++++ .../ProcessRouteTaskProcessesMapper.xml | 7 ++++ 5 files changed, 56 insertions(+) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java index f8add6f6..7d23a2e3 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java @@ -2,6 +2,9 @@ package com.nflg.product.technology.mapper.master; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.product.technology.pojo.entity.ProcessRouteTaskAssemblyEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +16,5 @@ import com.nflg.product.technology.pojo.entity.ProcessRouteTaskAssemblyEntity; */ public interface ProcessRouteTaskAssemblyMapper extends BaseMapper { + void deleteBatchByIdList(@Param("rowIdList") List rowIdList); } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskProcessesMapper.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskProcessesMapper.java index 2190959b..caed34b3 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskProcessesMapper.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskProcessesMapper.java @@ -2,6 +2,9 @@ package com.nflg.product.technology.mapper.master; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.product.technology.pojo.entity.ProcessRouteTaskProcessesEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +16,5 @@ import com.nflg.product.technology.pojo.entity.ProcessRouteTaskProcessesEntity; */ public interface ProcessRouteTaskProcessesMapper extends BaseMapper { + void deleteBatchByIdList(@Param("rowIdList") List rowIdList); } 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 ad2cb144..0802e8b6 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 @@ -214,7 +214,15 @@ public class ProcessRouteTaskService extends ServiceImpl processesVOList = processRouteTaskVO.getProcessesVOList(); + // 数据库已有的工序列表 + List existsList = new ArrayList<>(); + if (ObjectUtil.isNotEmpty(processRouteTaskVO.getRowId())) { + existsList = processRouteTaskProcessesService.lambdaQuery() + .eq(ProcessRouteTaskProcessesEntity::getTaskRowId, processRouteTaskVO.getRowId()) + .list(); + } if (CollUtil.isNotEmpty(processesVOList)) { + Set processeWorkCenterSet = new HashSet<>(); // 工序号_工作中心 唯一标识 List taskProcessesEntityList = Convert.toList(ProcessRouteTaskProcessesEntity.class, processesVOList); taskProcessesEntityList.forEach(taskProcessesEntity -> { taskProcessesEntity.setUpdatedByName(SessionUtil.getRealName()); @@ -229,12 +237,29 @@ public class ProcessRouteTaskService extends ServiceImpl !processeWorkCenterSet.contains(exists.getProcesse() + "_" + exists.getWorkCenter())).collect(Collectors.toList()); + } + // 删除冗余工序 + if (CollUtil.isNotEmpty(existsList)) { + List deleteRowIdList = existsList.stream().map(ProcessRouteTaskProcessesEntity::getRowId).collect(Collectors.toList()); + processRouteTaskProcessesMapper.deleteBatchByIdList(deleteRowIdList); + } } // 组件分配列表 + // 数据库已有的组件分配列表 + List existsListAss = new ArrayList<>(); + if (ObjectUtil.isNotEmpty(processRouteTaskVO.getRowId())) { + existsListAss = processRouteTaskAssemblyService.lambdaQuery() + .eq(ProcessRouteTaskAssemblyEntity::getTaskRowId, processRouteTaskVO.getRowId()) + .list(); + } List assemblyVOList = processRouteTaskVO.getAssemblyVOList(); if (CollUtil.isNotEmpty(assemblyVOList)) { + Set materialNoLevelSet = new HashSet<>(); // 物料号_层 唯一标识 List taskAssemblyEntityList = Convert.toList(ProcessRouteTaskAssemblyEntity.class, assemblyVOList); taskAssemblyEntityList.forEach(taskAssemblyEntity -> { taskAssemblyEntity.setUpdatedByName(SessionUtil.getRealName()); @@ -249,8 +274,17 @@ public class ProcessRouteTaskService extends ServiceImpl !materialNoLevelSet.contains(exists.getMaterialNo() + "_" + exists.getLevel())).collect(Collectors.toList()); + } + // 删除冗余组件分配 + if (CollUtil.isNotEmpty(existsListAss)) { + List deleteRowIdList = existsListAss.stream().map(ProcessRouteTaskAssemblyEntity::getRowId).collect(Collectors.toList()); + processRouteTaskAssemblyMapper.deleteBatchByIdList(deleteRowIdList); + } } } diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskAssemblyMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskAssemblyMapper.xml index 39836e86..14488c75 100644 --- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskAssemblyMapper.xml +++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskAssemblyMapper.xml @@ -2,4 +2,11 @@ + + delete from t_process_route_task_assembly where 1=1 + AND row_id IN + + #{item} + + diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskProcessesMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskProcessesMapper.xml index 741ebe21..7eedb137 100644 --- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskProcessesMapper.xml +++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskProcessesMapper.xml @@ -2,4 +2,11 @@ + + delete from t_process_route_task_processes where 1=1 + AND row_id IN + + #{item} + +