Merge remote-tracking branch 'origin/master'

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

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,