From 6624eb29926985c8428ea922117c081ce8428374 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Dec 2023 15:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/domain/QcCheckTaskDefect.java | 170 ++++++++++++++++++ .../op/quality/domain/QcCheckTaskIncome.java | 19 +- .../op/quality/domain/QcCheckTaskProduce.java | 25 ++- .../mapper/QcCheckTaskIncomeMapper.java | 9 +- .../op/quality/service/QcProCheckService.java | 2 +- .../impl/QcCheckTaskIncomeServiceImpl.java | 29 ++- .../service/impl/QcProCheckServiceImpl.java | 14 +- .../quality/QcCheckTaskIncomeMapper.xml | 25 +++ 8 files changed, 258 insertions(+), 35 deletions(-) create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java new file mode 100644 index 00000000..4c4bbd2c --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java @@ -0,0 +1,170 @@ +package com.op.quality.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 来料检验任务--不良数量对象 qc_check_task_defect + * + * @author Open Platform + * @date 2023-12-27 + */ +public class QcCheckTaskDefect extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 不良分类编码 */ + @Excel(name = "不良分类编码") + private String defectCode; + + /** 不良分类名称 */ + @Excel(name = "不良分类名称") + private String defectSubclass; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + /** 检验任务id */ + @Excel(name = "检验任务id") + private String belongTo; + + /** 合格数量 */ + @Excel(name = "合格数量") + private BigDecimal okQuality; + + /** 不合格数量 */ + @Excel(name = "不合格数量") + private BigDecimal noOkQuality; + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } + + public String getDefectCode() { + return defectCode; + } + public void setDefectSubclass(String defectSubclass) { + this.defectSubclass = defectSubclass; + } + + public String getDefectSubclass() { + return defectSubclass; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setBelongTo(String belongTo) { + this.belongTo = belongTo; + } + + public String getBelongTo() { + return belongTo; + } + public void setOkQuality(BigDecimal okQuality) { + this.okQuality = okQuality; + } + + public BigDecimal getOkQuality() { + return okQuality; + } + + public BigDecimal getNoOkQuality() { + return noOkQuality; + } + + public void setNoOkQuality(BigDecimal noOkQuality) { + this.noOkQuality = noOkQuality; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("defectCode", getDefectCode()) + .append("defectSubclass", getDefectSubclass()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .append("belongTo", getBelongTo()) + .append("okQuality", getOkQuality()) + .append("nookQuality", getNoOkQuality()) + .toString(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 02048905..c67fd89b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -119,7 +119,7 @@ public class QcCheckTaskIncome extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; - + private String orderType; private String incomeTimeStart; private String incomeTimeEnd; private String checkTimeStart; @@ -130,12 +130,29 @@ public class QcCheckTaskIncome extends BaseEntity { private String batchCode; private String batchId; private List qcCheckTaskDetails; + private List defects; private BigDecimal sampleQuality; private BigDecimal aNoOkquality; private BigDecimal bNoOkquality; private BigDecimal cNoOkquality; + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + 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/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index df7d7516..47445f58 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -128,14 +128,7 @@ public class QcCheckTaskProduce extends BaseEntity { private String typeCode; private String checkType; private String workorderCode; - - public String getWorkorderCode() { - return workorderCode; - } - - public void setWorkorderCode(String workorderCode) { - this.workorderCode = workorderCode; - } + private String orderType; @Excel(name = "抽样数量") private BigDecimal sampleQuality; @@ -152,6 +145,22 @@ public class QcCheckTaskProduce extends BaseEntity { @Excel(name = "C类不合格数量") private BigDecimal cNoOkquality; + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getWorkorderCode() { + return workorderCode; + } + + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } + public BigDecimal getaNoOkquality() { return aNoOkquality; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index 8ca91408..aadd15b1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -2,10 +2,7 @@ package com.op.quality.mapper; import java.util.List; -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcCheckTaskIncome; -import com.op.quality.domain.QcSupplier; +import com.op.quality.domain.*; import com.op.system.api.domain.SysDictData; import com.op.system.api.domain.SysUser; import com.op.system.api.domain.quality.QcUserMaterialDTO; @@ -93,4 +90,8 @@ public interface QcCheckTaskIncomeMapper { List getUserByMaterial(String materialCode); int addCheckUsers(@Param("list") List users); + + int addQcCheckTaskDefects(@Param("list") List defects); + + List getCkeckDefectList(QcCheckTaskDetail qcCheckTaskDetail); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java index ca35706f..8619fd2b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java @@ -34,7 +34,7 @@ public interface QcProCheckService { List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome); - List getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail); + QcCheckTaskIncome getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail); List getQcUnitList(SysDictData sysDictData); 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 34a9b895..10f2870c 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 @@ -476,22 +476,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTask.setUpdateTime(nowTime); qcCheckTask.setCheckTime(nowTime); qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格 + BigDecimal noOkQquality = new BigDecimal("0"); - if(qcCheckTaskIncome.getaNoOkquality()!=null){ - noOkQquality = noOkQquality.add(qcCheckTaskIncome.getaNoOkquality()); - qcCheckTask.setaNoOkquality(qcCheckTaskIncome.getaNoOkquality()); - } - if(qcCheckTaskIncome.getbNoOkquality()!=null){ - noOkQquality = noOkQquality.add(qcCheckTaskIncome.getbNoOkquality()); - qcCheckTask.setbNoOkquality(qcCheckTaskIncome.getbNoOkquality()); - } - if(qcCheckTaskIncome.getcNoOkquality()!=null){ - noOkQquality = noOkQquality.add(qcCheckTaskIncome.getcNoOkquality()); - qcCheckTask.setcNoOkquality(qcCheckTaskIncome.getcNoOkquality()); - } - if(qcCheckTask.getNoOkQuality()==null){ - qcCheckTask.setNoOkQuality(noOkQquality); + List defects = qcCheckTaskIncome.getDefects(); + for(QcCheckTaskDefect defect:defects){ + defect.setRecordId(IdUtils.fastSimpleUUID()); + defect.setCreateTime(nowTime); + defect.setCreateBy(updateBy); + defect.setFactoryCode(factoryCode); + noOkQquality = noOkQquality.add(defect.getNoOkQuality()); } + qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 + qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); /**qc_check_task**/ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); @@ -500,10 +496,13 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { for(QcCheckTaskDetail detail:details){ detail.setUpdateTime(nowTime); } - n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); logger.info("更新qc_check_task_detail:"+n); + /**qc_check_task_defect**/ + n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects); + logger.info("qc_check_task_defect:"+n); + if("material".equals(qcCheckTaskIncome.getTypeCode())){ qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 562c9d23..b9a2a1c6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -8,10 +8,7 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcCheckTaskIncome; -import com.op.quality.domain.QcCheckTypeProject; -import com.op.quality.domain.QcProCheck; +import com.op.quality.domain.*; import com.op.quality.mapper.QcCheckTaskIncomeMapper; import com.op.quality.mapper.QcProCheckMapper; import com.op.quality.service.QcProCheckService; @@ -123,9 +120,14 @@ public class QcProCheckServiceImpl implements QcProCheckService { } @Override - public List getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail) { + public QcCheckTaskIncome getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail) { DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode()); - return qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + QcCheckTaskIncome dto = new QcCheckTaskIncome(); + List qcCheckTaskDetails =qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + dto.setQcCheckTaskDetails(qcCheckTaskDetails); + List defects =qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail); + dto.setDefects(defects); + return dto; } @Override 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 8d8416cc..386a4340 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 @@ -320,6 +320,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name userName from qc_user_material where material_code = #{materialCode} + insert into qc_check_task_user( record_id,belong_to,check_no, @@ -334,4 +343,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + insert into qc_check_task_defect( + record_id,belong_to, + defect_code,defect_subclass, + noOk_quality, + create_by,create_time,factory_code + ) values + + ( + #{item.recordId},#{item.belongTo}, + #{item.defectCode},#{item.defectSubclass}, + #{item.noOkQuality}, + #{item.createBy},#{item.createTime},#{item.factoryCode} + ) + +