From 477317b3e4bb36ab6ae4c1821d7336518ae01298 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 3 Nov 2026 16:40:08 +0800
Subject: [PATCH] =?UTF-8?q?2026-11-03=20=E6=A3=80=E9=AA=8C=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=8E=A7=E5=88=B6?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/pms/data/QcTemplateData.java | 60 +++++++++++++++++++
.../service/impl/ScheduleServiceImpl.java | 6 +-
.../resources/mapper/pms/QcBaseInfoMapper.xml | 16 ++++-
src/main/resources/mapper/pms/QcMapper.xml | 46 +++++++-------
4 files changed, 100 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java b/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java
index 6254ff0..097820e 100644
--- a/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java
+++ b/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;
+ }
}
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 70dac6e..b278318 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/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}")
diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
index dc381e6..a33c85b 100644
--- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml
+++ b/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 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})
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index fb9c014..543a3af 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3,6 +3,20 @@
+
+
+ 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
+
+
+
+ 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
+
+
@@ -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,
+ ,
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
+
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
order by a.order_id
@@ -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,
+ ,
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
+
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
order by a.order_id
@@ -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,
+ ,
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
+
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
order by a.order_id
@@ -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,
+ ,
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
+
WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
ORDER BY COALESCE(a.order_id, 99999) ASC