rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【工艺路线】删除场景的保存

This commit is contained in:
10001392 2024-12-18 16:55:25 +08:00
parent e7d9cc18d4
commit fed6e94a54
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
View File

@ -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);
}
}