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

#7965 - unifyProblems #2990

Open
carlosap wants to merge 20 commits from 7965-unifyProblems into dev
pull from: 7965-unifyProblems
merge into: verdnatura:dev
Conversation 1 Commits 20 Files Changed 17 +46 -45
2 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f99b14510 - Show all commits

17
db/routines/vn/procedures/sale_getProblems.sql
View File

@ -6,6 +6,7 @@ BEGIN
/** /**
* Calcula los problemas para un conjunto de sale * Calcula los problemas para un conjunto de sale
* *
* @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
* @table tmp.sale(saleFk) Identificadores de los sale a calcular * @table tmp.sale(saleFk) Identificadores de los sale a calcular
* @return tmp.saleProblems * @return tmp.saleProblems
*/ */
@ -76,9 +77,9 @@ BEGIN
AND av.calc_id = vAvailableCache AND av.calc_id = vAvailableCache
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
AND tis.warehouseFk = t.warehouseFk AND tis.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible, 0) < s.quantity WHERE (v.visible < s.quantity AND v.visible IS NOT NULL)
AND IFNULL(av.available, 0) < s.quantity AND (av.available < s.quantity AND av.available IS NOT NULL)
AND IFNULL(tis.visible, 0) < s.quantity AND (tis.visible < s.quantity AND tis.visible IS NOT NULL)
AND NOT s.isPicked AND NOT s.isPicked
AND NOT s.reserved AND NOT s.reserved
AND ic.merchandise AND ic.merchandise
@ -101,8 +102,8 @@ BEGIN
AND v.calc_id = vVisibleCache AND v.calc_id = vVisibleCache
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
AND tis.warehouseFk = t.warehouseFk AND tis.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible, 0) >= s.quantity WHERE (v.visible >= s.quantity AND v.visible IS NOT NULL)
AND IFNULL(tis.visible, 0) < s.quantity AND (tis.visible < s.quantity AND tis.visible IS NOT NULL)
AND s.quantity > 0 AND s.quantity > 0
AND NOT s.isPicked AND NOT s.isPicked
AND NOT s.reserved AND NOT s.reserved
@ -129,9 +130,9 @@ BEGIN
AND av.calc_id = vAvailableCache AND av.calc_id = vAvailableCache
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
AND tis.warehouseFk = t.warehouseFk AND tis.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible, 0) < s.quantity WHERE (v.visible < s.quantity AND v.visible IS NOT NULL)
AND IFNULL(av.available, 0) >= s.quantity AND (av.available < s.quantity AND av.available IS NOT NULL)
AND IFNULL(tis.visible, 0) < s.quantity AND (tis.visible < s.quantity AND tis.visible IS NOT NULL)
AND s.quantity > 0 AND s.quantity > 0
AND NOT s.isPicked AND NOT s.isPicked
AND NOT s.reserved AND NOT s.reserved

28
db/routines/vn/procedures/ticket_getProblems.sql
View File

@ -6,6 +6,7 @@ BEGIN
/** /**
* Calcula los problemas para un conjunto de tickets. * Calcula los problemas para un conjunto de tickets.
* *
* @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
* @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
* @return tmp.ticketProblems, tmp.saleProblems * @return tmp.ticketProblems, tmp.saleProblems
*/ */
@ -71,23 +72,22 @@ BEGIN
WHERE FIND_IN_SET('hasComponentLack', s.problem) WHERE FIND_IN_SET('hasComponentLack', s.problem)
GROUP BY s.ticketFk GROUP BY s.ticketFk
)SELECT tt.ticketFk, )SELECT tt.ticketFk,
IF(FIND_IN_SET('isFreezed', t.problem), TRUE, FALSE) isFreezed, FIND_IN_SET('isFreezed', t.problem) isFreezed,
t.risk, t.risk,
IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk, FIND_IN_SET('hasRisk', t.problem) hasRisk,
IF(FIND_IN_SET('hasHighRisk', t.problem), TRUE, FALSE) hasHighRisk, FIND_IN_SET('hasHighRisk', t.problem) hasHighRisk,
IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest, FIND_IN_SET('hasTicketRequest', t.problem) hasTicketRequest,
IF(FIND_IN_SET('isTaxDataChecked', t.problem), TRUE, FALSE) isTaxDataChecked, FIND_IN_SET('isTaxDataChecked', t.problem) isTaxDataChecked,
IF(FIND_IN_SET('isTooLittle', t.problem) FIND_IN_SET('isTooLittle', t.problem)
AND util.VN_NOW() < (util.VN_CURDATE() + AND util.VN_NOW() < (util.VN_CURDATE() +
INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL HOUR(zc.`hour`) HOUR) +
INTERVAL MINUTE(zc.`hour`) MINUTE, INTERVAL MINUTE(zc.`hour`) MINUTE isTooLittle,
TRUE, FALSE) isTooLittle, c.businessTypeFk = 'VIP' isVip,
IF(c.businessTypeFk = 'VIP', TRUE, FALSE) isVip, NOT (his.ticketFk IS NULL) hasItemShortage,
IF(his.ticketFk IS NULL, FALSE, TRUE) hasItemShortage, NOT (hid.ticketFk IS NULL) hasItemDelay,
IF(hid.ticketFk IS NULL, FALSE, TRUE) hasItemDelay, NOT (hil.ticketFk IS NULL) hasItemLost,
IF(hil.ticketFk IS NULL, FALSE, TRUE) hasItemLost, NOT (hcl.ticketFk IS NULL) hasComponentLack,
IF(hcl.ticketFk IS NULL, FALSE, TRUE) hasComponentLack, NOT (hr.ticketFk IS NULL) hasRounding,
IF(hr.ticketFk IS NULL, FALSE, TRUE) hasRounding,
0 totalProblems 0 totalProblems
FROM tmp.ticket tt FROM tmp.ticket tt
JOIN vn.ticket t ON t.id = tt.ticketFk JOIN vn.ticket t ON t.id = tt.ticketFk