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

【工艺路线】详情接口字段

This commit is contained in:
10001392 2024-12-05 14:43:54 +08:00
parent abbdd26a1f
commit 9d99f8bf60
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,7 @@ import com.nflg.product.technology.job.PBomFormalTreeTask;
import com.nflg.product.technology.mapper.master.ProcessRouteTaskAssemblyMapper;
import com.nflg.product.technology.mapper.master.ProcessRouteTaskMapper;
import com.nflg.product.technology.mapper.master.ProcessRouteTaskProcessesMapper;
import com.nflg.product.technology.pojo.entity.ProcessRouteTaskAssemblyEntity;
import com.nflg.product.technology.pojo.entity.ProcessRouteTaskEntity;
import com.nflg.product.technology.pojo.entity.ProcessRouteTaskProcessesEntity;
import com.nflg.product.technology.pojo.entity.*;
import com.nflg.product.technology.pojo.query.ProcessRouteTaskQuery;
import com.nflg.product.technology.pojo.vo.*;
import nflg.product.common.constant.STATE;
@ -55,6 +53,8 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
@Resource
private MaterialMainService materialMainService;
@Resource
private ProcessWorkCenterService processWorkCenterService;
@Resource
private ProcessRouteTaskMapper processRouteTaskMapper;
@Resource
private ProcessRouteTaskProcessesMapper processRouteTaskProcessesMapper;
@ -86,14 +86,50 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
List<ProcessRouteTaskProcessesEntity> taskProcessesEntityList = processRouteTaskProcessesService.lambdaQuery().eq(ProcessRouteTaskProcessesEntity::getTaskRowId, rowId).list();
if (ObjectUtil.isNotEmpty(taskProcessesEntityList)) {
processRouteTaskVO.setProcessesVOList(Convert.toList(ProcessRouteTaskProcessesVO.class, taskProcessesEntityList));
initWorkCenterField(processRouteTaskVO.getProcessesVOList(), processRouteTaskEntity.getFactory());
}
List<ProcessRouteTaskAssemblyEntity> taskAssemblyEntityList = processRouteTaskAssemblyService.lambdaQuery().eq(ProcessRouteTaskAssemblyEntity::getTaskRowId, rowId).list();
if (ObjectUtil.isNotEmpty(taskAssemblyEntityList)) {
processRouteTaskVO.setAssemblyVOList(Convert.toList(ProcessRouteTaskAssemblyVO.class, taskAssemblyEntityList));
initMaterialDesc(processRouteTaskVO.getAssemblyVOList());
}
return processRouteTaskVO;
}
private void initMaterialDesc(List<ProcessRouteTaskAssemblyVO> assemblyVOList) {
Set<String> materialNos = new HashSet<>();
assemblyVOList.forEach(item -> {
materialNos.add(item.getMaterialNo());
materialNos.add(item.getParentMaterialNo());
});
List<MaterialMainEntity> materialMainEntities = this.materialMainService.lambdaQuery().in(MaterialMainEntity::getMaterialNo, materialNos).list();
if (CollUtil.isNotEmpty(materialMainEntities)) {
Map<String, String> materialMap = materialMainEntities.stream().collect(Collectors.toMap(MaterialMainEntity::getMaterialNo, MaterialMainEntity::getMaterialDesc,(k1, k2)->k1));
assemblyVOList.forEach(item -> {
item.setMaterialDesc(materialMap.get(item.getMaterialNo()));
item.setParentMaterialDesc(materialMap.get(item.getParentMaterialNo()));
});
}
}
private void initWorkCenterField(List<ProcessRouteTaskProcessesVO> processesVOList, String factory) {
if (ObjectUtil.isEmpty(factory)) {
return;
}
Set<String> workCenterSet = processesVOList.stream().map(ProcessRouteTaskProcessesVO::getWorkCenter).collect(Collectors.toSet());
List<ProcessWorkCenterEntity> workCenterEntityList = this.processWorkCenterService.lambdaQuery().in(ProcessWorkCenterEntity::getWorkCenter, workCenterSet).list();
if (CollUtil.isNotEmpty(workCenterEntityList)) {
processesVOList.forEach(processesVO -> {
List<ProcessWorkCenterEntity> matchWorkCenters = workCenterEntityList.stream().filter(item -> item.getFactory().equals(factory) && item.getWorkCenter().equals(processesVO.getWorkCenter())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(matchWorkCenters)) {
processesVO.setWorkCenterName(matchWorkCenters.get(0).getName());
processesVO.setStandardTextCode(matchWorkCenters.get(0).getStandardTextCode());
processesVO.setStandardTextCodeDescription(matchWorkCenters.get(0).getStandardTextCodeDescription());
}
});
}
}
@Transactional(rollbackFor = Exception.class)
public void save(ProcessRouteTaskVO processRouteTaskVO) {
if (!"tempSave".equals(processRouteTaskVO.getSaveType())) {