feat: refs #6321 sql lackDetail step2
This commit is contained in:
parent
1af01ad747
commit
e736c95fb6
|
@ -68,7 +68,7 @@ module.exports = Self => {
|
|||
JOIN ticket t ON t.id = s.ticketFk
|
||||
LEFT JOIN zone z ON z.id = t.zoneFk
|
||||
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
|
||||
AND zc.dated = DATE(t.shipped)
|
||||
AND t.shipped BETWEEN zc.dated AND util.dayEnd(t.shipped)
|
||||
JOIN client c ON c.id=t.clientFk
|
||||
LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id
|
||||
JOIN agencyMode ag ON ag.id=t.agencyModeFk
|
||||
|
@ -128,13 +128,13 @@ module.exports = Self => {
|
|||
LEFT JOIN (
|
||||
SELECT co.clientFk, IF(COUNT(*) > 0, FALSE, TRUE) hasObservation
|
||||
FROM clientObservation co
|
||||
INNER JOIN observationType ot ON ot.id = co.observationTypeFk
|
||||
JOIN observationType ot ON ot.id = co.observationTypeFk
|
||||
WHERE ot.code = 'substitution'
|
||||
GROUP BY co.clientFk
|
||||
) substitution ON substitution.clientFk = c.id
|
||||
WHERE r.shipment BETWEEN util.VN_CURDATE() AND DATE_ADD(util.VN_CURDATE(), INTERVAL ? DAY)
|
||||
AND r.created >= ?
|
||||
AND r.warehouseFk = ?
|
||||
AND r.created >= util.VN_CURDATE()
|
||||
AND NOT o.confirmed
|
||||
AND r.itemFk = ?
|
||||
AND r.amount
|
||||
|
@ -146,6 +146,7 @@ module.exports = Self => {
|
|||
scopeDays,
|
||||
filter.where.alertLevelCode,
|
||||
scopeDays,
|
||||
vDated,
|
||||
filter.where.warehouseFk,
|
||||
itemFk
|
||||
]);
|
||||
|
|
Loading…
Reference in New Issue