From 383ac46e528590e0d75ddebd07c4f0c46ee29b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 21 Aug 2024 09:24:18 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=E4=B8=8D=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=99=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E5=88=86=E7=B1=BBmapper=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=99=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E6=A3=80=E9=AA=8C=E5=8D=95=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E3=80=81=E5=B7=A5=E5=BA=8F=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=B8=8D=E5=90=88=E6=A0=BC=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityManufacturingUnqualifiedClass.java | 11 ++++++++++ ...tyManufacturingUnqualifiedClassMapper.java | 6 ++++++ ...ityManufacturingUnqualifiedClassMapper.xml | 21 ++++++++++++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java index c72f1e40..eb09a093 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java @@ -22,6 +22,9 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity @Excel(name = "制程检验单号") private String manufacturingCheckoutCode; +// 料号 + private String materialNo; + /** 制程工序编号 */ @Excel(name = "制程工序编号") private String manufacturingProcessCode; @@ -105,6 +108,14 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity this.manufacturingCheckoutCode = manufacturingCheckoutCode; } + public String getMaterialNo() { + return materialNo; + } + + public void setMaterialNo(String materialNo) { + this.materialNo = materialNo; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingUnqualifiedClassMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingUnqualifiedClassMapper.java index 8c367481..6a7a7f4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingUnqualifiedClassMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingUnqualifiedClassMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.quality.mapper; import java.util.List; +import java.util.Map; + import com.ruoyi.quality.domain.QualityManufacturingUnqualifiedClass; /** @@ -74,4 +76,8 @@ public interface QualityManufacturingUnqualifiedClassMapper * @return 结果 */ public int restoreQualityManufacturingUnqualifiedClassById(Long manufacturingUnqualifiedClassId); + +// 根据制程检验单号、料号、检验工序号查询不合格分类列表 + List selectCheckoutUnqualifiedClassByCodes(Map codes); } + diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml index 9db27cfe..833e65a6 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select manufacturing_unqualified_class_id, manufacturing_checkout_code, manufacturing_process_code, manufacturing_process_name, process_bad_classification, process_bad_grade, process_bad_num, remark, create_by, create_time, update_by, update_time from quality_manufacturing_unqualified_class + select manufacturing_unqualified_class_id, manufacturing_checkout_code, manufacturing_process_code, manufacturing_process_name, process_bad_classification, process_bad_grade, process_bad_num, remark, create_by, create_time, update_by, update_time, material_no from quality_manufacturing_unqualified_class + + + + manufacturing_checkout_code = #{manufacturingCheckoutCode} + + + and material_no = #{materialNo} + + + and manufacturing_process_code = #{manufacturingProcessCode} + + + + \ No newline at end of file