verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 60 Releases Wiki Activity

feat: refs #6321 sql lackDetail step2

This commit is contained in:
Javier Segarra 2025-02-06 10:29:48 +01:00
parent 1af01ad747
commit e736c95fb6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -68,7 +68,7 @@ module.exports = Self => {
JOIN ticket t ON t.id = s.ticketFk JOIN ticket t ON t.id = s.ticketFk
LEFT JOIN zone z ON z.id = t.zoneFk LEFT JOIN zone z ON z.id = t.zoneFk
LEFT JOIN zoneClosure zc ON zc.zoneFk = 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 JOIN client c ON c.id=t.clientFk
LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id
JOIN agencyMode ag ON ag.id=t.agencyModeFk JOIN agencyMode ag ON ag.id=t.agencyModeFk
@ -128,13 +128,13 @@ module.exports = Self => {
LEFT JOIN ( LEFT JOIN (
SELECT co.clientFk, IF(COUNT(*) > 0, FALSE, TRUE) hasObservation SELECT co.clientFk, IF(COUNT(*) > 0, FALSE, TRUE) hasObservation
FROM clientObservation co FROM clientObservation co
INNER JOIN observationType ot ON ot.id = co.observationTypeFk JOIN observationType ot ON ot.id = co.observationTypeFk
WHERE ot.code = 'substitution' WHERE ot.code = 'substitution'
GROUP BY co.clientFk GROUP BY co.clientFk
) substitution ON substitution.clientFk = c.id ) substitution ON substitution.clientFk = c.id
WHERE r.shipment BETWEEN util.VN_CURDATE() AND DATE_ADD(util.VN_CURDATE(), INTERVAL ? DAY) WHERE r.shipment BETWEEN util.VN_CURDATE() AND DATE_ADD(util.VN_CURDATE(), INTERVAL ? DAY)
AND r.created >= ?
AND r.warehouseFk = ? AND r.warehouseFk = ?
AND r.created >= util.VN_CURDATE()
AND NOT o.confirmed AND NOT o.confirmed
AND r.itemFk = ? AND r.itemFk = ?
AND r.amount AND r.amount
@ -146,6 +146,7 @@ module.exports = Self => {
scopeDays, scopeDays,
filter.where.alertLevelCode, filter.where.alertLevelCode,
scopeDays, scopeDays,
vDated,
filter.where.warehouseFk, filter.where.warehouseFk,
itemFk itemFk
]); ]);