master #2408
|
@ -131,7 +131,8 @@ BEGIN
|
|||
|
||||
DELETE e
|
||||
FROM entry e
|
||||
JOIN tEntryToDelete tmp ON tmp.id = e.id;
|
||||
JOIN tEntryToDelete tmp ON tmp.id = e.id
|
||||
WHERE NOT e.isBooked;
|
||||
|
||||
-- borrar de route registros menores a 4 años
|
||||
CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
|
||||
|
|
|
@ -52,6 +52,10 @@ BEGIN
|
|||
|
||||
SELECT LAST_INSERT_ID() INTO vSaleFk;
|
||||
|
||||
UPDATE sale
|
||||
SET originalQuantity = 0
|
||||
WHERE id = vSaleFk;
|
||||
|
||||
CALL sale_calculateComponent(vSaleFk, NULL);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
@ -26,7 +26,7 @@ BEGIN
|
|||
FROM workerTimeControl
|
||||
WHERE userFk = vWorkerFk
|
||||
AND direction = 'middle'
|
||||
AND timed BETWEEN vLastIn AND util.VN_NOW();
|
||||
AND timed BETWEEN vLastIn AND vTimed;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
|
||||
CREATE TEMPORARY TABLE tmp.workerTimeControlDirection
|
||||
|
|
|
@ -27,8 +27,11 @@ module.exports = Self => {
|
|||
|
||||
const where = filter.where;
|
||||
const query = 'CALL vn.item_getBalance(?, ?, ?)';
|
||||
if (where?.date) {
|
||||
where.date = new Date(where.date);
|
||||
where.date.setHours(0, 0, 0, 0);
|
||||
}
|
||||
const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions);
|
||||
|
||||
for (const entry of diary)
|
||||
if (entry.clientType === 'loses') entry.highlighted = true;
|
||||
|
||||
|
|
Loading…
Reference in New Issue