2026-11-03

检验模板增加项目控制维护

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

@@ -128,6 +128,18 @@ public class QcTemplateData extends QueryPage {
      */
     private String buDesc;
     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;
     /**
      * 创建人中文描述
      */
@@ -596,4 +608,52 @@ public class QcTemplateData 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/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -115,7 +115,11 @@ public class ScheduleServiceImpl implements ScheduleService {
     @Autowired
     private RestTemplate restTemplate;
 
-    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
+    // 测试环境接口
+//    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
+//    private String mesLogsBaseUrl;
+
+    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
     private String mesLogsBaseUrl;
 
     @Value("${mes.logs.username:BOINGTECH}")

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

@@ -552,7 +552,13 @@
             c.sampling_programme_desc,
             b.sampling_level_no,
             d.sampling_level_desc,
-            b.default_sampling_proportion,a.order_id
+            b.default_sampling_proportion,a.order_id,
+            a.actual_value_collect_flag,
+            a.actual_value_fill_rule,
+            a.actual_value_qty,
+            a.image_collect_flag,
+            a.image_upload_rule,
+            a.image_qty
         FROM qc_template_detailed a
                  LEFT JOIN eam_properties_item b ON a.ItemNo = b.ItemNo and a.site = b.site and a.bu_no = b.bu_no
                  left join qc_sampling_inspection_programme as c on b.site = c.site and b.sampling_programme_no = c.sampling_programme_no and b.bu_no = c.bu_no
@@ -710,9 +716,13 @@
     <!-- 修改项目明细的最大最小值 -->
     <insert id="saveItemDetailed">
         INSERT INTO qc_template_detailed
-        (site, bu_no, template_id, ItemNo, default_value, max_value, min_value, order_id)
+        (site, bu_no, template_id, ItemNo, default_value, max_value, min_value, order_id,
+         actual_value_collect_flag, actual_value_fill_rule, actual_value_qty,
+         image_collect_flag, image_upload_rule, image_qty)
         VALUES
-            (#{site}, #{buNo}, #{templateId}, #{itemNo}, #{defaultValue}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL},#{orderId})
+            (#{site}, #{buNo}, #{templateId}, #{itemNo}, #{defaultValue}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL},#{orderId},
+             #{actualValueCollectFlag}, #{actualValueFillRule}, #{actualValueQty,jdbcType=INTEGER},
+             #{imageCollectFlag}, #{imageUploadRule}, #{imageQty,jdbcType=INTEGER})
     </insert>
 
     <!-- 查询项目明细 -->

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

@@ -3,6 +3,20 @@
 
 <mapper namespace="com.gaotao.modules.pms.mapper.QcMapper">
 
+    <!-- 模板控制为“是”时用模板，为空或“否”时用检验项目。两个控制分开判断。 -->
+    <sql id="templateOrItemCollectControl">
+        CASE WHEN qtd.actual_value_collect_flag = 'Y' THEN qtd.actual_value_collect_flag ELSE epi.actual_value_collect_flag END as actualValueCollectFlag,
+        CASE WHEN qtd.actual_value_collect_flag = 'Y' THEN qtd.actual_value_fill_rule ELSE epi.actual_value_fill_rule END as actualValueFillRule,
+        CASE WHEN qtd.actual_value_collect_flag = 'Y' THEN qtd.actual_value_qty ELSE epi.actual_value_qty END as actualValueQty,
+        CASE WHEN qtd.image_collect_flag = 'Y' THEN qtd.image_collect_flag ELSE epi.image_collect_flag END as imageCollectFlag,
+        CASE WHEN qtd.image_collect_flag = 'Y' THEN qtd.image_upload_rule ELSE epi.image_upload_rule END as imageUploadRule,
+        CASE WHEN qtd.image_collect_flag = 'Y' THEN qtd.image_qty ELSE epi.image_qty END as imageQty
+    </sql>
+
+    <sql id="templateCollectControlJoin">
+        LEFT JOIN qc_template_detailed qtd on a.site = qtd.site and a.bu_no = qtd.bu_no and a.template_id = qtd.template_id and a.item_no = qtd.ItemNo
+    </sql>
+
     <!-- ================================================= FAI检验维护 ================================================= -->
 
     <!-- 查询FAI基础数据 -->
@@ -689,12 +703,7 @@
             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,
+            <include refid="templateOrItemCollectControl"/>,
             c.method_no,
             c.method_name,
             c.method_remark
@@ -702,6 +711,7 @@
         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
+        <include refid="templateCollectControlJoin"/>
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         order by a.order_id
     </select>
@@ -1113,12 +1123,7 @@
             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,
+            <include refid="templateOrItemCollectControl"/>,
             c.method_no,
             c.method_name,
             c.method_remark,
@@ -1127,6 +1132,7 @@
         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
+        <include refid="templateCollectControlJoin"/>
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         order by a.order_id
     </select>
@@ -1536,12 +1542,7 @@
             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,
+            <include refid="templateOrItemCollectControl"/>,
             c.method_no,
             c.method_name,
             c.method_remark
@@ -1549,6 +1550,7 @@
         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
+        <include refid="templateCollectControlJoin"/>
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         order by a.order_id
     </select>
@@ -3619,12 +3621,7 @@
             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,
+            <include refid="templateOrItemCollectControl"/>,
             c.method_no,
             c.method_name,
             c.method_remark,
@@ -3633,6 +3630,7 @@
                  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
+                 <include refid="templateCollectControlJoin"/>
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
         ORDER BY COALESCE(a.order_id, 99999) ASC
     </select>