u
This commit is contained in:
@@ -307,8 +307,11 @@ SELECT auth.*,
|
||||
SELECT SUM(ma_s.amount)
|
||||
FROM manifest m_s
|
||||
INNER JOIN manifestarticle ma_s ON ma_s.manifest_id = m_s.id
|
||||
LEFT JOIN shipmentsummary ss ON ss.manifest_id = m_s.id
|
||||
WHERE m_s.company_id = m.company_id
|
||||
AND m_s."type" = 'shipment'
|
||||
AND COALESCE(ss.state, 'new') != 'cancelled'
|
||||
AND m_s."number" NOT LIKE '%#cancelled#%'
|
||||
AND ma_s.sku = a.sku
|
||||
AND m_s."number" LIKE m."number" || COALESCE((SELECT prefix FROM numbers WHERE company_id = m.company_id AND "type" = 'shipment'), '-L-') || '%'
|
||||
), 0), 3) AS amount
|
||||
@@ -321,7 +324,18 @@ SELECT auth.*,
|
||||
AND ma.sku = a.sku
|
||||
AND COALESCE(os.is_shipped, 0) = 0
|
||||
GROUP BY m.id, m."number", m."date", os.customer_name, e.first_name, e.name
|
||||
HAVING amount > 0
|
||||
HAVING (SUM(ma.amount) - COALESCE((
|
||||
SELECT SUM(ma_s.amount)
|
||||
FROM manifest m_s
|
||||
INNER JOIN manifestarticle ma_s ON ma_s.manifest_id = m_s.id
|
||||
LEFT JOIN shipmentsummary ss ON ss.manifest_id = m_s.id
|
||||
WHERE m_s.company_id = m.company_id
|
||||
AND m_s."type" = 'shipment'
|
||||
AND COALESCE(ss.state, 'new') != 'cancelled'
|
||||
AND m_s."number" NOT LIKE '%#cancelled#%'
|
||||
AND ma_s.sku = a.sku
|
||||
AND m_s."number" LIKE m."number" || COALESCE((SELECT prefix FROM numbers WHERE company_id = m.company_id AND "type" = 'shipment'), '-L-') || '%'
|
||||
), 0)) > 0
|
||||
ORDER BY m."date" ASC, m.id ASC
|
||||
) uo
|
||||
))
|
||||
|
||||
Reference in New Issue
Block a user