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"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityCheck"    column="quantity_check"    />
         <result property="quantityUnqualified"    column="quantity_unqualified"    />
         <result property="quantityQualified"    column="quantity_qualified"    />
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcIpqcVo">
-        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
     </sql>
 
     <select id="selectQcIpqcList" parameterType="QcIpqc" resultMap="QcIpqcResult">
@@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+             <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityCheck != null "> and quantity_check = #{quantityCheck}</if>
             <if test="quantityUnqualified != null "> and quantity_unqualified = #{quantityUnqualified}</if>
             <if test="quantityQualified != null "> and quantity_qualified = #{quantityQualified}</if>
@@ -160,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityCheck != null">quantity_check,</if>
             <if test="quantityUnqualified != null">quantity_unqualified,</if>
             <if test="quantityQualified != null">quantity_qualified,</if>
@@ -209,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityCheck != null">#{quantityCheck},</if>
             <if test="quantityUnqualified != null">#{quantityUnqualified},</if>
             <if test="quantityQualified != null">#{quantityQualified},</if>
@@ -262,6 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityCheck != null">quantity_check = #{quantityCheck},</if>
             <if test="quantityUnqualified != null">quantity_unqualified = #{quantityUnqualified},</if>
             <if test="quantityQualified != null">quantity_qualified = #{quantityQualified},</if>
diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml
index 268eeaf..c8dcf56 100644
--- a/ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityMinCheck"    column="quantity_min_check"    />
         <result property="quantityMaxUnqualified"    column="quantity_max_unqualified"    />
         <result property="quantityRecived"    column="quantity_recived"    />
@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcIqcVo">
-        select iqc_id, iqc_code, iqc_name, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_qualified,quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
+        select iqc_id, iqc_code, iqc_name, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_qualified,quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
     </sql>
 
     <select id="selectQcIqcList" parameterType="QcIqc" resultMap="QcIqcResult">
@@ -76,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+             <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityMinCheck != null "> and quantity_min_check = #{quantityMinCheck}</if>
             <if test="quantityMaxUnqualified != null "> and quantity_max_unqualified = #{quantityMaxUnqualified}</if>
             <if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
@@ -128,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityMinCheck != null">quantity_min_check,</if>
             <if test="quantityMaxUnqualified != null">quantity_max_unqualified,</if>
             <if test="quantityRecived != null">quantity_recived,</if>
@@ -173,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityMinCheck != null">#{quantityMinCheck},</if>
             <if test="quantityMaxUnqualified != null">#{quantityMaxUnqualified},</if>
             <if test="quantityRecived != null">#{quantityRecived},</if>
@@ -243,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityMinCheck != null">quantity_min_check = #{quantityMinCheck},</if>
             <if test="quantityMaxUnqualified != null">quantity_max_unqualified = #{quantityMaxUnqualified},</if>
             <if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>