From 1131b907c9a4446b70fcd92d03dc0dcaa72e579d Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Fri, 26 Jun 2026 09:16:26 +0800
Subject: [PATCH] =?UTF-8?q?srm=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/base/BaseMapper.xml | 3 +++
 src/main/resources/mapper/qms/QcMapper.xml    | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index d6eda00..2237975 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -81,6 +81,9 @@
         left join bu as b on a.bu_no = b.bu_no and a.site = b.site
         left join site as c on a.site = c.siteid
         WHERE a.username = #{username}
+        <if test="site != null and site != ''">
+            and a.site = #{site}
+        </if>
     </select>
     <select id="getSiteBuByUserNameRQ" resultType="BuData" parameterType="BuData">
         SELECT
diff --git a/src/main/resources/mapper/qms/QcMapper.xml b/src/main/resources/mapper/qms/QcMapper.xml
index e024d62..0876c94 100644
--- a/src/main/resources/mapper/qms/QcMapper.xml
+++ b/src/main/resources/mapper/qms/QcMapper.xml
@@ -1050,10 +1050,12 @@
             qa.attribute_type,
             qa.update_date,
             qa.update_by,
+            pf.family_name,
             dbo.getOperatorDesc(qa.site, qa.update_by) as updateByDesc,
             qa.exempt_inspection
         FROM qc_part_attribute qa
         LEFT JOIN part p on qa.attribute_no = p.part_no and qa.site = p.site
+        LEFT JOIN part_family as pf on p.category = pf.family_id and p.site = pf.site
         <where>
             qa.site = #{query.site}
             and (qa.bu_no) in (select * from dbo.query_bu(#{query.userName}))
@@ -1509,7 +1511,8 @@
             qa.update_by,
             qa.attribute_type
         FROM qc_part_attribute as qa
-        LEFT JOIN part_family as pf on qa.attribute_no = pf.family_id and qa.site = pf.site
+        LEFT JOIN part p on qa.attribute_no = p.part_no and qa.site = p.site
+        LEFT JOIN part_family as pf on p.category = pf.family_id and p.site = pf.site
         <where>
             qa.site = #{query.site}
             and (qa.bu_no) in (select * from dbo.query_bu(#{query.userName}))
@@ -2629,6 +2632,7 @@
         a.part_no,
         a.part_desc,
         d.sku,
+        d.unit as umid,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,