From 63144c77bc83c15bf1e241dd5887648f40e81c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Wed, 24 Sep 2025 10:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/quality/domain/QcStaticTable.java   | 9 +++++++++
 .../resources/mapper/quality/QcStaticTableMapper.xml     | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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}
+        <if test="userDefined3 != null ">and bs.supplier_code = #{userDefined3}</if>
         <if test="supplierCodes != null and supplierCodes.size()>0">
             and qct.supplier_code in
             <foreach collection="supplierCodes" item="supplierCode" index="index" separator="," open="(" close=")">
@@ -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'
         <if test="materialCode != null ">and qct.material_code in (${materialCode})</if>
         <if test="workCenter != null ">and qct.supplier_code = #{workCenter}</if>
         <if test="ymArrayStart != null ">and CONVERT(varchar(10),qct.create_time, 120) >= #{ymArrayStart}</if>