From b674071b40d2fc39e530db8261f6c2a138cd4eee Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:43:13 +0800
Subject: [PATCH] =?UTF-8?q?2024.1.26=20=E6=A3=80=E9=AA=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/QcMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 215692a2..f6a5b5b4 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -524,7 +524,7 @@
             a.MinValue
         FROM  eam_properties_item a
         LEFT JOIN qc_template_detailed b ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo and a.site = b.site and a.bu_no = b.bu_no
-        WHERE a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null and a.bu_no = #{buNo}
+        WHERE a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null and a.bu_no = #{buNo} and dbo.qc_get_inspection_type_name(a.site, a.inspection_type_no) = #{inspectionTypeName}
     </select>
 
     <!-- 查询项目 -->
@@ -540,7 +540,7 @@
         FROM  eam_properties_item a
         LEFT JOIN qc_template_detailed b ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo and a.site = b.site and a.bu_no = b.bu_no
         <where>
-            a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null and a.bu_no = #{buNo}
+            a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null and a.bu_no = #{buNo} and dbo.qc_get_inspection_type_name(a.site, a.inspection_type_no) = #{inspectionTypeName}
             <if test = "itemNo != null and itemNo != ''">
                 AND a.ItemNo LIKE '%' + #{itemNo} + '%'
             </if>
@@ -2864,7 +2864,7 @@
             dbo.qc_get_inspection_type_name(site, inspection_type_no) as inspectionTypeName
         FROM qc_template
         <where>
-            site = #{site} and bu_no = #{buNo}
+            site = #{site} and bu_no = #{buNo} and dbo.qc_get_inspection_type_name(site, inspection_type_no) = #{inspectionTypeName}
             <if test = "templateId != null and templateId != ''">
                 AND template_id LIKE '%' + #{templateId}+'%'
             </if>