检验中添加送检数量校验，sub添加新字段

cclqms-java/src/main/java/com/gaotao/modules/pms/data/SubDetailValues.java

@@ -75,6 +75,9 @@ public class SubDetailValues extends QueryPage {
     /** 不良数量（实测值 A~E 不合格个数） */
     private Integer defectQty;
 
+    /** 标签号 */
+    private String rollNo;
+
     /** 创建时间 */
     private String createTime;
 
@@ -326,4 +329,12 @@ public class SubDetailValues extends QueryPage {
     public void setDefectQty(Integer defectQty) {
         this.defectQty = defectQty;
     }
+
+    public String getRollNo() {
+        return rollNo;
+    }
+
+    public void setRollNo(String rollNo) {
+        this.rollNo = rollNo;
+    }
 }

cclqms-java/src/main/resources/mapper/pms/QcMapper.xml

@@ -875,10 +875,10 @@
     <!-- 新增IPQC子明细信息 -->
     <insert id="saveIPQCSubDetailed">
         INSERT INTO qc_ipqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, create_time)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, roll_no, create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, getDate())
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, #{item.rollNo}, getDate())
         </foreach>
     </insert>
 
@@ -900,6 +900,7 @@
             is_transfer,
             is_qualified,
             defect_qty,
+            roll_no,
             CONVERT(VARCHAR(19), create_time, 120) AS createTime
         FROM qc_ipqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
@@ -1323,10 +1324,10 @@
 
     <insert id="saveSQCSubDetailed">
         INSERT INTO qc_sqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, create_time)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, roll_no, create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, getDate())
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, #{item.rollNo}, getDate())
         </foreach>
     </insert>
 
@@ -1347,6 +1348,7 @@
             is_transfer,
             is_qualified,
             defect_qty,
+            roll_no,
             CONVERT(VARCHAR(19), create_time, 120) AS createTime
         FROM qc_sqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
@@ -2063,6 +2065,7 @@
             is_transfer,
             is_qualified,
             defect_qty,
+            roll_no,
             CONVERT(VARCHAR(19), create_time, 120) AS createTime
         FROM qc_iqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
@@ -2163,10 +2166,10 @@
     <!-- 新增IQC子明细信息 -->
     <insert id="saveIQCSubDetailed">
         INSERT INTO qc_iqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, create_time)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, roll_no, create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, getDate())
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, #{item.rollNo}, getDate())
         </foreach>
     </insert>
 
@@ -2662,10 +2665,10 @@
     <!-- 新增子明细信息 -->
     <insert id="saveFQCSubDetailed">
         INSERT INTO qc_fqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, create_time)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, roll_no, create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, getDate())
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, #{item.rollNo}, getDate())
         </foreach>
     </insert>
 
@@ -2687,6 +2690,7 @@
             is_transfer,
             is_qualified,
             defect_qty,
+            roll_no,
             CONVERT(VARCHAR(19), create_time, 120) AS createTime
         FROM qc_fqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
@@ -4987,6 +4991,7 @@
             is_transfer,
             is_qualified,
             defect_qty,
+            roll_no,
             CONVERT(VARCHAR(19), create_time, 120) AS createTime
         FROM qc_oqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
@@ -5107,10 +5112,10 @@
     <!-- 新增FQAS子明细信息 -->
     <insert id="saveFQASSubDetailed">
         INSERT INTO qc_oqc_sub_detail_record
-        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, create_time)
+        (inspection_no, item_no, sub_detail_value, sampling_location, site, sampling_location_b, bu_no, num, sub_detail_value_b, sub_detail_value_c, sub_detail_value_d, sub_detail_value_e, file_name, is_transfer, is_qualified, defect_qty, roll_no, create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, getDate())
+            (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}, #{item.buNo}, #{item.num}, #{item.subDetailValueB}, #{item.subDetailValueC}, #{item.subDetailValueD}, #{item.subDetailValueE}, #{item.fileName}, #{item.isTransfer}, #{item.isQualified}, #{item.defectQty}, #{item.rollNo}, getDate())
         </foreach>
     </insert>
 
@@ -5744,7 +5749,8 @@
             file_name as fileName,
             is_transfer as isTransfer,
             is_qualified as isQualified,
-            defect_qty as defectQty
+            defect_qty as defectQty,
+            roll_no as rollNo
         from
         <choose>
             <when test="flag == 'ipqc'">qc_ipqc_sub_detail_record</when>