modules/ticket/back/methods/ticket/itemLackDetail.js

@@ -35,8 +35,14 @@ module.exports = Self => {
 
         const myOptions = {};
         if (typeof options == 'object') Object.assign(myOptions, options);
-        const vDated = Date.vnNew();
+        const vDated = (Date.vnNew());
+        vDated.setHours(0, 0, 0, 0);
         const scopeDays = filter.where.scopeDays ?? 2;
+        let alertLevels = filter.where.alertLevelCode;
+
+        if (!alertLevels)
+            alertLevels = (await Self.app.models.AlertLevel.find({fields: ['code']})).map(({code}) => code);
+
         const stmt = new ParameterizedSQL(`
             SELECT s.id,
                 st.code,
@@ -89,7 +95,9 @@ module.exports = Self => {
             WHERE t.warehouseFk = ?
                 AND s.itemFk = ?
                 AND s.quantity <> 0
-                AND t.shipped BETWEEN util.VN_CURDATE() AND DATE_ADD(util.VN_CURDATE(), INTERVAL ? DAY)
+
+                AND t.shipped BETWEEN ? AND (? + INTERVAL ? DAY)
+
                 AND sgd.saleFk IS NULL
                 AND (al.code IN (?) OR al.id IS NULL)
             UNION ALL
@@ -133,7 +141,7 @@ module.exports = Self => {
                             GROUP BY co.clientFk
                     )  substitution ON substitution.clientFk = c.id
                 WHERE r.shipment BETWEEN ? AND ? + INTERVAL ? DAY
-                AND r.created >= ?
+                    AND r.created >= ?
                     AND r.warehouseFk = ?
                     AND NOT o.confirmed
                     AND r.itemFk = ?
@@ -143,8 +151,9 @@ module.exports = Self => {
         [
             filter.where.warehouseFk,
             itemFk,
+            vDated, vDated,
             scopeDays,
-            filter.where.alertLevelCode,
+            alertLevels,
             scopeDays,
             vDated, vDated, vDated,
             filter.where.warehouseFk,