diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java index b484c89..7744155 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java @@ -137,8 +137,10 @@ public class QmsInspecJobServiceImpl extends ServiceImpl response = baseMapper.selectIQC(page, dto); response.getRecords().forEach(qmsInspecJobDTO -> { List detailList = qmsInspecDetailService.selectAll(qmsInspecJobDTO.getHandle()); - qmsInspecJobDTO.setInspecResult(detailList.stream() - .allMatch(x -> "1".equals(x.getResult())) ? "OK" : "NG"); + if(detailList.stream().noneMatch(x->x.getResult() == null)){ + qmsInspecJobDTO.setInspecResult(detailList.stream() + .allMatch(x -> "1".equals(x.getResult())) ? "OK" : "NG"); + } if (StrUtil.isNotBlank(qmsInspecJobDTO.getReasonCodeBo())) { qmsInspecJobDTO.setReasonCode(HandleBoProcessor.trimHandle(qmsInspecJobDTO.getReasonCodeBo())); } @@ -984,7 +986,9 @@ public class QmsInspecJobServiceImpl extends ServiceImpl