tanzhongran 3 rokov pred
rodič
commit
932d4cbdc0

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

@@ -105,7 +105,6 @@
             qp.update_time,
             qp.update_by,
             qp.qr_type,
-            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,
@@ -115,7 +114,8 @@
             qr.id AS qr_repertory_id,
             qr.name AS qr_repertory_name,
             qr.type AS qr_repertory_type,
-            sap_item.purchase_count
+            IFNULL(book_o.material_name,material.material_name) as material_name,
+            IFNULL(book_o.purchase_count,sap_item.purchase_count) as purchase_count
         FROM
             qr_package qp
         LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id