|
|
|
@ -859,9 +859,6 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas |
|
|
|
|
|
|
|
|
|
|
|
DsPartSynthesisVO dsPartSynthesisVO = new DsPartSynthesisVO(); |
|
|
|
DsPartSynthesisVO dsPartSynthesisVO = new DsPartSynthesisVO(); |
|
|
|
//查询子件信息
|
|
|
|
//查询子件信息
|
|
|
|
// if(TaskingConstant.IS_SINTERING.equals(partEntity.getIsSintering())){
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); |
|
|
|
List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); |
|
|
|
List<Long> idList = partRelationEntityList.stream() |
|
|
|
List<Long> idList = partRelationEntityList.stream() |
|
|
|
.map(DsPartRelationEntity::getChildPartId) |
|
|
|
.map(DsPartRelationEntity::getChildPartId) |
|
|
|
@ -869,6 +866,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas |
|
|
|
if(!CollectionUtils.isEmpty(idList)){ |
|
|
|
if(!CollectionUtils.isEmpty(idList)){ |
|
|
|
List<DsPartEntity> dsPartEntityList = partService.selectDsPartByIds(idList); |
|
|
|
List<DsPartEntity> dsPartEntityList = partService.selectDsPartByIds(idList); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DsPartEntity finalPartEntity = partEntity; |
|
|
|
List<DsPartVO> dsPartVOList = dsPartEntityList.stream() |
|
|
|
List<DsPartVO> dsPartVOList = dsPartEntityList.stream() |
|
|
|
.map(entity -> { |
|
|
|
.map(entity -> { |
|
|
|
DsPartVO vo = new DsPartVO(); |
|
|
|
DsPartVO vo = new DsPartVO(); |
|
|
|
@ -881,6 +879,11 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas |
|
|
|
.getName(); |
|
|
|
.getName(); |
|
|
|
vo.setUpdateUserStr(userName); |
|
|
|
vo.setUpdateUserStr(userName); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 处理子件数量
|
|
|
|
|
|
|
|
DsPartRelationEntity dsPartRelationEntity = partRelationService.selectByPartCodeAndSubCode(finalPartEntity.getPartCode(), vo.getPartCode()); |
|
|
|
|
|
|
|
if(null != dsPartRelationEntity){ |
|
|
|
|
|
|
|
vo.setQuota(dsPartRelationEntity.getQuota()); |
|
|
|
|
|
|
|
} |
|
|
|
return vo; |
|
|
|
return vo; |
|
|
|
}) |
|
|
|
}) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|