From c51705dab3c5febee170e60ab57089ab9e961a08 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 21 Apr 2026 09:10:31 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-21=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 665c154..f5a5e9f 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3917,37 +3917,84 @@
 
     <!-- 查询检验页面的SOP文件列表（从file_management表） -->
     <select id="searchQcSopFileList" resultType="map">
+<!--        SELECT DISTINCT-->
+<!--            fm.ID AS id,-->
+<!--            fm.url_add_ress AS sopUrl,-->
+<!--            fm.create_date AS creationDate,-->
+<!--            fm.file_name AS sopName,-->
+<!--            fm.new_file_name AS newFileName,-->
+<!--            fm.created_by AS createdBy,-->
+<!--            fm.file_type AS fileType,&#45;&#45;-->
+<!--            fm.file_suffix AS fileSuffix,-->
+<!--            fm.sop_rev_no AS version,-->
+<!--            fm.phase_in_date AS phaseInDate,-->
+<!--            fm.phase_out_date AS phaseOutDate-->
+<!--        FROM file_management fm-->
+
         SELECT DISTINCT
-            fm.ID AS id,
-            fm.url_add_ress AS sopUrl,
-            fm.create_date AS creationDate,
-            fm.file_name AS sopName,
-            fm.new_file_name AS newFileName,
-            fm.created_by AS createdBy,
-            fm.file_type AS fileType,
-            fm.file_suffix AS fileSuffix,
-            fm.sop_rev_no AS version,
-            fm.phase_in_date AS phaseInDate,
-            fm.phase_out_date AS phaseOutDate
+        site,
+        buNo,
+        partNo,
+        sopNo,
+        sopName,
+        sopUrl,
+        [version],
+        sopStatus,
+        phaseInDate,
+        phaseOutDate,
+        createdBy,
+        creationDate,
+        sopType as fileType,
+        operationDesc
+        FROM (
+        -- 来源1: part_sop（零件SOP）
+        SELECT
+        ps.site,
+        ps.bu_no          AS buNo,
+        ps.part_no        AS partNo,
+        ps.sop_no         AS sopNo,
+        ps.sop_name       AS sopName,
+        ps.sop_url        AS sopUrl,
+        ps.[version ]      AS [version],
+        ps.sop_status     AS sopStatus,
+        ps.phase_in_date  AS phaseInDate,
+        ps.phase_out_date AS phaseOutDate,
+        ps.created_by     AS createdBy,
+        ps.creation_date  AS creationDate,
+        ps.sop_type       AS sopType,
+        ps.operation_desc AS operationDesc
+        FROM part_sop ps
+        WHERE ps.site = #{params.site}
+        AND ps.part_no = #{params.partNo}
+
+        UNION ALL
+
+        -- 来源2: file_management（公共生产文件 或 订单关联文件）
+        SELECT
+        fm.site,
+        fm.bu_no          AS buNo,
+        ''                AS partNo,
+        fm.file_no        AS sopNo,
+        fm.file_name      AS sopName,
+        fm.url_add_ress   AS sopUrl,
+        fm.sop_rev_no     AS [version],
+        fm.status         AS sopStatus,
+        fm.phase_in_date  AS phaseInDate,
+        fm.phase_out_date AS phaseOutDate,
+        fm.created_by     AS createdBy,
+        fm.create_date    AS creationDate,
+        fm.file_type      AS sopType,
+        fm.item_no        AS operationDesc
         FROM file_management fm
         WHERE fm.site = #{params.site}
         AND fm.file_type = '质量'
         AND (
-            ISNULL(fm.public_flag, 'N') = 'Y'
-            <if test="params.operationDesc != null and params.operationDesc != ''">
-                OR fm.item_no = #{params.operationDesc}
-            </if>
-            <if test="params.workcenterNo != null and params.workcenterNo != ''">
-                OR fm.workcenter_no = #{params.workcenterNo}
-            </if>
-            <if test="params.partNo != null and params.partNo != ''">
-                OR fm.part_no = #{params.partNo}
-            </if>
-            <if test="params.orderNo != null and params.orderNo != ''">
-                OR fm.order_no = #{params.orderNo}
-            </if>
+        ISNULL(fm.public_flag, 'N') = 'Y'
+        OR fm.order_no = #{params.orderNo}
         )
-        ORDER BY fm.create_date DESC
+
+        ) AS CombinedResults
+
     </select>
 
     <!-- 查询可用的SOP文件 -->