Commit 6b9f1069 authored by tianbo's avatar tianbo

充装后复查么有则不合格

parent 47664efb
...@@ -179,13 +179,16 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind ...@@ -179,13 +179,16 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
} }
for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) { for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) {
List<TzCylinderCheckDto> collect = tzCylinderFillingDto.getTzCylinderAfterCheckDtoList().stream().filter(dto -> dto.getResult().equals("0")).collect(Collectors.toList()); if (ValidationUtil.isEmpty(tzCylinderFillingDto.getTzCylinderAfterCheckDtoList())) { // 充装后复查记录没有默认不合格
if (collect.size() != 0) { tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName());
tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName()); } else {
}else { List<TzCylinderCheckDto> collect = tzCylinderFillingDto.getTzCylinderAfterCheckDtoList().stream().filter(dto -> dto.getResult().equals("0")).collect(Collectors.toList());
tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.HEGE.getName()); if (collect.size() != 0) {
} tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName());
} else {
tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.HEGE.getName());
}
}
} }
return new TzCylinderTraceDto(tzCylinderProduceDto, tzCylinderInfoDto, tzCylinderTagsDto, return new TzCylinderTraceDto(tzCylinderProduceDto, tzCylinderInfoDto, tzCylinderTagsDto,
tzCylinderInspectionDtoList, tzCylinderFillingDtoList); tzCylinderInspectionDtoList, tzCylinderFillingDtoList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment