diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
index e863d30df..d422cb922 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
@@ -125,6 +125,15 @@ public class QcStaticTable extends BaseEntity {
private String checkTypeName;
private String sampleQty;
private String noOkQty;
+ private String userDefined3;
+
+ public String getUserDefined3() {
+ return userDefined3;
+ }
+
+ public void setUserDefined3(String userDefined3) {
+ this.userDefined3 = userDefined3;
+ }
public String getGroupId() {
return groupId;
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index 4c0ff7ef0..7fc2981ec 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -23,8 +23,10 @@
select DISTINCT qct.supplier_code supplierCode,
qct.supplier_name supplierName
from qc_check_task qct
+ LEFT JOIN base_supplier bs ON bs.supplier_code = qct.supplier_code
where qct.type_code = 'material' and qct.del_flag = '0'
and CONVERT(varchar(7),qct.income_time, 120) = #{yearMonth}
+ and bs.supplier_code = #{userDefined3}
and qct.supplier_code in
@@ -95,7 +97,7 @@
left join qc_defect_type type2 on qctd2.defect_code = type2.defect_code
left join qc_check_task_defect qctd3 on qct.record_id = qctd3.belong_to and qctd3.defect_code = '20231212003'
left join qc_defect_type type3 on qctd3.defect_code = type3.defect_code
- where qct.del_flag = '0' and qct.type_code = 'produce'
+ where qct.del_flag = '0' and qct.type_code = 'produce' and qct.check_type = 'checkTypeCPPC'
and qct.material_code in (${materialCode})
and qct.supplier_code = #{workCenter}
and CONVERT(varchar(10),qct.create_time, 120) >= #{ymArrayStart}