fix: update item_getMinacum procedure to include vTime parameter and adjust date calculations
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
This commit is contained in:
parent
dfe5735903
commit
68c028669d
|
@ -1,9 +1,8 @@
|
|||
DELIMITER $$
|
||||
$$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`stock_refresh`(v_refresh BOOL)
|
||||
proc: BEGIN
|
||||
/**
|
||||
* Crea o actualiza la cache con el disponible hasta el día de
|
||||
* Crea o actualiza la cache con el disponible hasta el día de
|
||||
* ayer. Esta cache es usada como base para otros procedimientos
|
||||
* como el cálculo del visible o del ATP.
|
||||
*
|
||||
|
@ -29,26 +28,26 @@ proc: BEGIN
|
|||
|
||||
SET v_date_inv = vn.getInventoryDate();
|
||||
SET vCURDATE = util.VN_CURDATE();
|
||||
|
||||
|
||||
DELETE FROM stock;
|
||||
|
||||
|
||||
INSERT INTO stock (item_id, warehouse_id, amount)
|
||||
SELECT item_id, warehouse_id, SUM(amount) amount FROM
|
||||
(
|
||||
SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount
|
||||
SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount
|
||||
FROM vn.itemTicketOut
|
||||
WHERE shipped >= v_date_inv
|
||||
WHERE shipped >= v_date_inv
|
||||
AND shipped < vCURDATE
|
||||
UNION ALL
|
||||
SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount
|
||||
SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount
|
||||
FROM vn.itemEntryIn
|
||||
WHERE availabled >= v_date_inv
|
||||
AND availabled < vCURDATE
|
||||
AND isVirtualStock is FALSE
|
||||
UNION ALL
|
||||
SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount
|
||||
SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount
|
||||
FROM vn.itemEntryOut
|
||||
WHERE shipped >= v_date_inv
|
||||
WHERE shipped >= v_date_inv
|
||||
AND shipped < vCURDATE
|
||||
) t
|
||||
GROUP BY item_id, warehouse_id HAVING amount != 0;
|
||||
|
|
|
@ -21,7 +21,7 @@ BEGIN
|
|||
**/
|
||||
|
||||
CALL `cache`.stock_refresh(vForce);
|
||||
CALL item_getMinacum(NULL, ADDTIME(util.VN_CURDATE(), vTime), vDays, NULL);
|
||||
CALL item_getMinacum(NULL, util.VN_CURDATE(), vDays, vTime, NULL);
|
||||
CALL item_getMinETD();
|
||||
CALL item_zoneClosure();
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
DELIMITER $$
|
||||
$$
|
||||
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getMinacum`(
|
||||
vWarehouseFk TINYINT,
|
||||
vAvailabled DATETIME,
|
||||
vRange INT,
|
||||
vTime TIME,
|
||||
vItemFk INT
|
||||
)
|
||||
BEGIN
|
||||
|
@ -18,7 +18,7 @@ BEGIN
|
|||
* @return tmp.itemMinacum
|
||||
*/
|
||||
DECLARE vDated DATE DEFAULT DATE(vAvailabled);
|
||||
DECLARE vDatedTo DATETIME DEFAULT util.dayEnd(vDated + INTERVAL vRange DAY);
|
||||
DECLARE vDatedTo DATETIME DEFAULT ADDTIME(util.dayEnd(vDated + INTERVAL vRange DAY), IFNULL(vTime,'00:00:00'));
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
|
||||
(INDEX (itemFk, warehouseFk))
|
||||
|
|
|
@ -14,6 +14,7 @@ BEGIN
|
|||
vWarehouseFk,
|
||||
vDateToAdvance,
|
||||
DATEDIFF(DATE_SUB(vDateFuture, INTERVAL 1 DAY), vDateToAdvance),
|
||||
NULL,
|
||||
NULL
|
||||
);
|
||||
|
||||
|
@ -115,7 +116,7 @@ BEGIN
|
|||
t.landed,
|
||||
t.agencyModeFk,
|
||||
SEC_TO_TIME(
|
||||
COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)) * 3600 +
|
||||
COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)) * 3600 +
|
||||
COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour)) * 60
|
||||
) preparation
|
||||
FROM ticket t
|
||||
|
|
|
@ -27,6 +27,7 @@ BEGIN
|
|||
vWarehouseFk,
|
||||
vNewShipped,
|
||||
DATEDIFF(DATE_SUB(vOldShipped, INTERVAL 1 DAY), DATE(vNewShipped)),
|
||||
NULL,
|
||||
NULL
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in New Issue