From 3486c0046115ca47a030954a507f72ce9937ce52 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Mar 2024 14:17:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?qc=5Fcheck=5Ftask=5Fdefect=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../impl/QcCheckTaskInventoryServiceImpl.java | 2 +- .../impl/QcCheckTaskMarketServiceImpl.java | 2 +- .../impl/QcCheckTaskProduceServiceImpl.java | 2 +- .../QcCheckTaskWarehousingServiceImpl.java | 2 +- .../quality/QcCheckTaskDefectMapper.xml | 33 ++++++++++--------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 4aa0e757..e9e93f60 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -240,7 +240,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java index 93630137..d85479b7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java @@ -183,7 +183,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java index bad68a89..cc823457 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java @@ -181,7 +181,7 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService { if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality()); } } 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 ee0810c1..4b71a0dc 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 @@ -226,7 +226,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index cd6b6578..0d5d4cbb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -205,7 +205,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml index e1b12908..87176d37 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml @@ -132,7 +132,7 @@ From edb80d785a261fb4e1257c867d9d9bf6cbbf6f60 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Mar 2024 14:17:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?qc=5Fcheck=5Ftask=5Fdefect=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckReportProduceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index ce3e22e3..7bceff9d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -273,7 +273,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer /**qc_check_task**/ int n = qcCheckReportIncomeMapper.submitConfirm(qcCheckReportIncome); logger.info("qc_check_task：【二次确认】" + qcCheckReportIncome.getCheckType() + ":" + n); - return n; + return 1; } return 0; }