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

feat(检验作業): 調整檢驗作業保存邏輯

Browse Source 
refs: #14407
This commit is contained in:
YiLiLin 2023-08-08 14:25:38 +08:00
parent ad82a7d6ab
commit f9b64309b6
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java
View File

@ -187,8 +187,11 @@ public class QmsInspecDetailServiceImpl extends ServiceImpl<QmsInspecDetailMappe
value = k; value = k;
} }
BigDecimal result = new BigDecimal((String) objectMap.get(value)); String resultValue = (String) objectMap.get(value);
inspecResult.setResult(result); if (StrUtil.isNotBlank(resultValue)) {
BigDecimal result = new BigDecimal(resultValue);
inspecResult.setResult(result);
}
inspecResultList.add(inspecResult); inspecResultList.add(inspecResult);
if ("0".equals(itemType)) { if ("0".equals(itemType)) {
@ -235,10 +238,20 @@ public class QmsInspecDetailServiceImpl extends ServiceImpl<QmsInspecDetailMappe
private void remove(String inspecDetailBo) { private void remove(String inspecDetailBo) {
qmsInspecSnService.remove(Wrappers.lambdaQuery(QmsInspecSn.class) qmsInspecSnService.remove(Wrappers.lambdaQuery(QmsInspecSn.class)
.eq(QmsInspecSn::getInspecDetailBo, inspecDetailBo)); .eq(QmsInspecSn::getInspecDetailBo, inspecDetailBo));
qmsInspecResultService.remove(Wrappers.lambdaQuery(QmsInspecResult.class)
.eq(QmsInspecResult::getInspecDetailBo, inspecDetailBo)); List<String> resultSidList = qmsInspecResultService.list(Wrappers.lambdaQuery(QmsInspecResult.class)
.eq(QmsInspecResult::getInspecDetailBo, inspecDetailBo))
.stream()
.map(QmsInspecResult::getSid)
.collect(Collectors.toList());
if (ListUtils.isNotEmpty(resultSidList)) {
qmsInspecResultService.removeBatchByIds(resultSidList);
qmsInspecResultNccodeService.remove(Wrappers.lambdaQuery(QmsInspecResultNccode.class)
.in(QmsInspecResultNccode::getInspecResultSid, resultSidList));
}
qmsInspecFactorService.remove(Wrappers.lambdaQuery(QmsInspecFactor.class) qmsInspecFactorService.remove(Wrappers.lambdaQuery(QmsInspecFactor.class)
.eq(QmsInspecFactor::getInspecDetailBo, inspecDetailBo)); .eq(QmsInspecFactor::getInspecDetailBo, inspecDetailBo));
} }
private void updateJobStatus(String inspecJobBo) { private void updateJobStatus(String inspecJobBo) {