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

fix: 收貨登記作業-IQC檢驗任務手動關閉檢驗單，收貨單的檢驗結果有誤

Browse Source 
refs: #21264
This commit is contained in:
YiLiLin 2023-12-06 15:04:08 +08:00
parent 197d4a9b9d
commit 4bcae0d839
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,8 +290,16 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
String remark = inspecJob.getRemark(); String remark = inspecJob.getRemark();
String inspecType = inspecJob.getInspecType(); String inspecType = inspecJob.getInspecType();
String targetBo = inspecJob.getTargetBo(); String targetBo = inspecJob.getTargetBo();
BigDecimal populationQty = inspecJob.getPopulationQty();
BigDecimal destructiveQty = inspecJob.getDestructiveQty(); BigDecimal destructiveQty = inspecJob.getDestructiveQty();
if (ObjectUtil.isNull(destructiveQty)) {
destructiveQty = BigDecimal.ZERO;
}
BigDecimal testSampleQty = inspecJob.getTestsampleQty(); BigDecimal testSampleQty = inspecJob.getTestsampleQty();
if (ObjectUtil.isNull(testSampleQty)) {
testSampleQty = BigDecimal.ZERO;
}
BigDecimal returnQty = populationQty.subtract(destructiveQty).subtract(testSampleQty);
update(Wrappers.lambdaUpdate(QmsInspecJob.class) update(Wrappers.lambdaUpdate(QmsInspecJob.class)
.set(QmsInspecJob::getStatus, "4") .set(QmsInspecJob::getStatus, "4")
@ -300,10 +308,11 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
.set(QmsInspecJob::getCompleteRemark, remark) .set(QmsInspecJob::getCompleteRemark, remark)
.set(QmsInspecJob::getDestructiveQty, destructiveQty) .set(QmsInspecJob::getDestructiveQty, destructiveQty)
.set(QmsInspecJob::getTestsampleQty, testSampleQty) .set(QmsInspecJob::getTestsampleQty, testSampleQty)
.set("1".equals(inspecType), QmsInspecJob::getReturnQty, returnQty)
.eq(QmsInspecJob::getHandle, inspecJobBo)); .eq(QmsInspecJob::getHandle, inspecJobBo));
if ("1".equals(inspecType)) { if ("1".equals(inspecType)) {
remoteWmsReceiptDetailService.updateInspecResult(targetBo, "1"); remoteWmsReceiptDetailService.updateInspecResult(targetBo, "0");
} }
} }