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

8
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()) .eq(ProcessRouteTaskProcessesEntity::getTaskRowId, processRouteTaskVO.getRowId())
.list(); .list();
} }
if (CollUtil.isNotEmpty(processesVOList)) {
Set<String> processeWorkCenterSet = new HashSet<>(); // 工序号_工作中心 唯一标识 Set<String> processeWorkCenterSet = new HashSet<>(); // 工序号_工作中心 唯一标识
if (CollUtil.isNotEmpty(processesVOList)) {
List<ProcessRouteTaskProcessesEntity> taskProcessesEntityList = Convert.toList(ProcessRouteTaskProcessesEntity.class, processesVOList); List<ProcessRouteTaskProcessesEntity> taskProcessesEntityList = Convert.toList(ProcessRouteTaskProcessesEntity.class, processesVOList);
taskProcessesEntityList.forEach(taskProcessesEntity -> { taskProcessesEntityList.forEach(taskProcessesEntity -> {
taskProcessesEntity.setUpdatedByName(SessionUtil.getRealName()); taskProcessesEntity.setUpdatedByName(SessionUtil.getRealName());
@ -240,6 +240,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
processeWorkCenterSet.add(taskProcessesEntity.getProcesse() + "_" + taskProcessesEntity.getWorkCenter()); processeWorkCenterSet.add(taskProcessesEntity.getProcesse() + "_" + taskProcessesEntity.getWorkCenter());
}); });
processRouteTaskProcessesService.saveOrUpdateBatch(taskProcessesEntityList); processRouteTaskProcessesService.saveOrUpdateBatch(taskProcessesEntityList);
}
if (CollUtil.isNotEmpty(existsList)) { if (CollUtil.isNotEmpty(existsList)) {
existsList = existsList.stream().filter(exists -> !processeWorkCenterSet.contains(exists.getProcesse() + "_" + exists.getWorkCenter())).collect(Collectors.toList()); existsList = existsList.stream().filter(exists -> !processeWorkCenterSet.contains(exists.getProcesse() + "_" + exists.getWorkCenter())).collect(Collectors.toList());
} }
@ -248,7 +249,6 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
List<Long> deleteRowIdList = existsList.stream().map(ProcessRouteTaskProcessesEntity::getRowId).collect(Collectors.toList()); List<Long> deleteRowIdList = existsList.stream().map(ProcessRouteTaskProcessesEntity::getRowId).collect(Collectors.toList());
processRouteTaskProcessesMapper.deleteBatchByIdList(deleteRowIdList); processRouteTaskProcessesMapper.deleteBatchByIdList(deleteRowIdList);
} }
}
// 组件分配列表 // 组件分配列表
// 数据库已有的组件分配列表 // 数据库已有的组件分配列表
List<ProcessRouteTaskAssemblyEntity> existsListAss = new ArrayList<>(); List<ProcessRouteTaskAssemblyEntity> existsListAss = new ArrayList<>();
@ -258,8 +258,8 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
.list(); .list();
} }
List<ProcessRouteTaskAssemblyVO> assemblyVOList = processRouteTaskVO.getAssemblyVOList(); List<ProcessRouteTaskAssemblyVO> assemblyVOList = processRouteTaskVO.getAssemblyVOList();
if (CollUtil.isNotEmpty(assemblyVOList)) {
Set<String> materialNoLevelSet = new HashSet<>(); // 物料号_层 唯一标识 Set<String> materialNoLevelSet = new HashSet<>(); // 物料号_层 唯一标识
if (CollUtil.isNotEmpty(assemblyVOList)) {
List<ProcessRouteTaskAssemblyEntity> taskAssemblyEntityList = Convert.toList(ProcessRouteTaskAssemblyEntity.class, assemblyVOList); List<ProcessRouteTaskAssemblyEntity> taskAssemblyEntityList = Convert.toList(ProcessRouteTaskAssemblyEntity.class, assemblyVOList);
taskAssemblyEntityList.forEach(taskAssemblyEntity -> { taskAssemblyEntityList.forEach(taskAssemblyEntity -> {
taskAssemblyEntity.setUpdatedByName(SessionUtil.getRealName()); taskAssemblyEntity.setUpdatedByName(SessionUtil.getRealName());
@ -277,6 +277,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
materialNoLevelSet.add(taskAssemblyEntity.getMaterialNo() + "_" + taskAssemblyEntity.getLevel()); materialNoLevelSet.add(taskAssemblyEntity.getMaterialNo() + "_" + taskAssemblyEntity.getLevel());
}); });
processRouteTaskAssemblyService.saveOrUpdateBatch(taskAssemblyEntityList); processRouteTaskAssemblyService.saveOrUpdateBatch(taskAssemblyEntityList);
}
if (CollUtil.isNotEmpty(existsListAss)) { if (CollUtil.isNotEmpty(existsListAss)) {
existsListAss = existsListAss.stream().filter(exists -> !materialNoLevelSet.contains(exists.getMaterialNo() + "_" + exists.getLevel())).collect(Collectors.toList()); existsListAss = existsListAss.stream().filter(exists -> !materialNoLevelSet.contains(exists.getMaterialNo() + "_" + exists.getLevel())).collect(Collectors.toList());
} }
@ -286,7 +287,6 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
processRouteTaskAssemblyMapper.deleteBatchByIdList(deleteRowIdList); processRouteTaskAssemblyMapper.deleteBatchByIdList(deleteRowIdList);
} }
} }
}
/** /**
* 随机不重复编号，格式：yymmdd随机四位数字 * 随机不重复编号，格式：yymmdd随机四位数字