|
@@ -53,7 +53,7 @@
|
|
|
if(package.id is null, 1, 2) as type
|
|
|
FROM
|
|
|
qr_package_booking_order AS bookingOrder
|
|
|
- LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order
|
|
|
+ LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order and package.is_delete=0
|
|
|
LEFT JOIN base_material AS material ON material.id = package.material_id
|
|
|
LEFT JOIN base_factory AS factory ON factory.id = bookingOrder.factory_cover_id
|
|
|
LEFT JOIN user_info AS ui on package.update_by = ui.id
|