From 4bcae0d8395c1b646168e17f68b1655042898687 Mon Sep 17 00:00:00 2001
From: YiLiLin <Yili_Lin@semi-tech.com>
Date: Wed, 6 Dec 2023 15:04:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B6=E8=B2=A8=E7=99=BB=E8=A8=98?=
 =?UTF-8?q?=E4=BD=9C=E6=A5=AD-IQC=E6=AA=A2=E9=A9=97=E4=BB=BB=E5=8B=99?=
 =?UTF-8?q?=E6=89=8B=E5=8B=95=E9=97=9C=E9=96=89=E6=AA=A2=E9=A9=97=E5=96=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B6=E8=B2=A8=E5=96=AE=E7=9A=84=E6=AA=A2=E9=A9=97?=
 =?UTF-8?q?=E7=B5=90=E6=9E=9C=E6=9C=89=E8=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs: #21264
---
 .../iep/qms/service/impl/QmsInspecJobServiceImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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