From 57fb543889e383d4039c13e137559e9d013a5e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Tue, 17 Oct 2023 19:32:31 +0800 Subject: [PATCH] =?UTF-8?q?2023-10-17=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/service/Impl/QcServiceImpl.java | 16 +++++++++++----- src/main/resources/mapper/pms/QcMapper.xml | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index ba4b7654..b80ab8e1 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -550,10 +550,14 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void delItemDetails(QcTemplateData data) { - for (QcTemplateData qcData : data.getItemList()){ - qcData.setItemType(data.getItemType()); - qcData.setTemplateId(data.getTemplateId()); - qcMapper.delItemDetails(qcData); + if (data.getItemList() != null && data.getItemList().size() > 0){ // 批量删除 + for (QcTemplateData qcData : data.getItemList()){ + qcData.setItemType(data.getItemType()); + qcData.setTemplateId(data.getTemplateId()); + qcMapper.delItemDetails(qcData); + } + }else { // 单条删除 + qcMapper.delItemDetails(data); } } @@ -2501,6 +2505,7 @@ public class QcServiceImpl implements QcService { qcFAIRecordData.setInspectionNo(recordData.getInspectionNo()); // 检验单号 qcFAIRecordData.setInspectionTypeNo("105"); // 检验类型编码 qcFAIRecordData.setPartDesc(recordData.getPartDesc()); + qcFAIRecordData.setRollQty(recordData.getRollQty()); // 明细记录信息赋值 String partNo = recordData.getPartNo(); String attributeType1 = "A"; @@ -2529,7 +2534,8 @@ public class QcServiceImpl implements QcService { qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); + BigDecimal d = partAttribute.get(0).getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP); + qcFAIRecordData.setSamplingQty(d); } // 获取根据该检验模板下维护的检验项目 diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index c9bc042d..8ed7cc1f 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -933,6 +933,7 @@