From 8607a60ca7c57267ef3a86f3002fbf997a7a82af Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 11 Sep 2024 07:56:08 +0200 Subject: [PATCH] feat: refs #7404 format date before select --- db/routines/vn/procedures/stockBought_calculate.sql | 4 +--- .../back/methods/stock-bought/getStockBoughtDetail.js | 10 +++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/db/routines/vn/procedures/stockBought_calculate.sql b/db/routines/vn/procedures/stockBought_calculate.sql index 54ac78d8eb..6eabe015c8 100644 --- a/db/routines/vn/procedures/stockBought_calculate.sql +++ b/db/routines/vn/procedures/stockBought_calculate.sql @@ -3,9 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`stockBought_calcula BEGIN /** * Inserts the purchase volume per buyer - * into stockBought according to the date. - * - * @param vDated Purchase date + * into stockBought according to the current date. */ DECLARE vDated DATE; SET vDated = util.VN_CURDATE(); diff --git a/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js b/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js index 0657fcb9a9..6f09f1f679 100644 --- a/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js +++ b/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js @@ -23,7 +23,11 @@ module.exports = Self => { } }); - Self.getStockBoughtDetail = async(workerFk, dated = Date.vnNew()) => { + Self.getStockBoughtDetail = async(workerFk, dated) => { + if (!dated) { + dated = Date.vnNew(); + dated.setHours(0, 0, 0, 0); + } return Self.rawSql( `SELECT e.id entryFk, i.id itemFk, @@ -47,8 +51,8 @@ module.exports = Self => { JOIN volumeConfig vc WHERE t.warehouseInFk = ac.warehouseFk AND it.workerFk = ? - AND t.shipped = ?`, - [workerFk, new Date(dated)] + AND t.shipped = util.VN_CURDATE()`, + [workerFk] ); }; };