diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java
index ddd1fcc..e0894cc 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java
@@ -34,6 +34,16 @@ public class QcIndex extends BaseEntity
@Excel(name = "检测工具")
private String qcTool;
+ /**
+ * 检测结果值类型
+ */
+ private String qcResultType;
+
+ /**
+ * 值属性
+ */
+ private String qcResultSpc;
+
/** 预留字段1 */
private String attr1;
@@ -91,7 +101,24 @@ public class QcIndex extends BaseEntity
{
return qcTool;
}
- public void setAttr1(String attr1)
+
+ public String getQcResultType() {
+ return qcResultType;
+ }
+
+ public void setQcResultType(String qcResultType) {
+ this.qcResultType = qcResultType;
+ }
+
+ public String getQcResultSpc() {
+ return qcResultSpc;
+ }
+
+ public void setQcResultSpc(String qcResultSpc) {
+ this.qcResultSpc = qcResultSpc;
+ }
+
+ public void setAttr1(String attr1)
{
this.attr1 = attr1;
}
diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml
index 5f406e8..2b49af3 100644
--- a/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml
@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select index_id, index_code, index_name, index_type, qc_tool, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_index
+ select index_id, index_code, index_name, index_type, qc_tool, qc_result_type,qc_result_spc,remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_index