From cce14313756b5ff4f01c3f8395ae26964f929843 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 15 Jan 2024 10:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QcCheckTaskProduceServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index 9e788741..6c9e95f1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -1,5 +1,6 @@ package com.op.quality.service.impl; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -215,15 +216,16 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } } /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); List defectList = qcCheckTaskProduce.getDefects(); - if (CollectionUtils.isEmpty(defectList)) { - return 0; - } else { + if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { - defect.setBelongTo(beLongId); + defect.setBelongTo(beLongId); qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()); } } + qcCheckTaskProduce.setNoOkQuality(noOkQuality); /**qc_check_task**/ qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); @@ -267,17 +269,19 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); /** 不良品数据修改 **/ + BigDecimal noOkQuality = new BigDecimal(0); List defectList = qcCheckTaskProduce.getDefects(); - if (CollectionUtils.isEmpty(defectList)) { - return 0; - } else { - String belongTo = qcCheckTaskProduce.getRecordId(); + String belongTo = qcCheckTaskProduce.getRecordId(); + //不是空执行下一步，空不做操作 + if (!CollectionUtils.isEmpty(defectList)) { qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(belongTo); qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()); } } + qcCheckTaskProduce.setNoOkQuality(noOkQuality); return qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); }