From 8469b2ac3f0fbf08cdd740c72392644eaa658a59 Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 9 Jul 2024 08:24:50 +0200 Subject: [PATCH 01/23] feat: refs #7683 productionControl --- .../vn/procedures/productionControl.sql | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql index dad46393db..1b4a8e88a9 100644 --- a/db/routines/vn/procedures/productionControl.sql +++ b/db/routines/vn/procedures/productionControl.sql @@ -174,27 +174,30 @@ proc: BEGIN WHERE NOT `lines`; -- Lineas por linea de encajado + CREATE OR REPLACE TEMPORARY TABLE tItemPackingType + (PRIMARY KEY(ticketFk)) + ENGINE = MEMORY + SELECT ticketFk, + SUM(sub.H) H, + SUM(sub.V) V, + SUM(sub.N) N + FROM ( + SELECT t.ticketFk, + SUM(i.itemPackingTypeFk = 'H') H, + SUM(i.itemPackingTypeFk = 'V') V, + SUM(i.itemPackingTypeFk IS NULL) N + FROM tmp.productionTicket t + JOIN sale s ON s.ticketFk = t.ticketFk + JOIN item i ON i.id = s.itemFk + GROUP BY t.ticketFk, i.itemPackingTypeFk + ) sub + GROUP BY ticketFk; + UPDATE tmp.productionBuffer pb - JOIN ( - SELECT ticketFk, - SUM(sub.H) H, - SUM(sub.V) V, - SUM(sub.N) N - FROM ( - SELECT t.ticketFk, - SUM(i.itemPackingTypeFk = 'H') H, - SUM(i.itemPackingTypeFk = 'V') V, - SUM(i.itemPackingTypeFk IS NULL) N - FROM tmp.productionTicket t - JOIN sale s ON s.ticketFk = t.ticketFk - JOIN item i ON i.id = s.itemFk - GROUP BY t.ticketFk, i.itemPackingTypeFk - ) sub - GROUP BY ticketFk - ) sub2 ON sub2.ticketFk = pb.ticketFk - SET pb.H = sub2.H, - pb.V = sub2.V, - pb.N = sub2.N; + JOIN tItemPackingType ti ON ti.ticketFk = pb.ticketFk + SET pb.H = ti.H, + pb.V = ti.V, + pb.N = ti.N; -- Colecciones segun tipo de encajado UPDATE tmp.productionBuffer pb From 94470915daf97f387269ad9fe011344776c7ab3c Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 15 Jul 2024 08:21:54 +0200 Subject: [PATCH 02/23] feat: redirect to lilium page not found --- front/salix/routes.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/front/salix/routes.js b/front/salix/routes.js index be210b7497..ee3a9cd10f 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -4,7 +4,14 @@ import getMainRoute from 'core/lib/get-main-route'; config.$inject = ['$stateProvider', '$urlRouterProvider']; function config($stateProvider, $urlRouterProvider) { $urlRouterProvider - .otherwise('/'); + .otherwise(async($injector, {$location}) => { + const url = $location.$$absUrl + .replace('5000', '9000') + .replace('salix', 'lilium') + .replace('#!', '#') + .replace('client', 'customer'); + window.location.href = url; + }); $stateProvider .state('layout', { From 8d61cb762bf33c725c98892cce2ea1028ab1e2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Mon, 15 Jul 2024 17:53:23 +0200 Subject: [PATCH 03/23] feat: tabla config dias margen vctos. refs #7728 --- db/routines/vn/procedures/invoiceInDueDay_calculate.sql | 9 ++++++--- db/versions/11155-purpleMoss/00-firstScript.sql | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 db/versions/11155-purpleMoss/00-firstScript.sql diff --git a/db/routines/vn/procedures/invoiceInDueDay_calculate.sql b/db/routines/vn/procedures/invoiceInDueDay_calculate.sql index e51b5f64d2..7929bee6f8 100644 --- a/db/routines/vn/procedures/invoiceInDueDay_calculate.sql +++ b/db/routines/vn/procedures/invoiceInDueDay_calculate.sql @@ -1,5 +1,7 @@ DELIMITER $$ -CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInDueDay_calculate`(vInvoiceInFk INT) +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInDueDay_calculate`( +vInvoiceInFk INT +) BEGIN /** * Calcula los vctos. de una factura recibida @@ -56,12 +58,13 @@ BEGIN COUNT(DISTINCT(pdd.detail)) cont, s.payDay, ii.issued, - DATE(ii.created) + INTERVAL 2 DAY created + DATE(ii.created) + INTERVAL iic.dueDateMarginDays DAY created FROM invoiceIn ii JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id LEFT JOIN sage.TiposIva ti ON ti.CodigoIva= iit.taxTypeSageFk JOIN supplier s ON s.id = ii.supplierFk - JOIN payDemDetail pdd ON pdd.id = s.payDemFk + JOIN payDemDetail pdd ON pdd.id = s.payDemFk + JOIN invoiceInConfig iic WHERE ii.id = vInvoiceInFk GROUP BY ii.id )sub diff --git a/db/versions/11155-purpleMoss/00-firstScript.sql b/db/versions/11155-purpleMoss/00-firstScript.sql new file mode 100644 index 0000000000..fec63b1934 --- /dev/null +++ b/db/versions/11155-purpleMoss/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.invoiceInConfig + ADD dueDateMarginDays INT UNSIGNED DEFAULT 2 NULL; From c17214ce05e07f58562a0d4c3ac7e1bef8952e59 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 18 Jul 2024 11:50:01 +0200 Subject: [PATCH 04/23] feat: refs #7683 drop temporary table --- db/routines/vn/procedures/productionControl.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql index 1b4a8e88a9..ad14341895 100644 --- a/db/routines/vn/procedures/productionControl.sql +++ b/db/routines/vn/procedures/productionControl.sql @@ -199,6 +199,8 @@ proc: BEGIN pb.V = ti.V, pb.N = ti.N; + DROP TEMPORARY TABLE tItemPackingType; + -- Colecciones segun tipo de encajado UPDATE tmp.productionBuffer pb JOIN ticketCollection tc ON pb.ticketFk = tc.ticketFk From 15adc59ec5f006ae74a771bc0b8faa3036178f4f Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 18 Jul 2024 12:04:17 +0200 Subject: [PATCH 05/23] feat: refs #7683 drop temporary table --- db/routines/vn/procedures/productionControl.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql index ad14341895..af6d929d7d 100644 --- a/db/routines/vn/procedures/productionControl.sql +++ b/db/routines/vn/procedures/productionControl.sql @@ -199,8 +199,6 @@ proc: BEGIN pb.V = ti.V, pb.N = ti.N; - DROP TEMPORARY TABLE tItemPackingType; - -- Colecciones segun tipo de encajado UPDATE tmp.productionBuffer pb JOIN ticketCollection tc ON pb.ticketFk = tc.ticketFk @@ -278,6 +276,7 @@ proc: BEGIN tmp.risk, tmp.ticket_problems, tmp.ticketWithPrevia, - tItemShelvingStock; + tItemShelvingStock, + tItemPackingType; END$$ DELIMITER ; From bfc2d6f73422069c16d746db10fc4d6165d99209 Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 23 Jul 2024 11:38:05 +0200 Subject: [PATCH 06/23] feat: refs #7716 travel_setDelivered --- db/routines/vn/events/travel_setDelivered.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 db/routines/vn/events/travel_setDelivered.sql diff --git a/db/routines/vn/events/travel_setDelivered.sql b/db/routines/vn/events/travel_setDelivered.sql new file mode 100644 index 0000000000..769ee9d24a --- /dev/null +++ b/db/routines/vn/events/travel_setDelivered.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`travel_setDelivered` + ON SCHEDULE EVERY 1 DAY + STARTS '2024-07-12 00:10:00.000' + ON COMPLETION PRESERVE + ENABLE +DO BEGIN + UPDATE travel t + SET t.isDelivered = TRUE + WHERE t.shipped < util.VN_CURDATE(); +END$$ +DELIMITER ; From 80b338228ebc85d65719d726ac208a25320c55a9 Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 23 Jul 2024 12:29:08 +0200 Subject: [PATCH 07/23] fix: refs #6403 take observation from ticket --- back/methods/mrw-config/createShipment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js index 4db0d0c7de..8a0eb58b31 100644 --- a/back/methods/mrw-config/createShipment.js +++ b/back/methods/mrw-config/createShipment.js @@ -53,7 +53,7 @@ module.exports = Self => { CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference, LPAD(IF(mw.serviceType IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth, '0') serviceType, IF(mw.weekdays, 'S', 'N') weekDays, - oa.description deliveryObservation + ta.description deliveryObservation FROM expedition e JOIN ticket t ON e.ticketFk = t.id JOIN agencyMode am ON am.id = t.agencyModeFk @@ -62,8 +62,8 @@ module.exports = Self => { AND mw.weekDays & (1 << WEEKDAY(t.landed)) JOIN client c ON t.clientFk = c.id JOIN address a ON t.addressFk = a.id - LEFT JOIN addressObservation oa ON oa.addressFk = a.id - AND oa.observationTypeFk IN (SELECT id FROM observationType ot WHERE ot.code = 'delivery') + LEFT JOIN ticketObservation ta ON ta.ticketFk = t.id + AND ta.observationTypeFk IN (SELECT id FROM observationType ot WHERE ot.code = 'delivery') JOIN province p ON a.provinceFk = p.id JOIN country co ON co.id = p.countryFk JOIN mrwConfig mc From 88724d6d8c4810ea9b798b030466e53df3984ad5 Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 23 Jul 2024 13:08:49 +0200 Subject: [PATCH 08/23] fix: refs #7505 visible_refresh support warehouse null --- db/routines/cache/procedures/visible_refresh.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/routines/cache/procedures/visible_refresh.sql b/db/routines/cache/procedures/visible_refresh.sql index 78d23dbfbc..e1b40ec10c 100644 --- a/db/routines/cache/procedures/visible_refresh.sql +++ b/db/routines/cache/procedures/visible_refresh.sql @@ -22,7 +22,7 @@ proc:BEGIN ENGINE = MEMORY SELECT item_id, amount stock, amount visible FROM cache.stock - WHERE warehouse_id = v_warehouse; + WHERE (warehouse_id IS NULL OR warehouse_id = v_warehouse); -- Calculamos los movimientos confirmados de hoy CALL vn.item_calcVisible(NULL, v_warehouse); From bdfaf02c959bfaa95ee4d31994e8f08fc729bf13 Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 23 Jul 2024 13:36:52 +0200 Subject: [PATCH 09/23] fix: refs #6403 fix delivery observation --- back/methods/mrw-config/createShipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js index 8a0eb58b31..3b91f44863 100644 --- a/back/methods/mrw-config/createShipment.js +++ b/back/methods/mrw-config/createShipment.js @@ -63,7 +63,7 @@ module.exports = Self => { JOIN client c ON t.clientFk = c.id JOIN address a ON t.addressFk = a.id LEFT JOIN ticketObservation ta ON ta.ticketFk = t.id - AND ta.observationTypeFk IN (SELECT id FROM observationType ot WHERE ot.code = 'delivery') + AND ta.observationTypeFk IN (SELECT id FROM observationType ot WHERE ot.code = 'agency') JOIN province p ON a.provinceFk = p.id JOIN country co ON co.id = p.countryFk JOIN mrwConfig mc From eb18bd2400ccd0e27d721b41c297803b84dfebd3 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 23 Jul 2024 13:57:14 +0200 Subject: [PATCH 10/23] fix: without path --- front/salix/routes.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/front/salix/routes.js b/front/salix/routes.js index ee3a9cd10f..37247d93ff 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -5,6 +5,8 @@ config.$inject = ['$stateProvider', '$urlRouterProvider']; function config($stateProvider, $urlRouterProvider) { $urlRouterProvider .otherwise(async($injector, {$location}) => { + if (!$location.$$path) return window.location.href = '/#!/'; + const url = $location.$$absUrl .replace('5000', '9000') .replace('salix', 'lilium') From 5d2e9c6210bf511990848b98637e7272ffaf2d7b Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 23 Jul 2024 13:59:36 +0200 Subject: [PATCH 11/23] fix: refs #7505 visible_refresh support warehouse null and added isComparative --- .../cache/procedures/visible_refresh.sql | 5 +-- .../vn/procedures/item_calcVisible.sql | 36 +++++++++++-------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/db/routines/cache/procedures/visible_refresh.sql b/db/routines/cache/procedures/visible_refresh.sql index e1b40ec10c..053da1d14d 100644 --- a/db/routines/cache/procedures/visible_refresh.sql +++ b/db/routines/cache/procedures/visible_refresh.sql @@ -20,9 +20,10 @@ proc:BEGIN CREATE OR REPLACE TEMPORARY TABLE tmp.itemVisible (PRIMARY KEY (item_id)) ENGINE = MEMORY - SELECT item_id, amount stock, amount visible + SELECT item_id, SUM(amount) stock, SUM(amount) visible FROM cache.stock - WHERE (warehouse_id IS NULL OR warehouse_id = v_warehouse); + WHERE (v_warehouse IS NULL OR warehouse_id = v_warehouse) + GROUP BY item_id; -- Calculamos los movimientos confirmados de hoy CALL vn.item_calcVisible(NULL, v_warehouse); diff --git a/db/routines/vn/procedures/item_calcVisible.sql b/db/routines/vn/procedures/item_calcVisible.sql index 820e73a7e2..2ce663d80a 100644 --- a/db/routines/vn/procedures/item_calcVisible.sql +++ b/db/routines/vn/procedures/item_calcVisible.sql @@ -21,6 +21,8 @@ BEGIN FROM itemTicketOut i LEFT JOIN ticketState ts ON ts.ticketFk = i.ticketFk JOIN `state` s ON s.id = ts.stateFk + JOIN warehouse w ON w.id = i.warehouseFk + AND w.isComparative LEFT JOIN ( SELECT DISTINCT st.saleFk FROM saleTracking st @@ -28,26 +30,30 @@ BEGIN WHERE st.created > vDated AND (s.isPicked OR st.isChecked) ) stPrevious ON `stPrevious`.`saleFk` = i.saleFk - WHERE IFNULL(vWarehouseFk, i.warehouseFk) = i.warehouseFk + WHERE (vWarehouseFk IS NULL OR i.warehouseFk = vWarehouseFk) AND (vSelf IS NULL OR i.itemFk = vSelf) AND (s.isPicked OR i.reserved OR stPrevious.saleFk) AND i.shipped >= vDated AND i.shipped < vTomorrow UNION ALL - SELECT itemFk, quantity - FROM itemEntryIn - WHERE isReceived - AND landed >= vDated AND landed < vTomorrow - AND IFNULL(vWarehouseFk, warehouseInFk) = warehouseInFk - AND (vSelf IS NULL OR itemFk = vSelf) - AND NOT isVirtualStock + SELECT iei.itemFk, iei.quantity + FROM itemEntryIn iei + JOIN warehouse w ON w.id = iei.warehouseInFk + AND w.isComparative + WHERE iei.isReceived + AND iei.landed >= vDated AND iei.landed < vTomorrow + AND (vWarehouseFk IS NULL OR iei.warehouseInFk = vWarehouseFk) + AND (vSelf IS NULL OR iei.itemFk = vSelf) + AND NOT iei.isVirtualStock UNION ALL - SELECT itemFk, quantity - FROM itemEntryOut - WHERE isDelivered - AND shipped >= vDated - AND shipped < vTomorrow - AND IFNULL(vWarehouseFk, warehouseOutFk) = warehouseOutFk - AND (vSelf IS NULL OR itemFk = vSelf) + SELECT ieo.itemFk, ieo.quantity + FROM itemEntryOut ieo + JOIN warehouse w ON w.id = ieo.warehouseOutFk + AND w.isComparative + WHERE ieo.isDelivered + AND ieo.shipped >= vDated + AND ieo.shipped < vTomorrow + AND (vWarehouseFk IS NULL OR ieo.warehouseOutFk = vWarehouseFk) + AND (vSelf IS NULL OR ieo.itemFk = vSelf) ) t GROUP BY itemFk ON DUPLICATE KEY UPDATE From a9aa47fef1aa194145cbe93260a2618ec365702b Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 23 Jul 2024 14:17:01 +0200 Subject: [PATCH 12/23] fix: refs #7505 visible_refresh support warehouse null and added isComparative --- db/routines/cache/procedures/visible_refresh.sql | 10 ++++++---- db/routines/vn/procedures/item_calcVisible.sql | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/db/routines/cache/procedures/visible_refresh.sql b/db/routines/cache/procedures/visible_refresh.sql index 053da1d14d..d7c5c37386 100644 --- a/db/routines/cache/procedures/visible_refresh.sql +++ b/db/routines/cache/procedures/visible_refresh.sql @@ -20,10 +20,12 @@ proc:BEGIN CREATE OR REPLACE TEMPORARY TABLE tmp.itemVisible (PRIMARY KEY (item_id)) ENGINE = MEMORY - SELECT item_id, SUM(amount) stock, SUM(amount) visible - FROM cache.stock - WHERE (v_warehouse IS NULL OR warehouse_id = v_warehouse) - GROUP BY item_id; + SELECT s.item_id, SUM(s.amount) stock, SUM(s.amount) visible + FROM cache.stock s + JOIN warehouse w ON w.id = s.warehouse_id + WHERE (v_warehouse IS NULL OR s.warehouse_id = v_warehouse) + AND w.isComparative + GROUP BY s.item_id; -- Calculamos los movimientos confirmados de hoy CALL vn.item_calcVisible(NULL, v_warehouse); diff --git a/db/routines/vn/procedures/item_calcVisible.sql b/db/routines/vn/procedures/item_calcVisible.sql index 2ce663d80a..32adfdfa32 100644 --- a/db/routines/vn/procedures/item_calcVisible.sql +++ b/db/routines/vn/procedures/item_calcVisible.sql @@ -22,7 +22,6 @@ BEGIN LEFT JOIN ticketState ts ON ts.ticketFk = i.ticketFk JOIN `state` s ON s.id = ts.stateFk JOIN warehouse w ON w.id = i.warehouseFk - AND w.isComparative LEFT JOIN ( SELECT DISTINCT st.saleFk FROM saleTracking st @@ -34,26 +33,27 @@ BEGIN AND (vSelf IS NULL OR i.itemFk = vSelf) AND (s.isPicked OR i.reserved OR stPrevious.saleFk) AND i.shipped >= vDated AND i.shipped < vTomorrow + AND w.isComparative UNION ALL SELECT iei.itemFk, iei.quantity FROM itemEntryIn iei JOIN warehouse w ON w.id = iei.warehouseInFk - AND w.isComparative WHERE iei.isReceived AND iei.landed >= vDated AND iei.landed < vTomorrow AND (vWarehouseFk IS NULL OR iei.warehouseInFk = vWarehouseFk) AND (vSelf IS NULL OR iei.itemFk = vSelf) AND NOT iei.isVirtualStock + AND w.isComparative UNION ALL SELECT ieo.itemFk, ieo.quantity FROM itemEntryOut ieo JOIN warehouse w ON w.id = ieo.warehouseOutFk - AND w.isComparative WHERE ieo.isDelivered AND ieo.shipped >= vDated AND ieo.shipped < vTomorrow AND (vWarehouseFk IS NULL OR ieo.warehouseOutFk = vWarehouseFk) AND (vSelf IS NULL OR ieo.itemFk = vSelf) + AND w.isComparative ) t GROUP BY itemFk ON DUPLICATE KEY UPDATE From abfbf13440deec47bfb63e6e3eec84454099cf2a Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 23 Jul 2024 14:18:52 +0200 Subject: [PATCH 13/23] fix: refs #7505 fix --- db/routines/cache/procedures/visible_refresh.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/routines/cache/procedures/visible_refresh.sql b/db/routines/cache/procedures/visible_refresh.sql index d7c5c37386..a673969d2d 100644 --- a/db/routines/cache/procedures/visible_refresh.sql +++ b/db/routines/cache/procedures/visible_refresh.sql @@ -21,8 +21,8 @@ proc:BEGIN (PRIMARY KEY (item_id)) ENGINE = MEMORY SELECT s.item_id, SUM(s.amount) stock, SUM(s.amount) visible - FROM cache.stock s - JOIN warehouse w ON w.id = s.warehouse_id + FROM stock s + JOIN vn.warehouse w ON w.id = s.warehouse_id WHERE (v_warehouse IS NULL OR s.warehouse_id = v_warehouse) AND w.isComparative GROUP BY s.item_id; From 4f321340017a13f0fdbd0325b656c31aa532d808 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 23 Jul 2024 14:19:20 +0200 Subject: [PATCH 14/23] add prefix --- front/salix/routes.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/front/salix/routes.js b/front/salix/routes.js index 37247d93ff..2c6f1b848a 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -5,12 +5,13 @@ config.$inject = ['$stateProvider', '$urlRouterProvider']; function config($stateProvider, $urlRouterProvider) { $urlRouterProvider .otherwise(async($injector, {$location}) => { - if (!$location.$$path) return window.location.href = '/#!/'; + const prefix = '#!'; + if (!$location.$$path) return window.location.href = `/${prefix}/`; const url = $location.$$absUrl .replace('5000', '9000') .replace('salix', 'lilium') - .replace('#!', '#') + .replace(prefix, '#') .replace('client', 'customer'); window.location.href = url; }); From 1a3ed42bcde938b670e273f4779ecef36ce9e27b Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 23 Jul 2024 14:37:34 +0200 Subject: [PATCH 15/23] fix: defaulter filter correct sql --- modules/client/back/methods/defaulter/filter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js index 0bfa7659b8..40756b2369 100644 --- a/modules/client/back/methods/defaulter/filter.js +++ b/modules/client/back/methods/defaulter/filter.js @@ -85,6 +85,7 @@ module.exports = Self => { LEFT JOIN ( SELECT MAX(started), clientFk, finished FROM recovery + GROUP BY clientFk ) r ON r.clientFk = c.id LEFT JOIN workerDepartment wd ON wd.workerFk = u.id JOIN department dp ON dp.id = wd.departmentFk From 2086746eb058780714ade871828392edf39e6c16 Mon Sep 17 00:00:00 2001 From: guillermo Date: Wed, 24 Jul 2024 07:34:52 +0200 Subject: [PATCH 16/23] fix: refs #7505 Visible COM --- db/routines/vn/procedures/multipleInventory.sql | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/db/routines/vn/procedures/multipleInventory.sql b/db/routines/vn/procedures/multipleInventory.sql index 6cd584c6e5..dc34f040ea 100644 --- a/db/routines/vn/procedures/multipleInventory.sql +++ b/db/routines/vn/procedures/multipleInventory.sql @@ -75,13 +75,6 @@ proc: BEGIN ) sub GROUP BY itemFk; - UPDATE tmp.itemInventory ai - JOIN tItemInventoryCalc iic ON iic.itemFk = ai.id - SET ai.inventory = iic.quantity, - ai.visible = iic.quantity, - ai.avalaible = iic.quantity, - ai.sd = iic.quantity; - -- Cálculo del visible CALL cache.visible_refresh(vCalcFk, FALSE, vWarehouseFk); @@ -93,8 +86,12 @@ proc: BEGIN WHERE calc_id = vCalcFk; UPDATE tmp.itemInventory it + JOIN tItemInventoryCalc iic ON iic.itemFk = it.id JOIN tItemVisibleCalc ivc ON ivc.item_id = it.id - SET it.visible = it.visible + ivc.visible; + SET it.inventory = iic.quantity, + it.visible = ivc.visible, + it.avalaible = iic.quantity, + it.sd = iic.quantity; -- Calculo del disponible CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc From 0c51a97a17ae13d98804824e7635c1d80b7aa28c Mon Sep 17 00:00:00 2001 From: guillermo Date: Wed, 24 Jul 2024 09:13:47 +0200 Subject: [PATCH 17/23] refactor: refs #7640 Multipleinventory available --- .../vn/procedures/multipleInventory.sql | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/db/routines/vn/procedures/multipleInventory.sql b/db/routines/vn/procedures/multipleInventory.sql index dc34f040ea..582baf4dd2 100644 --- a/db/routines/vn/procedures/multipleInventory.sql +++ b/db/routines/vn/procedures/multipleInventory.sql @@ -139,31 +139,35 @@ proc: BEGIN CALL item_getAtp(vDate); CALL travel_upcomingArrivals(vWarehouseFk, vDate); - UPDATE tmp.itemInventory ai - JOIN ( - SELECT it.itemFk, - SUM(it.quantity) quantity, - im.quantity minQuantity - FROM tmp.itemCalc it - JOIN tmp.itemAtp im ON im.itemFk = it.itemFk - JOIN item i ON i.id = it.itemFk - LEFT JOIN origin o ON o.id = i.originFk - LEFT JOIN tmp.itemTravel t ON t.wh = o.warehouseFk - WHERE it.dated < IF(vMaxDays < 0 AND t.landing IS NOT NULL, - t.landing, - vDateToTomorrow) - GROUP BY it.itemFk - ) sub ON sub.itemFk = ai.id - SET ai.avalaible = IF(sub.minQuantity > 0, - ai.avalaible, - ai.avalaible + sub.minQuantity), - ai.sd = ai.inventory + sub.quantity; + CREATE OR REPLACE TEMPORARY TABLE tItemAvailableCalc + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT it.itemFk, + SUM(it.quantity) quantity, + im.quantity minQuantity + FROM tmp.itemCalc it + JOIN tmp.itemAtp im ON im.itemFk = it.itemFk + JOIN item i ON i.id = it.itemFk + LEFT JOIN origin o ON o.id = i.originFk + LEFT JOIN tmp.itemTravel t ON t.wh = o.warehouseFk + WHERE it.dated < IF(vMaxDays < 0 AND t.landing IS NOT NULL, + t.landing, + vDateToTomorrow) + GROUP BY it.itemFk; + + UPDATE tmp.itemInventory it + JOIN tItemAvailableCalc iac ON iac.itemFk = it.id + SET it.avalaible = IF(iac.minQuantity > 0, + it.avalaible, + it.avalaible + iac.minQuantity), + it.sd = it.inventory + iac.quantity; DROP TEMPORARY TABLE tmp.itemTravel, tmp.itemCalc, tmp.itemAtp, tItemInventoryCalc, - tItemVisibleCalc; + tItemVisibleCalc, + tItemAvailableCalc; END$$ DELIMITER ; From db31ac3b60660e557186b65f38364c82eba14dfd Mon Sep 17 00:00:00 2001 From: guillermo Date: Wed, 24 Jul 2024 09:39:33 +0200 Subject: [PATCH 18/23] fix: refs #7662 ticket_splitItemPackingType --- db/routines/vn/procedures/ticket_splitItemPackingType.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/routines/vn/procedures/ticket_splitItemPackingType.sql b/db/routines/vn/procedures/ticket_splitItemPackingType.sql index c2ec50fd95..5ae9fb9bc5 100644 --- a/db/routines/vn/procedures/ticket_splitItemPackingType.sql +++ b/db/routines/vn/procedures/ticket_splitItemPackingType.sql @@ -1,7 +1,7 @@ DELIMITER $$ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_splitItemPackingType`( vSelf INT, - vItemPackingTypeFk VARCHAR(1) + vOriginalItemPackingTypeFk VARCHAR(1) ) BEGIN /** @@ -9,7 +9,7 @@ BEGIN * Respeta el id inicial para el tipo propuesto. * * @param vSelf Id ticket - * @param vItemPackingTypeFk Tipo para el que se reserva el número de ticket original + * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk) */ DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H'; @@ -23,7 +23,7 @@ BEGIN SELECT itemPackingTypeFk FROM tSaleGroup WHERE itemPackingTypeFk IS NOT NULL - ORDER BY (itemPackingTypeFk = vItemPackingTypeFk) DESC; + ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; From c0664fd1af1abcd29a3df04bd5fd6d2abd388ecf Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Jul 2024 10:05:29 +0200 Subject: [PATCH 19/23] hotFix_liliumRedirection --- front/salix/routes.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/front/salix/routes.js b/front/salix/routes.js index be210b7497..2c6f1b848a 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -4,7 +4,17 @@ import getMainRoute from 'core/lib/get-main-route'; config.$inject = ['$stateProvider', '$urlRouterProvider']; function config($stateProvider, $urlRouterProvider) { $urlRouterProvider - .otherwise('/'); + .otherwise(async($injector, {$location}) => { + const prefix = '#!'; + if (!$location.$$path) return window.location.href = `/${prefix}/`; + + const url = $location.$$absUrl + .replace('5000', '9000') + .replace('salix', 'lilium') + .replace(prefix, '#') + .replace('client', 'customer'); + window.location.href = url; + }); $stateProvider .state('layout', { From e3f4cd293f9c643afd42fc8158e164a878715e31 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Jul 2024 10:07:44 +0200 Subject: [PATCH 20/23] hotFix: liliumRedirection --- front/salix/routes.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/front/salix/routes.js b/front/salix/routes.js index be210b7497..2c6f1b848a 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -4,7 +4,17 @@ import getMainRoute from 'core/lib/get-main-route'; config.$inject = ['$stateProvider', '$urlRouterProvider']; function config($stateProvider, $urlRouterProvider) { $urlRouterProvider - .otherwise('/'); + .otherwise(async($injector, {$location}) => { + const prefix = '#!'; + if (!$location.$$path) return window.location.href = `/${prefix}/`; + + const url = $location.$$absUrl + .replace('5000', '9000') + .replace('salix', 'lilium') + .replace(prefix, '#') + .replace('client', 'customer'); + window.location.href = url; + }); $stateProvider .state('layout', { From ebac41603448d2af178184563f4f34835b6b4b66 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Jul 2024 12:03:47 +0200 Subject: [PATCH 21/23] remove console.log --- back/methods/mrw-config/cancelShipment.js | 1 - 1 file changed, 1 deletion(-) diff --git a/back/methods/mrw-config/cancelShipment.js b/back/methods/mrw-config/cancelShipment.js index 0efd00874a..56d2065290 100644 --- a/back/methods/mrw-config/cancelShipment.js +++ b/back/methods/mrw-config/cancelShipment.js @@ -37,7 +37,6 @@ module.exports = Self => { }); const xmlString = response.data; - console.log('xmlString: ', xmlString); const parser = new DOMParser(); const xmlDoc = parser.parseFromString(xmlString, 'text/xml'); const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent; From 808c09643f6fa1fae611a131fc16c38c44700e32 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 Jul 2024 12:05:26 +0200 Subject: [PATCH 22/23] remove console.log --- back/methods/mrw-config/cancelShipment.js | 1 - 1 file changed, 1 deletion(-) diff --git a/back/methods/mrw-config/cancelShipment.js b/back/methods/mrw-config/cancelShipment.js index 0efd00874a..56d2065290 100644 --- a/back/methods/mrw-config/cancelShipment.js +++ b/back/methods/mrw-config/cancelShipment.js @@ -37,7 +37,6 @@ module.exports = Self => { }); const xmlString = response.data; - console.log('xmlString: ', xmlString); const parser = new DOMParser(); const xmlDoc = parser.parseFromString(xmlString, 'text/xml'); const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent; From 983d66a681e7d0918ac8d12f30be907ebac57647 Mon Sep 17 00:00:00 2001 From: guillermo Date: Wed, 24 Jul 2024 14:24:06 +0200 Subject: [PATCH 23/23] feat: refs #7728 Added throw due date --- db/routines/vn/procedures/duaInvoiceInBooking.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/db/routines/vn/procedures/duaInvoiceInBooking.sql b/db/routines/vn/procedures/duaInvoiceInBooking.sql index 10c0714e5c..80166db62c 100644 --- a/db/routines/vn/procedures/duaInvoiceInBooking.sql +++ b/db/routines/vn/procedures/duaInvoiceInBooking.sql @@ -12,6 +12,7 @@ BEGIN DECLARE vInvoiceFk INT; DECLARE vBookEntry INT; DECLARE vFiscalYear INT; + DECLARE vIncorrectInvoiceInDueDay INT; DECLARE vInvoicesIn CURSOR FOR SELECT DISTINCT e.invoiceInFk @@ -24,6 +25,19 @@ BEGIN DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + SELECT GROUP_CONCAT(ii.id) INTO vIncorrectInvoiceInDueDay + FROM invoiceInDueDay iidd + JOIN invoiceIn ii ON iidd.invoiceInFk = ii.id + JOIN `entry` e ON e.invoiceInFk = ii.id + JOIN duaEntry de ON de.entryFk = e.id + JOIN invoiceInConfig iic + WHERE de.duaFk = vDuaFk + AND iidd.dueDated <= util.VN_CURDATE() + INTERVAL iic.dueDateMarginDays DAY; + + IF vIncorrectInvoiceInDueDay THEN + CALL util.throw(CONCAT('Incorrect due date, invoice: ', vIncorrectInvoiceInDueDay)); + END IF; + UPDATE invoiceIn ii JOIN entry e ON e.invoiceInFk = ii.id JOIN duaEntry de ON de.entryFk = e.id