mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(IQC檢驗任務):檢驗單為新建時，檢驗結果應顯示空，不應預設NG

Browse Source 
1.調整問題

refs: #17411
This commit is contained in:
Paul 2023-10-02 15:06:50 +08:00
parent 630a6ee4a7
commit 5b8c310455
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
View File

@ -137,8 +137,10 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
IPage<QmsInspecJobDTO> response = baseMapper.selectIQC(page, dto);
response.getRecords().forEach(qmsInspecJobDTO -> {
List<QmsInspecDetailDTO> 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<QmsInspecJobMapper, Qms
}
updateDetailResult(detailBo, detail.getResult(), String.join("|", oocRemarkList));
}
update(Wrappers.lambdaUpdate(QmsInspecJob.class)
.set(QmsInspecJob::getResult, hasNG ? NG : OK)
.eq(QmsInspecJob::getHandle, jobBo));
remoteWmsReceiptDetailService.updateInspecResult(qmsInspecJob.getTargetBo(), hasNG ? NG : OK);
}