From e736c95fb69ec1bc4a08c37736c771a02ef16357 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Feb 2025 10:29:48 +0100
Subject: [PATCH] feat: refs #6321 sql lackDetail step2

---
 modules/ticket/back/methods/ticket/itemLackDetail.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/itemLackDetail.js b/modules/ticket/back/methods/ticket/itemLackDetail.js
index 2b341e5e7c..2f922e9860 100644
--- a/modules/ticket/back/methods/ticket/itemLackDetail.js
+++ b/modules/ticket/back/methods/ticket/itemLackDetail.js
@@ -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
         ]);