From 502bbe94f3e3a4895347363dd70fa0392bf46f2d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 29 Oct 2025 14:16:56 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-29=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86sop=E9=A2=84=E8=A7=88=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 | 114 ++++++++++++++++-----
 1 file changed, 91 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index f8f43a7..43fc344 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3123,31 +3123,99 @@
 
     <!-- SOP清单查询 -->
     <select id="sopListSearch" resultType="map">
+<!--        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,-->
+<!--            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>-->
+<!--            <if test="params.site != null and params.site != ''">-->
+<!--                AND ps.site = #{params.site}-->
+<!--            </if>-->
+<!--            <if test="params.partNo != null and params.partNo != ''">-->
+<!--                AND ps.part_no = #{params.partNo}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        ORDER BY ps.creation_date DESC-->
+
+
+        SELECT
+        distinct
+        site,
+        buNo,
+        partNo,
+        sopNo,
+        sopName,
+        sopUrl,
+        [version],
+        sopStatus,
+        phaseInDate,
+        phaseOutDate,
+        createdBy,
+        creationDate,
+        sopType,
+        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,
-            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
+        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>
-            <if test="params.site != null and params.site != ''">
-                AND ps.site = #{params.site}
-            </if>
-            <if test="params.partNo != null and params.partNo != ''">
-                AND ps.part_no = #{params.partNo}
-            </if>
-        </where>
-        ORDER BY ps.creation_date DESC
+        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'
+        OR fm.order_no = #{params.orderNo}
+        )
+
+        ) AS CombinedResults
+
+
     </select>
 
     <!-- 查询可用的SOP文件 -->