From bf3d142ef835832b62e0e8d924ea23637b7a0bdb Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Sat, 8 Feb 2025 18:08:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=9D=A5=E6=96=99=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=92=8C=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ktg/mes/qc/domain/QcIpqc.java | 14 +++++++++++++- .../src/main/java/com/ktg/mes/qc/domain/QcIqc.java | 14 +++++++++++++- .../src/main/resources/mapper/qc/QcIpqcMapper.xml | 7 ++++++- .../src/main/resources/mapper/qc/QcIqcMapper.xml | 7 ++++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java index 79108ae..ef5dd28 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java @@ -115,6 +115,9 @@ public class QcIpqc extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 检测数量 */ @Excel(name = "检测数量") private BigDecimal quantityCheck; @@ -180,7 +183,15 @@ public class QcIpqc extends BaseEntity /** 预留字段4 */ private Long attr4; - public void setIpqcId(Long ipqcId) + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public void setIpqcId(Long ipqcId) { this.ipqcId = ipqcId; } @@ -590,6 +601,7 @@ public class QcIpqc extends BaseEntity .append("itemName", getItemName()) .append("specification", getSpecification()) .append("unitOfMeasure", getUnitOfMeasure()) + .append("unitName=", getUnitName()) .append("quantityCheck", getQuantityCheck()) .append("quantityUnqualified", getQuantityUnqualified()) .append("quantityQualified", getQuantityQualified()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java index 864f015..8e131c1 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java @@ -84,6 +84,9 @@ public class QcIqc extends BaseEntity @Excel(name = "单位") private String unitOfMeasure; + /** 单位名称 */ + private String unitName; + /** 最低检测数 */ @Excel(name = "最低检测数") private BigDecimal quantityMinCheck; @@ -170,7 +173,15 @@ public class QcIqc extends BaseEntity /** 预留字段4 */ private Long attr4; - public void setIqcId(Long iqcId) + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public void setIqcId(Long iqcId) { this.iqcId = iqcId; } @@ -544,6 +555,7 @@ public class QcIqc extends BaseEntity ", itemName='" + itemName + '\'' + ", specification='" + specification + '\'' + ", unitOfMeasure='" + unitOfMeasure + '\'' + + ", unitName='" + unitName + "\'" + ", quantityMinCheck=" + quantityMinCheck + ", quantityMaxUnqualified=" + quantityMaxUnqualified + ", quantityRecived=" + quantityRecived + diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml index 650262a..b54ca55 100644 --- a/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml +++ b/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml @@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select ipqc_id, ipqc_code, ipqc_name, ipqc_type, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, item_id, item_code, item_name, specification, unit_of_measure, quantity_check, quantity_unqualified, quantity_qualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_ipqc + select ipqc_id, ipqc_code, ipqc_name, ipqc_type, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_check, quantity_unqualified, quantity_qualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_ipqc @@ -76,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and item_name like concat('%', #{itemName}, '%') and specification = #{specification} and unit_of_measure = #{unitOfMeasure} + and unit_name = #{unitName} and quantity_min_check = #{quantityMinCheck} and quantity_max_unqualified = #{quantityMaxUnqualified} and quantity_recived = #{quantityRecived} @@ -128,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name, specification, unit_of_measure, + unit_name, quantity_min_check, quantity_max_unqualified, quantity_recived, @@ -173,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{itemName}, #{specification}, #{unitOfMeasure}, + #{unitName}, #{quantityMinCheck}, #{quantityMaxUnqualified}, #{quantityRecived}, @@ -243,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" item_name = #{itemName}, specification = #{specification}, unit_of_measure = #{unitOfMeasure}, + unit_name = #{unitName}, quantity_min_check = #{quantityMinCheck}, quantity_max_unqualified = #{quantityMaxUnqualified}, quantity_recived = #{quantityRecived},