码包详情多返回一个物料名称

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -105,7 +105,7 @@
             qp.update_time,
             qp.update_by,
             qp.qr_type,
-            material.material_name,
+            IFNULL(book_o.material_name,material.material_name) as material_name,
             bcf.name as box_code_format_name,
             f_cover.factory_name as factory_cover_name,
             f_cover.is_first_factory,
@@ -125,6 +125,7 @@
         LEFT JOIN base_factory f_beer ON qp.factory_beer_id = f_beer.id
         LEFT JOIN base_factory f_cover_l2 ON qp.factory_cover_level_two_id = f_cover_l2.id and f_cover_l2.factory_type=3
         LEFT JOIN qr_package_sap_order_item sap_item on sap_item.sap_order_no=qp.sap_order_no and sap_item.sap_material_id=material.material_code and sap_item.is_delete=0
+        LEFT JOIN qr_package_booking_order book_o on book_o.booking_order=qp.booking_order and book_o.is_delete=0
 
         WHERE qp.id = #{id}