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} - + 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 - (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}) + (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}) @@ -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} @@ -1864,10 +1865,10 @@ 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 - (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}) + (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}) @@ -1875,7 +1876,8 @@ @@ -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} @@ -2136,10 +2139,10 @@ 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 - (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}) + (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}) @@ -2434,10 +2437,10 @@ 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 - (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}) + (#{item.inspectionNo}, #{item.itemNo}, #{item.subDetailValue}, #{item.samplingLocation}, #{item.site}, #{item.samplingLocationB}) @@ -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}