diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index a539feb1..bdc35362 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -145,6 +145,26 @@ public class QcFAIRecordData extends QueryPage {
     private String seqNo;
     // 老卷号
     private String batchRollNo;
+    // 物料类别
+    private String spec;
+    // 特殊要求
+    private String specialRequirements;
+
+    public String getSpecialRequirements() {
+        return specialRequirements;
+    }
+
+    public void setSpecialRequirements(String specialRequirements) {
+        this.specialRequirements = specialRequirements;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
 
     public String getBatchRollNo() {
         return batchRollNo;
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index e3cbb195..db9efd07 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -1112,8 +1112,8 @@ public class EamServiceImpl implements EamService {
                                     orderDate = calendar.getTime();
                                     planData.setOrderDate(orderDate);
                                 }
-                            }catch (IOException e){
-                                e.printStackTrace();
+                            } catch (IOException e) {
+                                throw new RuntimeException("日期判断失败!");
                             }
                             compareTo = orderDate.compareTo(endDate);
                         }
@@ -1145,7 +1145,7 @@ public class EamServiceImpl implements EamService {
                                         }
                                         orderDate = calendar.getTime();
                                     }catch (IOException e){
-                                        e.printStackTrace();
+                                        throw new RuntimeException("日期判断失败!");
                                     }
                                 }
                             } else if (month == 2) {
@@ -1163,20 +1163,20 @@ public class EamServiceImpl implements EamService {
                             // 判断是否为工作日
                             try {
                                 Boolean workingDay = HolidayUtils.isWorkingDay(orderDate.getTime());
-                                if (!workingDay){ // 如果是节假日，日期改为下一天
+                                if (!workingDay) { // 如果是节假日，日期改为下一天
                                     calendar.clear();
                                     calendar.setTime(orderDate);
                                     calendar.add(Calendar.DATE,1);
                                     orderDate = calendar.getTime();
                                     planData.setOrderDate(orderDate);
                                 }
-                            }catch (IOException e){
-                                e.printStackTrace();
+                            } catch (IOException e) {
+                                throw new RuntimeException("日期判断失败!");
                             }
                             compareTo = orderDate.compareTo(endDate);
                         }
                     }
-                }else {
+                } else {
                     // 其他情况
                     while (compareTo <= 0){
                         // 获得工单号
@@ -1212,15 +1212,15 @@ public class EamServiceImpl implements EamService {
                         // 判断是否为工作日
                         try {
                             Boolean workingDay = HolidayUtils.isWorkingDay(orderDate.getTime());
-                            if (!workingDay){ // 如果是节假日，日期改为下一天
+                            if (!workingDay) { // 如果是节假日，日期改为下一天
                                 calendar.clear();
                                 calendar.setTime(orderDate);
                                 calendar.add(Calendar.DATE,1);
                                 orderDate = calendar.getTime();
                                 planData.setOrderDate(orderDate);
                             }
-                        }catch (IOException e){
-                            e.printStackTrace();
+                        } catch (IOException e) {
+                            throw new RuntimeException("日期判断失败!");
                         }
                         compareTo = orderDate.compareTo(endDate);
                     }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 62c4aaf1..51a974c4 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1392,8 +1392,8 @@
 
     <!-- 新增FAI主记录信息 -->
     <insert id="saveFAIRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no)
-        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo})
+        INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements)
+        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements})
     </insert>
 
     <!-- 新增FAI明细记录信息 -->
@@ -1431,8 +1431,10 @@
         submit_flag,
         dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
         dbo.qc_get_sku(site, part_no) as sku,
+        dbo.qc_get_spec(site, part_no) as spec,
         seq_no,
-        batch_roll_no
+        batch_roll_no,
+        special_requirements
         FROM qc_fai_record
         <where>
             site = #{query.site}
@@ -1661,8 +1663,8 @@
 
     <!-- 新增IPQC主记录信息 -->
     <insert id="saveIPQCRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no)
-        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo})
+        INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements)
+        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements})
     </insert>
 
     <!-- 查询IPQC主记录信息 -->
@@ -1694,8 +1696,10 @@
         submit_flag,
         dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
         dbo.qc_get_sku(site, part_no) as sku,
+        dbo.qc_get_spec(site, part_no) as spec,
         seq_no,
-        batch_roll_no
+        batch_roll_no,
+        special_requirements
         FROM qc_ipqc_record
         <where>
             site = #{query.site}
@@ -1871,6 +1875,8 @@
         SELECT
             j.part_no,
             j.part_desc,
+            j.spec,
+            j.sku,
             c.operation_desc as operationDesc,
             a.itemno as operationNo
         FROM soscheduledrouting as a
@@ -2247,8 +2253,10 @@
         submit_flag,
         dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
         dbo.qc_get_sku(site, part_no) as sku,
+        dbo.qc_get_spec(site, part_no) as spec,
         seq_no,
-        batch_roll_no
+        batch_roll_no,
+        special_requirements
         FROM qc_fqc_record
         <where>
             site = #{query.site}
@@ -2289,8 +2297,8 @@
 
     <!-- 新增FQC主记录信息 -->
     <insert id="saveFQCRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no)
-        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo})
+        INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements)
+        VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements})
     </insert>
 
     <!-- FQC明细记录查询 -->