From 304992e7cf341c563ef37ec3c8c25428fd3c093b Mon Sep 17 00:00:00 2001 From: Pako Date: Tue, 1 Oct 2024 13:40:33 +0200 Subject: [PATCH 1/5] feat: refs #8069 starting branch --- db/routines/hedera/procedures/orderRow_updateOverstocking.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 db/routines/hedera/procedures/orderRow_updateOverstocking.sql diff --git a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql new file mode 100644 index 0000000000..e69de29bb2 -- 2.40.1 From fd262e32c118354d0994eefbb5e1195d766c2c2e Mon Sep 17 00:00:00 2001 From: Pako Date: Tue, 1 Oct 2024 14:25:10 +0200 Subject: [PATCH 2/5] feat: refs #8069 new trigger hedera.orderRow_afterInsert --- db/routines/hedera/triggers/orderRow_afterInsert.sql | 10 ++++++++++ db/versions/11277-wheatChico/00-firstScript.sql | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 db/routines/hedera/triggers/orderRow_afterInsert.sql create mode 100644 db/versions/11277-wheatChico/00-firstScript.sql diff --git a/db/routines/hedera/triggers/orderRow_afterInsert.sql b/db/routines/hedera/triggers/orderRow_afterInsert.sql new file mode 100644 index 0000000000..af1a1479f8 --- /dev/null +++ b/db/routines/hedera/triggers/orderRow_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterInsert` + AFTER INSERT ON `orderRow` + FOR EACH ROW +BEGIN + UPDATE `order` + SET rowUpdated = NOW() + WHERE id = NEW.orderFk; +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/versions/11277-wheatChico/00-firstScript.sql b/db/versions/11277-wheatChico/00-firstScript.sql new file mode 100644 index 0000000000..c2b5963a41 --- /dev/null +++ b/db/versions/11277-wheatChico/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE hedera.`order` ADD IF NOT EXISTS rowUpdated DATETIME NULL + COMMENT 'Timestamp for last updated record in orderRow table'; -- 2.40.1 From 03ea7580d8d3474a2b4d8aa40cffabdf45ebcc27 Mon Sep 17 00:00:00 2001 From: Pako Date: Tue, 1 Oct 2024 15:02:24 +0200 Subject: [PATCH 3/5] feat: refs #8069 new proc --- .../orderRow_updateOverstocking.sql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql index e69de29bb2..21cdb07ac7 100644 --- a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql +++ b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql @@ -0,0 +1,26 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`orderRow_updateOverstocking`( + vWarehouseFk INT +) +BEGIN +/** +* Set amount = 0 to avoid overbooking sales +* +* @param vWarehouseFk vn.warehouse.id +*/ + DECLARE vCalcFk INT; + + CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, CURDATE()); + + UPDATE orderRow r + JOIN `order` o ON o.id = r.orderFk + JOIN orderConfig oc + JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk + SET r.amount = 0 + WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < NOW() + AND a.available <= 0 + AND r.shipment BETWEEN CURDATE() AND util.dayEnd(CURDATE()) + AND NOT o.confirmed + AND r.warehouseFk = vWarehouseFk; +END$$ +DELIMITER ; \ No newline at end of file -- 2.40.1 From 9d84c39fce036e03592ad87e2d5bf42477e4238a Mon Sep 17 00:00:00 2001 From: Pako Date: Wed, 2 Oct 2024 08:52:20 +0200 Subject: [PATCH 4/5] feat: refs #8069 orderRow_updateOverstocking --- .../orderRow_updateOverstocking.sql | 57 ++++++++++++++----- .../procedures/order_confirmWithUser.sql | 2 + 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql index 21cdb07ac7..4bd1bb981a 100644 --- a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql +++ b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql @@ -1,26 +1,53 @@ DELIMITER $$ -CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `hedera`.`orderRow_updateOverstocking`( - vWarehouseFk INT -) +CREATE OR REPLACE DEFINER=`vn`@`localhost` +PROCEDURE `hedera`.`orderRow_updateOverstocking`(vOrderFk INT) BEGIN /** * Set amount = 0 to avoid overbooking sales * -* @param vWarehouseFk vn.warehouse.id +* @param vOrderFk hedera.order.id */ DECLARE vCalcFk INT; + DECLARE vDated DATE; + DECLARE vDone BOOL; + DECLARE vWarehouseFk INT; - CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, CURDATE()); + DECLARE cWarehouses CURSOR FOR + SELECT DISTINCT warehouseFk, shipment + FROM orderRow r + WHERE r.orderFk = vOrderFk; - UPDATE orderRow r - JOIN `order` o ON o.id = r.orderFk - JOIN orderConfig oc - JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk - SET r.amount = 0 - WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < NOW() - AND a.available <= 0 - AND r.shipment BETWEEN CURDATE() AND util.dayEnd(CURDATE()) - AND NOT o.confirmed - AND r.warehouseFk = vWarehouseFk; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; + + OPEN cWarehouses; + checking: LOOP + SET vDone = FALSE; + + FETCH cWarehouses INTO vWarehouseFk, vDated; + + IF vDone THEN + LEAVE checking; + END IF; + + CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated); + + UPDATE orderRow r + JOIN `order` o ON o.id = r.orderFk + JOIN orderConfig oc + JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk + SET r.amount = 0 + WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < NOW() + AND a.available <= 0 + AND r.shipment BETWEEN CURDATE() AND util.dayEnd(CURDATE()) + AND NOT o.confirmed + AND r.warehouseFk = vWarehouseFk; + END LOOP; + CLOSE cWarehouses; END$$ DELIMITER ; \ No newline at end of file diff --git a/db/routines/hedera/procedures/order_confirmWithUser.sql b/db/routines/hedera/procedures/order_confirmWithUser.sql index 2b033b704b..17adc74dd8 100644 --- a/db/routines/hedera/procedures/order_confirmWithUser.sql +++ b/db/routines/hedera/procedures/order_confirmWithUser.sql @@ -101,6 +101,8 @@ BEGIN CALL order_checkEditable(vSelf); + CALL orderRow_updateOverstocking(vSelf); + -- Check order is not empty SELECT COUNT(*) > 0 INTO vHasRows FROM orderRow -- 2.40.1 From fc1ea280fafa739cff7926f7ddd9b1cc93c12091 Mon Sep 17 00:00:00 2001 From: Pako Date: Wed, 2 Oct 2024 14:03:57 +0200 Subject: [PATCH 5/5] fix: refs #8069 new conception --- .../orderRow_updateOverstocking.sql | 25 +++++++++---------- .../procedures/order_confirmWithUser.sql | 13 ++++++++++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql index 4bd1bb981a..ff8362c659 100644 --- a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql +++ b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql @@ -8,14 +8,14 @@ BEGIN * @param vOrderFk hedera.order.id */ DECLARE vCalcFk INT; - DECLARE vDated DATE; DECLARE vDone BOOL; DECLARE vWarehouseFk INT; DECLARE cWarehouses CURSOR FOR - SELECT DISTINCT warehouseFk, shipment - FROM orderRow r - WHERE r.orderFk = vOrderFk; + SELECT DISTINCT warehouseFk + FROM orderRow + WHERE orderFk = vOrderFk + AND shipped = util.VN_CURDATE(); DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; @@ -29,24 +29,23 @@ BEGIN checking: LOOP SET vDone = FALSE; - FETCH cWarehouses INTO vWarehouseFk, vDated; + FETCH cWarehouses INTO vWarehouseFk; IF vDone THEN LEAVE checking; END IF; - CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated); + CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, util.VN_CURDATE()); UPDATE orderRow r - JOIN `order` o ON o.id = r.orderFk - JOIN orderConfig oc - JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk + JOIN `order` o ON o.id = r.orderFk + JOIN orderConfig oc + JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk SET r.amount = 0 - WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < NOW() + WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < util.VN_NOW() AND a.available <= 0 - AND r.shipment BETWEEN CURDATE() AND util.dayEnd(CURDATE()) - AND NOT o.confirmed - AND r.warehouseFk = vWarehouseFk; + AND r.warehouseFk = vWarehouseFk + AND r.orderFk = vOrderFk; END LOOP; CLOSE cWarehouses; END$$ diff --git a/db/routines/hedera/procedures/order_confirmWithUser.sql b/db/routines/hedera/procedures/order_confirmWithUser.sql index 17adc74dd8..b3aab522e1 100644 --- a/db/routines/hedera/procedures/order_confirmWithUser.sql +++ b/db/routines/hedera/procedures/order_confirmWithUser.sql @@ -12,6 +12,7 @@ BEGIN * @param vUser The user identifier */ DECLARE vHasRows BOOL; + DECLARE vHas0Amount BOOL; DECLARE vDone BOOL; DECLARE vWarehouseFk INT; DECLARE vShipment DATE; @@ -113,6 +114,18 @@ BEGIN CALL util.throw('ORDER_EMPTY'); END IF; + -- Check if any product has a quantity of 0 + SELECT EXISTS ( + SELECT id + FROM orderRow + WHERE orderFk = vSelf + AND amount = 0 + ) INTO vHas0Amount; + + IF vHas0Amount THEN + CALL util.throw('Remove lines with quantity = 0 before confirming'); + END IF; + -- Crea los tickets del pedido OPEN vDates; lDates: LOOP -- 2.40.1