verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

fix: rutasAnalyzeHotFix #2119

Merged
robert merged 30 commits from rutasAnalyzeHotFix into master 2024-03-07 07:21:47 +00:00
Conversation 0 Commits 30 Files Changed 2 +83 -54
1 changed files with 83 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9992a8b4ff - Show all commits

131
db/routines/vn/procedures/itemProposal.sql
View File

@ -1,42 +1,68 @@
DELIMITER $$ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL) CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(
vSelf INT,
vTicketFk INT,
vShowType BOOL
)
BEGIN BEGIN
/** /**
* Propone articulos disponible ordenado, con la cantidad de veces usado y segun sus caracteristicas * Propone articulos disponibles ordenados, con la cantidad
* de veces usado y segun sus caracteristicas.
* *
* @param vItemFk item id * @param vSelf Id de artículo
* @param vTicketFk ticket id * @param vTicketFk Id de ticket
* @param vShowType mostrar tipos * @param vShowType Mostrar tipos
*/ */
DECLARE vWarehouseFk INT; DECLARE vWarehouseFk INT;
DECLARE vShipped DATE; DECLARE vShipped DATE;
DECLARE vCalcFk INT; DECLARE vCalcFk INT;
DECLARE vTypeFk INT; DECLARE vTypeFk INT;
DECLARE vPriority INT DEFAULT 1;
DECLARE vTag1 VARCHAR(25); DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vTag5 VARCHAR(25); DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vTag6 VARCHAR(25); DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vTag7 VARCHAR(25); DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vTag8 VARCHAR(25); DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vValue1 VARCHAR(50); DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vValue5 VARCHAR(50); DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vValue6 VARCHAR(50); DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vValue7 VARCHAR(50); DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vValue8 VARCHAR(50); DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped SELECT warehouseFk, shipped
FROM vn.ticket INTO vWarehouseFk, vShipped
FROM ticket
WHERE id = vTicketFk; WHERE id = vTicketFk;
SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value SELECT typeFk,
INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1 tag5,
FROM vn.item i value5,
LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1 tag6,
LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk value6,
WHERE i.id = vItemFk; tag7,
value7,
tag8,
value8,
t.name,
it.value
INTO vTypeFk,
vTag5,
vValue5,
vTag6,
vValue6,
vTag7,
vValue7,
vTag8,
vValue8,
vTag1,
vValue1
FROM item i
LEFT JOIN itemTag it ON it.itemFk = i.id
AND it.priority = vPriority
LEFT JOIN tag t ON t.id = it.tagFk
WHERE i.id = vSelf;
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped); CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
@ -45,43 +71,46 @@ BEGIN
i.subName, i.subName,
i.tag5, i.tag5,
i.value5, i.value5,
(i.value5 <=> vValue5 COLLATE utf8_general_ci) match5, (i.value5 <=> vValue5) match5,
i.tag6, i.tag6,
i.value6, i.value6,
(i.value6 <=> vValue6 COLLATE utf8_general_ci) match6, (i.value6 <=> vValue6) match6,
i.tag7, i.tag7,
i.value7, i.value7,
(i.value7 <=> vValue7 COLLATE utf8_general_ci) match7, (i.value7 <=> vValue7) match7,
i.tag8, i.tag8,
i.value8, i.value8,
(i.value8 <=> vValue8 COLLATE utf8_general_ci) match8, (i.value8 <=> vValue8) match8,
a.available, a.available,
IFNULL(ip.counter,0) counter, IFNULL(ip.counter, 0) `counter`,
IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity, IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
iss.visible located iss.visible located
FROM item i FROM item i
JOIN cache.available a ON a.item_id = i.id JOIN cache.available a ON a.item_id = i.id
LEFT JOIN itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk LEFT JOIN itemProposal ip ON ip.mateFk = i.id
LEFT JOIN itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1 AND ip.itemFk = vSelf
LEFT JOIN tag t1 ON t1.id = it1.tagFk LEFT JOIN itemTag it ON it.itemFk = i.id
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk AND it.priority = vPriority
LEFT JOIN tag t ON t.id = it.tagFk
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
AND lb.warehouse_id = vWarehouseFk
LEFT JOIN buy b ON b.id = lb.buy_id LEFT JOIN buy b ON b.id = lb.buy_id
LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id AND iss.warehouseFk = vWarehouseFk LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
AND iss.warehouseFk = vWarehouseFk
WHERE a.calc_id = vCalcFk WHERE a.calc_id = vCalcFk
AND available > 0 AND a.available > 0
AND IF(vShowType,i.typeFk = vTypeFk,true) AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
AND i.id != vItemFk AND i.id <> vSelf
ORDER BY counter DESC, ORDER BY `counter` DESC,
(t1.name = vTag1 COLLATE utf8_general_ci) DESC, (t.name = vTag1) DESC,
(it1.value = vValue1 COLLATE utf8_general_ci) DESC, (it.value = vValue1) DESC,
(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC, (i.tag5 = vTag5) DESC,
(i.value5 = vValue5 COLLATE utf8_general_ci) DESC, match5 DESC,
(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC, (i.tag6 = vTag6) DESC,
(i.value6 = vValue6 COLLATE utf8_general_ci) DESC, match6 DESC,
(i.tag7 = vTag7 COLLATE utf8_general_ci) DESC, (i.tag7 = vTag7) DESC,
(i.value7 = vValue7 COLLATE utf8_general_ci) DESC, match7 DESC,
(i.tag8 = vTag8 COLLATE utf8_general_ci) DESC, (i.tag8 = vTag8) DESC,
(i.value8 = vValue8 COLLATE utf8_general_ci) DESC; match8 DESC;
END$$ END$$
DELIMITER ; DELIMITER ;