From 9d860f93318914c2edea0ed02216c9b8c1bcb22b Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 18 Jan 2024 13:46:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E4=B8=8D=E8=89=AF=E5=93=81=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/QcCheckTaskWarehousing.java | 11 ++++++ .../impl/QcCheckTaskIncomeServiceImpl.java | 36 +++++++++++++++++++ .../QcCheckTaskWarehousingServiceImpl.java | 35 ++++++++++++++++++ .../quality/QcCheckTaskIncomeMapper.xml | 5 +-- .../quality/QcCheckTaskWarehousingMapper.xml | 10 +++--- 5 files changed, 89 insertions(+), 8 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java index 8d27e183..00e2f5ed 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java @@ -2,6 +2,8 @@ package com.op.quality.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -112,6 +114,7 @@ public class QcCheckTaskWarehousing extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + private List defects; private String incomeTimeStart; private String incomeTimeEnd; @@ -123,6 +126,14 @@ public class QcCheckTaskWarehousing extends BaseEntity { private BigDecimal noOkQuality; private BigDecimal sampleQuality; + public List getDefects() { + return defects; + } + + public void setDefects(List defects) { + this.defects = defects; + } + public BigDecimal getSampleQuality() { return sampleQuality; } 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 e799f5dd..3f0e04bc 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 @@ -14,6 +14,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; import com.op.quality.mapper.*; +import com.op.quality.service.IQcCheckTaskDefectService; import com.op.quality.service.IQcCheckTaskProduceService; import com.op.quality.service.IQcCheckTaskUserService; import com.op.system.api.RemoteOpenService; @@ -73,6 +74,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Autowired private QMSFileMapper qmsFileMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; + /** * 查询来料检验 * @@ -91,6 +95,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { qcCheckTaskIncome.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + qcCheckTaskIncome.setDefects(qcCheckTaskDefectList); + } return qcCheckTaskIncome; } @@ -210,6 +219,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { int m=qcCheckTaskIncomeMapper.addCheckUsers(users); logger.info("检查人新增"+m+"成功"); } + /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskIncome.getDefects(); + if (!CollectionUtils.isEmpty(defectList)) { + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(beLongId); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); + } + } + qcCheckTaskIncome.setNoOkQuality(noOkQuality); + qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); /**qc_check_task_detail**/ @@ -252,6 +273,21 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskUserList.add(qcCheckTaskUser); } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); + /** 不良品数据修改 **/ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskIncome.getDefects(); + String belongTo = qcCheckTaskIncome.getRecordId(); + //不是空执行下一步，空不做操作 + if (!CollectionUtils.isEmpty(defectList)) { + qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(belongTo); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); + } + } + qcCheckTaskIncome.setNoOkQuality(noOkQuality); + return qcCheckTaskIncomeMapper.updateQcCheckTaskIncome(qcCheckTaskIncome); } 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 9f4f7f22..d1af1d7a 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 @@ -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; @@ -13,6 +14,7 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; import com.op.quality.mapper.*; +import com.op.quality.service.IQcCheckTaskDefectService; import com.op.quality.service.IQcCheckTaskUserService; import com.op.system.api.domain.quality.QcUserMaterialDTO; import org.slf4j.Logger; @@ -52,6 +54,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin private IQcCheckTaskUserService qcCheckTaskUserService; @Autowired private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; /** * 查询成品入库检验任务 @@ -71,6 +75,11 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { checkTaskWarehousing.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + checkTaskWarehousing.setDefects(qcCheckTaskDefectList); + } return checkTaskWarehousing; } @@ -188,6 +197,18 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin int m=qcCheckTaskIncomeMapper.addCheckUsers(users); logger.info("检查人新增"+m+"成功"); } + /** 不良品数据插入 */ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskWarehousing.getDefects(); + if (!CollectionUtils.isEmpty(defectList)) { + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(beLongId); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); + } + } + qcCheckTaskWarehousing.setNoOkQuality(noOkQuality); + /**qc_check_task**/ int n = qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing); logger.info("qc_check_task:"+n+"成功"); @@ -231,6 +252,20 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin qcCheckTaskUserList.add(qcCheckTaskUser); } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); + /** 不良品数据修改 **/ + BigDecimal noOkQuality = new BigDecimal(0); + List defectList = qcCheckTaskWarehousing.getDefects(); + String belongTo = qcCheckTaskWarehousing.getRecordId(); + //不是空执行下一步，空不做操作 + if (!CollectionUtils.isEmpty(defectList)) { + qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(belongTo); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); + } + } + qcCheckTaskWarehousing.setNoOkQuality(noOkQuality); return qcCheckTaskWarehousingMapper.updateQcCheckTaskWarehousing(qcCheckTaskWarehousing); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 6b657b7d..2c46086e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, - create_time, update_by, update_time, factory_code, del_flag , check_type,noOk_quality + create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality from qc_check_task @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality, - qct.type_code + qct.sample_quality, qct.type_code from qc_check_task qct and qct.check_no = #{checkNo} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index 9d16ea66..5614c804 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, create_by, - create_time, update_by, update_time, check_type + create_time, update_by, update_time, check_type, sample_quality, noOk_quality from qc_check_task @@ -50,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, - qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, - q.type_code + qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, qct.sample_quality, + qct.noOk_quality, q.type_code from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -202,9 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag = #{delFlag}, sample_quality = #{sampleQuality}, noOk_quality = #{noOkQuality}, - aNoOkquality = #{aNoOkquality}, - bNoOkquality = #{bNoOkquality}, - cNoOkquality = #{cNoOkquality}, where record_id = #{recordId}