From 56433634b489536b4612b952a7ed57a6cefe00bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Fri, 20 Oct 2023 13:15:52 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-20=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/SubDetailValues.java | 12 +++++++-
 src/main/resources/mapper/pms/QcMapper.xml    | 30 +++++++++++--------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/SubDetailValues.java b/src/main/java/com/xujie/sys/modules/pms/data/SubDetailValues.java
index 852b9efb..970c477a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/SubDetailValues.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/SubDetailValues.java
@@ -10,12 +10,22 @@ public class SubDetailValues {
     private String inspectionNo;
     // 项目编码
     private String itemNo;
-    // 抽样位置
+    // 抽样位置A
     private String samplingLocation;
     // 值
     private String subDetailValue;
     // 是否提交
     private String isSubmit;
+    // 抽样位置B
+    private String samplingLocationB;
+
+    public String getSamplingLocationB() {
+        return samplingLocationB;
+    }
+
+    public void setSamplingLocationB(String samplingLocationB) {
+        this.samplingLocationB = samplingLocationB;
+    }
 
     public String getSite() {
         return site;
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 60c6dc07..90b4397c 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1610,13 +1610,13 @@
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </delete>
 
-    <!-- 新增子明细信息 -->
+    <!-- 新增FAI子明细信息 -->
     <insert id="saveFAISubDetailed">
         INSERT INTO qc_fai_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB})
         </foreach>
     </insert>
 
@@ -1626,7 +1626,8 @@
             site,
             sub_detail_value,
             sampling_location,
-            is_submit
+            is_submit,
+            sampling_location_b
         FROM qc_fai_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </select>
@@ -1864,10 +1865,10 @@
     <!-- 新增IPQC子明细信息 -->
     <insert id="saveIPQCSubDetailed">
         INSERT INTO qc_ipqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB})
         </foreach>
     </insert>
 
@@ -1875,7 +1876,8 @@
     <select id="selectIPQCSubDetailedRecord" parameterType="SubDetailValues" resultType="SubDetailValues">
         SELECT sub_detail_value,
                sampling_location,
-               is_submit
+               is_submit,
+               sampling_location_b
         FROM qc_ipqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </select>
@@ -2077,7 +2079,8 @@
             site,
             sub_detail_value,
             sampling_location,
-            is_submit
+            is_submit,
+            sampling_location_b
         FROM qc_iqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </select>
@@ -2136,10 +2139,10 @@
     <!-- 新增IQC子明细信息 -->
     <insert id="saveIQCSubDetailed">
         INSERT INTO qc_iqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB})
         </foreach>
     </insert>
 
@@ -2434,10 +2437,10 @@
     <!-- 新增子明细信息 -->
     <insert id="saveFQCSubDetailed">
         INSERT INTO qc_fqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site})
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB})
         </foreach>
     </insert>
 
@@ -2447,7 +2450,8 @@
             site,
             sub_detail_value,
             sampling_location,
-            is_submit
+            is_submit,
+            sampling_location_b
         FROM qc_fqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site}
     </select>