2026-10-23

采集控制

src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java

@@ -298,4 +298,10 @@ public class QcFAIRecordData extends QueryPage {
     private String customerName;
     private Integer detailImageNum;
     private BigDecimal dhjs;
+    private String actualValueCollectFlag;
+    private String actualValueFillRule;
+    private Integer actualValueQty;
+    private String imageCollectFlag;
+    private String imageUploadRule;
+    private Integer imageQty;
 }

src/main/java/com/gaotao/modules/pms/data/QcItemData.java

@@ -99,6 +99,18 @@ public class QcItemData extends QueryPage {
     private String collectionDataContent;
 
     private Integer orderId;
+    /** 实测值采集控制 Y/N */
+    private String actualValueCollectFlag;
+    /** 实测值填写规则：自定义数量 / 按抽样数量 */
+    private String actualValueFillRule;
+    /** 实测值数量 */
+    private Integer actualValueQty;
+    /** 图片采集控制 Y/N */
+    private String imageCollectFlag;
+    /** 图片上传规则：自定义数量 / 按抽样数量 */
+    private String imageUploadRule;
+    /** 图片数量 */
+    private Integer imageQty;
     /**
      * 创建人中文描述
      */
@@ -419,4 +431,52 @@ public class QcItemData extends QueryPage {
     public void setOrderId(Integer orderId) {
         this.orderId = orderId;
     }
+
+    public String getActualValueCollectFlag() {
+        return actualValueCollectFlag;
+    }
+
+    public void setActualValueCollectFlag(String actualValueCollectFlag) {
+        this.actualValueCollectFlag = actualValueCollectFlag;
+    }
+
+    public String getActualValueFillRule() {
+        return actualValueFillRule;
+    }
+
+    public void setActualValueFillRule(String actualValueFillRule) {
+        this.actualValueFillRule = actualValueFillRule;
+    }
+
+    public Integer getActualValueQty() {
+        return actualValueQty;
+    }
+
+    public void setActualValueQty(Integer actualValueQty) {
+        this.actualValueQty = actualValueQty;
+    }
+
+    public String getImageCollectFlag() {
+        return imageCollectFlag;
+    }
+
+    public void setImageCollectFlag(String imageCollectFlag) {
+        this.imageCollectFlag = imageCollectFlag;
+    }
+
+    public String getImageUploadRule() {
+        return imageUploadRule;
+    }
+
+    public void setImageUploadRule(String imageUploadRule) {
+        this.imageUploadRule = imageUploadRule;
+    }
+
+    public Integer getImageQty() {
+        return imageQty;
+    }
+
+    public void setImageQty(Integer imageQty) {
+        this.imageQty = imageQty;
+    }
 }

src/main/resources/mapper/pms/QcBaseInfoMapper.xml

@@ -135,7 +135,13 @@
         WHEN epi.collection_method = 'image' THEN '图片'
         else '' end as collectionMethodDesc,
         epi.collection_condition,
-        epi.collection_data_content
+        epi.collection_data_content,
+        epi.actual_value_collect_flag,
+        epi.actual_value_fill_rule,
+        epi.actual_value_qty,
+        epi.image_collect_flag,
+        epi.image_upload_rule,
+        epi.image_qty
         FROM eam_properties_item as epi
         LEFT JOIN qc_method_item as qmi on epi.ItemNo = qmi.ItemNo and epi.site = qmi.site and epi.bu_no = qmi.bu_no
         LEFT JOIN qc_method as qm on qmi.method_no = qm.method_no and qmi.site = qm.site and qmi.bu_no = qm.bu_no
@@ -179,8 +185,8 @@
 
     <!-- 新增检验项目 -->
     <insert id="qcItemSave" parameterType="com.gaotao.modules.pms.data.QcItemData">
-        INSERT INTO eam_properties_item (site, bu_no, ItemNo, ItemDesc, DefaultValue, ValueType, ValueType_DB, ValueChooseFlag, CreatedDate, CreatedBy, MaxValue, MinValue, ItemRemark, ItemType, update_date, update_by, inspection_type_no, item_sampling_quantity, sampling_programme_no, sampling_level_no, default_sampling_proportion, collection_flag, collection_source, collection_method, collection_condition, collection_data_content)
-        VALUES (#{site}, #{buNo}, #{itemNo}, #{itemDesc}, #{defaultValue}, #{valueType}, #{valueTypeDb}, #{valueChooseFlag}, GetDate(), #{createdBy}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{itemRemark}, #{itemType}, getDate(), #{updateBy}, #{inspectionTypeNo}, #{itemSamplingQuantity}, #{samplingProgrammeNo}, #{samplingLevelNo}, #{defaultSamplingProportion}, #{collectionFlag}, #{collectionSource}, #{collectionMethod}, #{collectionCondition}, #{collectionDataContent})
+        INSERT INTO eam_properties_item (site, bu_no, ItemNo, ItemDesc, DefaultValue, ValueType, ValueType_DB, ValueChooseFlag, CreatedDate, CreatedBy, MaxValue, MinValue, ItemRemark, ItemType, update_date, update_by, inspection_type_no, item_sampling_quantity, sampling_programme_no, sampling_level_no, default_sampling_proportion, collection_flag, collection_source, collection_method, collection_condition, collection_data_content, actual_value_collect_flag, actual_value_fill_rule, actual_value_qty, image_collect_flag, image_upload_rule, image_qty)
+        VALUES (#{site}, #{buNo}, #{itemNo}, #{itemDesc}, #{defaultValue}, #{valueType}, #{valueTypeDb}, #{valueChooseFlag}, GetDate(), #{createdBy}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{itemRemark}, #{itemType}, getDate(), #{updateBy}, #{inspectionTypeNo}, #{itemSamplingQuantity}, #{samplingProgrammeNo}, #{samplingLevelNo}, #{defaultSamplingProportion}, #{collectionFlag}, #{collectionSource}, #{collectionMethod}, #{collectionCondition}, #{collectionDataContent}, #{actualValueCollectFlag}, #{actualValueFillRule}, #{actualValueQty,jdbcType=INTEGER}, #{imageCollectFlag}, #{imageUploadRule}, #{imageQty,jdbcType=INTEGER})
     </insert>
 
     <!-- 新增项目里的方法 -->
@@ -211,7 +217,13 @@
             collection_source = #{collectionSource},
             collection_method = #{collectionMethod},
             collection_condition = #{collectionCondition},
-            collection_data_content = #{collectionDataContent}
+            collection_data_content = #{collectionDataContent},
+            actual_value_collect_flag = #{actualValueCollectFlag},
+            actual_value_fill_rule = #{actualValueFillRule},
+            actual_value_qty = #{actualValueQty,jdbcType=INTEGER},
+            image_collect_flag = #{imageCollectFlag},
+            image_upload_rule = #{imageUploadRule},
+            image_qty = #{imageQty,jdbcType=INTEGER}
         WHERE site = #{site} and ItemNo = #{itemNo} and ItemType = #{itemType} and bu_no = #{buNo}
     </update>
 

src/main/resources/mapper/pms/QcMapper.xml

@@ -689,12 +689,19 @@
             a.sampling_qty,
             dbo.qc_get_ipqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum,
             dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum,
+            epi.actual_value_collect_flag as actualValueCollectFlag,
+            epi.actual_value_fill_rule as actualValueFillRule,
+            epi.actual_value_qty as actualValueQty,
+            epi.image_collect_flag as imageCollectFlag,
+            epi.image_upload_rule as imageUploadRule,
+            epi.image_qty as imageQty,
             c.method_no,
             c.method_name,
             c.method_remark
         FROM qc_ipqc_detailed_record as a
         LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
         LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
+        LEFT JOIN eam_properties_item epi on a.site = epi.site and a.bu_no = epi.bu_no and a.item_no = epi.ItemNo
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         order by a.order_id
     </select>
@@ -1106,6 +1113,12 @@
             isnull(a.unqualified_quantity,0) as unqualifiedQuantity,
             dbo.qc_get_iqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum,
             dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum,
+            epi.actual_value_collect_flag as actualValueCollectFlag,
+            epi.actual_value_fill_rule as actualValueFillRule,
+            epi.actual_value_qty as actualValueQty,
+            epi.image_collect_flag as imageCollectFlag,
+            epi.image_upload_rule as imageUploadRule,
+            epi.image_qty as imageQty,
             c.method_no,
             c.method_name,
             c.method_remark,
@@ -1113,6 +1126,7 @@
         FROM qc_iqc_detailed_record as a
         LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
         LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
+        LEFT JOIN eam_properties_item epi on a.site = epi.site and a.bu_no = epi.bu_no and a.item_no = epi.ItemNo
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         order by a.order_id
     </select>
@@ -1522,12 +1536,19 @@
             a.sampling_qty,
             dbo.qc_get_fqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum,
             dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum,
+            epi.actual_value_collect_flag as actualValueCollectFlag,
+            epi.actual_value_fill_rule as actualValueFillRule,
+            epi.actual_value_qty as actualValueQty,
+            epi.image_collect_flag as imageCollectFlag,
+            epi.image_upload_rule as imageUploadRule,
+            epi.image_qty as imageQty,
             c.method_no,
             c.method_name,
             c.method_remark
         FROM  qc_fqc_detailed_record as a
         LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
         LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
+        LEFT JOIN eam_properties_item epi on a.site = epi.site and a.bu_no = epi.bu_no and a.item_no = epi.ItemNo
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         order by a.order_id
     </select>
@@ -3598,6 +3619,12 @@
             a.unqualified_quantity,
             dbo.qc_get_fqas_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum,
             dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum,
+            epi.actual_value_collect_flag as actualValueCollectFlag,
+            epi.actual_value_fill_rule as actualValueFillRule,
+            epi.actual_value_qty as actualValueQty,
+            epi.image_collect_flag as imageCollectFlag,
+            epi.image_upload_rule as imageUploadRule,
+            epi.image_qty as imageQty,
             c.method_no,
             c.method_name,
             c.method_remark,
@@ -3605,6 +3632,7 @@
         FROM qc_oqc_detailed_record as a
                  LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
                  LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
+                 LEFT JOIN eam_properties_item epi on a.site = epi.site and a.bu_no = epi.bu_no and a.item_no = epi.ItemNo
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         ORDER BY COALESCE(a.order_id, 99999) ASC
     </select>