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");
         }
     }