diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index c8c5d247..69b2d485 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -1445,13 +1445,19 @@ public class QcServiceImpl implements QcService {
     @Override
     @Transactional
     public void deleteSamplingProgrammeDetails(QcSamplingInspectionProgrammeData data) {
-        for (QcSamplingInspectionProgrammeData inData : data.getPlanList()){
-            inData.setSamplingProgrammeNo(data.getSamplingProgrammeNo());
-            inData.setSite(data.getSite());
-            inData.setUpdateBy(data.getUpdateBy());
-            qcMapper.deleteSamplingProgrammeDetails(inData);
-            qcMapper.updateSamplingInspectionProgrammeDate(inData);
+        if (data.getPlanList() != null && data.getPlanList().size() > 0) { // 批删
+            for (QcSamplingInspectionProgrammeData inData : data.getPlanList()){
+                inData.setSamplingProgrammeNo(data.getSamplingProgrammeNo());
+                inData.setSite(data.getSite());
+                inData.setUpdateBy(data.getUpdateBy());
+                qcMapper.deleteSamplingProgrammeDetails(inData);
+                qcMapper.updateSamplingInspectionProgrammeDate(inData);
+            }
+        } else { // 单删
+            qcMapper.deleteSamplingProgrammeDetails(data);
+            qcMapper.updateSamplingInspectionProgrammeDate(data);
         }
+
     }
 
 
@@ -1546,7 +1552,7 @@ public class QcServiceImpl implements QcService {
                 faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                 faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                 faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                 // 新增FAI明细记录信息
                 qcMapper.saveFAIDetailedRecord(faiRecordData);
             }
@@ -1619,7 +1625,7 @@ public class QcServiceImpl implements QcService {
                     faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                     faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                     faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                    faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                    faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                     // 新增FAI明细记录信息
                     qcMapper.saveFAIDetailedRecord(faiRecordData);
                 }
@@ -1683,7 +1689,7 @@ public class QcServiceImpl implements QcService {
                         faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                         faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                         faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                        faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                        faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                         // 新增IPQC明细记录信息
                         qcMapper.saveFAIDetailedRecord(faiRecordData);
                     }
@@ -1936,7 +1942,7 @@ public class QcServiceImpl implements QcService {
                 faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                 faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                 faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                 // 新增FQC明细记录信息
                 qcMapper.saveFQCDetailedRecord(faiRecordData);
             }
@@ -2008,7 +2014,7 @@ public class QcServiceImpl implements QcService {
                     faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                     faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                     faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                    faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                    faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                     // 新增FQC明细记录信息
                     qcMapper.saveFQCDetailedRecord(faiRecordData);
                 }
@@ -2072,7 +2078,7 @@ public class QcServiceImpl implements QcService {
                         faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                         faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                         faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                        faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                        faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                         // 新增FQC明细记录信息
                         qcMapper.saveFQCDetailedRecord(faiRecordData);
                     }
@@ -2345,7 +2351,7 @@ public class QcServiceImpl implements QcService {
                 faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                 faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                 faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                 // 新增IPQC明细记录信息
                 qcMapper.saveIPQCDetailedRecord(faiRecordData);
             }
@@ -2417,7 +2423,7 @@ public class QcServiceImpl implements QcService {
                     faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                     faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                     faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                    faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                    faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                     // 新增IPQC明细记录信息
                     qcMapper.saveIPQCDetailedRecord(faiRecordData);
                 }
@@ -2481,7 +2487,7 @@ public class QcServiceImpl implements QcService {
                         faiRecordData.setMaxValue(itemList.get(j).getMaxValue()); // 最大值
                         faiRecordData.setValueType(itemList.get(j).getValueType()); // 检测值类型
                         faiRecordData.setValueTypeDb(itemList.get(j).getValueTypeDb());
-                        faiRecordData.setRollQty(data.getRollQty()); // 送检数量
+                        faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量
                         // 新增IPQC明细记录信息
                         qcMapper.saveIPQCDetailedRecord(faiRecordData);
                     }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index accf7139..60c6dc07 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1227,6 +1227,7 @@
     <!-- 搜索抽样方案中的矩阵 -->
     <select id="searchSamplingProgrammeDetails" parameterType="QcSamplingInspectionProgrammeData" resultType="QcSamplingInspectionProgrammeData">
         SELECT
+            qpp.site,
             qpp.sampling_programme_no,
             qsip.sampling_plan_no,
             qsip.sampling_plan_Desc,
@@ -1284,8 +1285,8 @@
 
     <!-- 新增抽样方案中的矩阵 -->
     <insert id="saveSamplingProgrammeDetails" parameterType="QcSamplingInspectionProgrammeData">
-        INSERT INTO qc_programme_plan (sampling_programme_no, sampling_plan_no)
-        VALUES(#{samplingProgrammeNo}, #{samplingPlanNo})
+        INSERT INTO qc_programme_plan (site, sampling_programme_no, sampling_plan_no)
+        VALUES(#{site}, #{samplingProgrammeNo}, #{samplingPlanNo})
     </insert>
 
     <!-- 更新抽样方案修改时间 -->
@@ -1300,8 +1301,7 @@
     <!-- 删除抽样方案中的矩阵 -->
     <delete id="deleteSamplingProgrammeDetails" parameterType="QcSamplingInspectionProgrammeData">
         DELETE FROM qc_programme_plan
-        WHERE sampling_programme_no = #{samplingProgrammeNo}
-        AND sampling_plan_no = #{samplingPlanNo}
+        WHERE sampling_programme_no = #{samplingProgrammeNo} and sampling_plan_no = #{samplingPlanNo} and site = #{site}
     </delete>
 
     <!-- ================================================= FAI检验维护 ================================================= -->
@@ -1418,8 +1418,8 @@
 
     <!-- 新增FAI明细记录信息 -->
     <insert id="saveFAIDetailedRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_fai_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, roll_qty)
-        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{rollQty,jdbcType=DECIMAL})
+        INSERT INTO qc_fai_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty)
+        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL})
     </insert>
 
     <!-- 查询FAI主记录信息 -->
@@ -1521,7 +1521,7 @@
             item_result,
             is_submit,
             unqualified_quantity,
-            roll_qty
+            sampling_qty
         FROM  qc_fai_detailed_record
         WHERE inspection_no = #{inspectionNo} and site = #{site}
     </select>
@@ -1536,7 +1536,7 @@
             state = #{state},
             inspection_remark = #{inspectionRemark},
             inspector_date = getDate(),
-            roll_qty = #{rollQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
         WHERE site = #{site}
         AND inspection_no = #{inspectionNo}
     </update>
@@ -1546,7 +1546,7 @@
         UPDATE qc_fai_detailed_record
         SET item_result = #{itemResult},
             unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL},
-            roll_qty = #{rollQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </update>
 
@@ -1680,8 +1680,8 @@
 
     <!-- 新增IPQC明细记录信息 -->
     <insert id="saveIPQCDetailedRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, roll_qty)
-        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{rollQty,jdbcType=DECIMAL})
+        INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty)
+        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL})
     </insert>
 
     <!-- 新增IPQC主记录信息 -->
@@ -1787,7 +1787,7 @@
             item_result,
             is_submit,
             unqualified_quantity,
-            roll_qty
+            sampling_qty
         FROM  qc_ipqc_detailed_record
         WHERE inspection_no = #{inspectionNo} and site = #{site}
     </select>
@@ -1820,7 +1820,7 @@
             state = #{state},
             inspection_remark = #{inspectionRemark},
             inspector_date = getDate(),
-            roll_qty = #{rollQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
         WHERE site = #{site} and inspection_no = #{inspectionNo}
     </update>
 
@@ -1829,7 +1829,7 @@
         UPDATE qc_ipqc_detailed_record
         SET item_result = #{itemResult},
             unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL},
-            roll_qty = #{rollQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </update>
 
@@ -2321,8 +2321,8 @@
 
     <!-- 新增FQC明细记录信息 -->
     <insert id="saveFQCDetailedRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_fqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, roll_qty)
-        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{rollQty,jdbcType=DECIMAL})
+        INSERT INTO qc_fqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty)
+        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL})
     </insert>
 
     <!-- 新增FQC主记录信息 -->
@@ -2357,7 +2357,7 @@
             item_result,
             is_submit,
             unqualified_quantity,
-            roll_qty
+            sampling_qty
         FROM  qc_fqc_detailed_record
         WHERE inspection_no = #{inspectionNo} and site = #{site}
     </select>
@@ -2390,7 +2390,7 @@
             state = #{state},
             inspection_remark = #{inspectionRemark},
             inspector_date = getDate(),
-            roll_qty = #{rollQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
         WHERE site = #{site} and inspection_no = #{inspectionNo}
     </update>
 
@@ -2399,7 +2399,7 @@
         UPDATE qc_fqc_detailed_record
         SET item_result = #{itemResult},
             unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL},
-            roll_qty = #{rollQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </update>