fix: refs #7965 UnifyProblems
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
750b83bb45
commit
712bfe7368
|
|
@ -36,6 +36,19 @@ proc: BEGIN
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.productionBuffer
|
CREATE OR REPLACE TEMPORARY TABLE tmp.productionBuffer
|
||||||
(PRIMARY KEY(ticketFk), previaParking VARCHAR(255))
|
(PRIMARY KEY(ticketFk), previaParking VARCHAR(255))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
|
WITH saleProblemsDescription AS(
|
||||||
|
SELECT s.ticketFk,
|
||||||
|
LEFT(CONCAT('F: ', GROUP_CONCAT(CONCAT(i.id, ' ', i.longName) SEPARATOR ', ')), 250) itemShortage,
|
||||||
|
LEFT(CONCAT('R: ', GROUP_CONCAT(CONCAT(i2.id, ' ', i2.longName) SEPARATOR ', ')), 250) itemDelay,
|
||||||
|
LEFT(CONCAT('I: ', GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost
|
||||||
|
FROM tmp.saleProblems sp
|
||||||
|
JOIN vn.sale s ON s.id = sp.saleFk
|
||||||
|
LEFT JOIN vn.item i ON i.id = s.itemFk AND sp.hasItemShortage
|
||||||
|
LEFT JOIN vn.item i2 ON i2.id = s.itemFk AND sp.hasItemDelay
|
||||||
|
LEFT JOIN vn.item i3 ON i3.id = s.itemFk AND sp.hasItemLost
|
||||||
|
WHERE hasItemShortage OR hasItemDelay OR hasItemLost
|
||||||
|
GROUP BY s.ticketFk
|
||||||
|
)
|
||||||
SELECT tt.ticketFk,
|
SELECT tt.ticketFk,
|
||||||
t.clientFk,
|
t.clientFk,
|
||||||
t.warehouseFk,
|
t.warehouseFk,
|
||||||
|
|
@ -55,9 +68,9 @@ proc: BEGIN
|
||||||
0 `lines`,
|
0 `lines`,
|
||||||
CAST( 0 AS DECIMAL(5,2)) m3,
|
CAST( 0 AS DECIMAL(5,2)) m3,
|
||||||
CAST( 0 AS DECIMAL(5,2)) preparationRate,
|
CAST( 0 AS DECIMAL(5,2)) preparationRate,
|
||||||
TRIM(CAST(CONCAT( IFNULL(tpr.itemShortage, ''),
|
TRIM(CAST(CONCAT( IFNULL(sp.itemShortage, ''),
|
||||||
IFNULL(tpr.itemDelay, ''),
|
IFNULL(sp.itemDelay, ''),
|
||||||
IFNULL(tpr.itemLost, ''),
|
IFNULL(sp.itemLost, ''),
|
||||||
IF(tpr.isFreezed, ' CONGELADO',''),
|
IF(tpr.isFreezed, ' CONGELADO',''),
|
||||||
IF(tpr.hasHighRisk, ' RIESGO',''),
|
IF(tpr.hasHighRisk, ' RIESGO',''),
|
||||||
IF(tpr.hasTicketRequest, ' COD 100',''),
|
IF(tpr.hasTicketRequest, ' COD 100',''),
|
||||||
|
|
@ -85,27 +98,28 @@ proc: BEGIN
|
||||||
ag.isOwn,
|
ag.isOwn,
|
||||||
rm.bufferFk
|
rm.bufferFk
|
||||||
FROM tmp.productionTicket tt
|
FROM tmp.productionTicket tt
|
||||||
JOIN ticket t ON tt.ticketFk = t.id
|
JOIN vn.ticket t ON tt.ticketFk = t.id
|
||||||
JOIN alertLevel al ON al.code = 'FREE'
|
JOIN vn.alertLevel al ON al.code = 'FREE'
|
||||||
LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
|
LEFT JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
|
||||||
LEFT JOIN `state` st ON st.id = tst.state
|
LEFT JOIN vn.`state` st ON st.id = tst.state
|
||||||
LEFT JOIN client c ON c.id = t.clientFk
|
LEFT JOIN vn.client c ON c.id = t.clientFk
|
||||||
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
|
LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
|
||||||
JOIN address a ON a.id = t.addressFk
|
JOIN vn.address a ON a.id = t.addressFk
|
||||||
LEFT JOIN province p ON p.id = a.provinceFk
|
LEFT JOIN vn.province p ON p.id = a.provinceFk
|
||||||
JOIN agencyMode am ON am.id = t.agencyModeFk
|
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
||||||
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
|
JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
|
||||||
JOIN agency ag ON ag.id = am.agencyFk
|
JOIN vn.agency ag ON ag.id = am.agencyFk
|
||||||
LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
|
LEFT JOIN vn.ticketState tls ON tls.ticketFk = tt.ticketFk
|
||||||
LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
|
LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
|
||||||
LEFT JOIN worker w ON w.id = tls.userFk
|
LEFT JOIN vn.worker w ON w.id = tls.userFk
|
||||||
LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
|
LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
|
||||||
LEFT JOIN `zone` z ON z.id = t.zoneFk
|
LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
|
||||||
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
|
LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
|
||||||
AND DATE(t.shipped) = zc.dated
|
AND DATE(t.shipped) = zc.dated
|
||||||
LEFT JOIN ticketParking tp ON tp.ticketFk = t.id
|
LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
|
||||||
LEFT JOIN parking pk ON pk.id = tp.parkingFk
|
LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
|
||||||
LEFT JOIN tmp.ticketProblems tpr ON tpr.ticketFk = tt.ticketFk
|
LEFT JOIN tmp.ticketProblems tpr ON tpr.ticketFk = tt.ticketFk
|
||||||
|
LEFT JOIN saleProblemsDescription sp ON sp.ticketFk = tt.ticketFk
|
||||||
WHERE t.warehouseFk = vWarehouseFk
|
WHERE t.warehouseFk = vWarehouseFk
|
||||||
AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
|
AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
|
||||||
|
|
||||||
|
|
@ -260,6 +274,7 @@ proc: BEGIN
|
||||||
DROP TEMPORARY TABLE
|
DROP TEMPORARY TABLE
|
||||||
tmp.productionTicket,
|
tmp.productionTicket,
|
||||||
tmp.ticketProblems,
|
tmp.ticketProblems,
|
||||||
|
tmp.saleProblems,
|
||||||
tmp.ticketWithPrevia,
|
tmp.ticketWithPrevia,
|
||||||
tItemShelvingStock,
|
tItemShelvingStock,
|
||||||
tItemPackingType;
|
tItemPackingType;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,168 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblems`(
|
||||||
|
vIsTodayRelative TINYINT(1)
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula los problemas para un conjunto de sale
|
||||||
|
*
|
||||||
|
* @table tmp.sale(saleFk) Identificadores de los sale a calcular
|
||||||
|
* @return tmp.saleProblems
|
||||||
|
*/
|
||||||
|
DECLARE vWarehouseFk INT;
|
||||||
|
DECLARE vDate DATE;
|
||||||
|
DECLARE vAvailableCache INT;
|
||||||
|
DECLARE vVisibleCache INT;
|
||||||
|
DECLARE vDone BOOL;
|
||||||
|
DECLARE vCursor CURSOR FOR
|
||||||
|
SELECT t.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(t.shipped)) dated
|
||||||
|
FROM tmp.sale ts
|
||||||
|
JOIN sale s ON s.id = ts.saleFk
|
||||||
|
JOIN ticket t ON t.id = s.ticketFk
|
||||||
|
WHERE t.shipped BETWEEN util.VN_CURDATE()
|
||||||
|
AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY)
|
||||||
|
GROUP BY warehouseFk, dated;
|
||||||
|
|
||||||
|
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tmp.saleProblems(
|
||||||
|
saleFk INT(11),
|
||||||
|
hasItemShortage BOOL DEFAULT FALSE,
|
||||||
|
hasItemLost BOOL DEFAULT FALSE,
|
||||||
|
hasItemDelay BOOL DEFAULT FALSE,
|
||||||
|
hasRounding BOOL DEFAULT FALSE,
|
||||||
|
PRIMARY KEY (saleFk)
|
||||||
|
) ENGINE = MEMORY;
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tItemShelving
|
||||||
|
(INDEX (itemFk, warehouseFk))
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT ish.itemFk itemFk,
|
||||||
|
SUM(ish.visible) visible,
|
||||||
|
s.warehouseFk warehouseFk
|
||||||
|
FROM itemShelving ish
|
||||||
|
JOIN shelving sh ON sh.code = ish.shelvingFk
|
||||||
|
JOIN parking p ON p.id = sh.parkingFk
|
||||||
|
JOIN sector s ON s.id = p.sectorFk
|
||||||
|
GROUP BY ish.itemFk, s.warehouseFk;
|
||||||
|
|
||||||
|
-- Disponible, faltas, inventario y retrasos
|
||||||
|
OPEN vCursor;
|
||||||
|
l: LOOP
|
||||||
|
SET vDone = FALSE;
|
||||||
|
FETCH vCursor INTO vWarehouseFk, vDate;
|
||||||
|
|
||||||
|
IF vDone THEN
|
||||||
|
LEAVE l;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
-- Disponible: no va a haber suficiente producto para preparar todos los pedidos
|
||||||
|
CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate);
|
||||||
|
|
||||||
|
-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
|
||||||
|
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
|
||||||
|
|
||||||
|
INSERT INTO tmp.saleProblems(saleFk, hasItemShortage)
|
||||||
|
SELECT s.id, TRUE
|
||||||
|
FROM tmp.sale ts
|
||||||
|
JOIN sale s ON s.id = ts.saleFk
|
||||||
|
JOIN ticket t ON t.id = s.ticketFk
|
||||||
|
JOIN item i ON i.id = s.itemFk
|
||||||
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
LEFT JOIN cache.visible v ON v.item_id = i.id
|
||||||
|
AND v.calc_id = vVisibleCache
|
||||||
|
LEFT JOIN cache.available av ON av.item_id = i.id
|
||||||
|
AND av.calc_id = vAvailableCache
|
||||||
|
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
|
||||||
|
AND tis.warehouseFk = t.warehouseFk
|
||||||
|
WHERE IFNULL(v.visible, 0) < s.quantity
|
||||||
|
AND IFNULL(av.available, 0) < s.quantity
|
||||||
|
AND IFNULL(tis.visible, 0) < s.quantity
|
||||||
|
AND NOT s.isPicked
|
||||||
|
AND NOT s.reserved
|
||||||
|
AND ic.merchandise
|
||||||
|
AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
|
||||||
|
AND NOT i.generic
|
||||||
|
AND util.VN_CURDATE() = vDate
|
||||||
|
AND t.warehouseFk = vWarehouseFk
|
||||||
|
GROUP BY s.id;
|
||||||
|
|
||||||
|
-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
|
||||||
|
INSERT INTO tmp.saleProblems(saleFk, hasItemLost)
|
||||||
|
SELECT s.id, TRUE
|
||||||
|
FROM tmp.sale ts
|
||||||
|
JOIN sale s ON s.id = ts.saleFk
|
||||||
|
JOIN ticket t ON t.id = s.ticketFk
|
||||||
|
JOIN item i ON i.id = s.itemFk
|
||||||
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
LEFT JOIN cache.visible v ON v.item_id = s.itemFk
|
||||||
|
AND v.calc_id = vVisibleCache
|
||||||
|
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
|
||||||
|
AND tis.warehouseFk = t.warehouseFk
|
||||||
|
WHERE IFNULL(v.visible, 0) >= s.quantity
|
||||||
|
AND IFNULL(tis.visible, 0) < s.quantity
|
||||||
|
AND s.quantity > 0
|
||||||
|
AND NOT s.isPicked
|
||||||
|
AND NOT s.reserved
|
||||||
|
AND ic.merchandise
|
||||||
|
AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
|
||||||
|
AND NOT i.generic
|
||||||
|
AND util.VN_CURDATE() = vDate
|
||||||
|
AND t.warehouseFk = vWarehouseFk
|
||||||
|
GROUP BY s.id
|
||||||
|
ON DUPLICATE KEY UPDATE hasItemLost = TRUE;
|
||||||
|
|
||||||
|
-- Retraso: Disponible suficiente, pero no visible ni ubicado
|
||||||
|
INSERT INTO tmp.saleProblems(saleFk, hasItemDelay)
|
||||||
|
SELECT s.id, TRUE
|
||||||
|
FROM tmp.sale ts
|
||||||
|
JOIN sale s ON s.id = ts.saleFk
|
||||||
|
JOIN ticket t ON t.id = s.ticketFk
|
||||||
|
JOIN item i ON i.id = s.itemFk
|
||||||
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
LEFT JOIN cache.visible v ON v.item_id = s.itemFk
|
||||||
|
AND v.calc_id = vVisibleCache
|
||||||
|
LEFT JOIN cache.available av ON av.item_id = i.id
|
||||||
|
AND av.calc_id = vAvailableCache
|
||||||
|
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
|
||||||
|
AND tis.warehouseFk = t.warehouseFk
|
||||||
|
WHERE IFNULL(v.visible, 0) < s.quantity
|
||||||
|
AND IFNULL(av.available, 0) >= s.quantity
|
||||||
|
AND IFNULL(tis.visible, 0) < s.quantity
|
||||||
|
AND s.quantity > 0
|
||||||
|
AND NOT s.isPicked
|
||||||
|
AND NOT s.reserved
|
||||||
|
AND ic.merchandise
|
||||||
|
AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
|
||||||
|
AND NOT i.generic
|
||||||
|
AND util.VN_CURDATE() = vDate
|
||||||
|
AND t.warehouseFk = vWarehouseFk
|
||||||
|
GROUP BY s.id
|
||||||
|
ON DUPLICATE KEY UPDATE hasItemDelay = TRUE;
|
||||||
|
|
||||||
|
-- Redondeo: cantidad incorrecta con respecto al grouping
|
||||||
|
CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
|
||||||
|
|
||||||
|
INSERT INTO tmp.saleProblems(saleFk, hasRounding)
|
||||||
|
SELECT s.id, TRUE
|
||||||
|
FROM tmp.sale ts
|
||||||
|
JOIN sale s ON s.id = ts.saleFk
|
||||||
|
JOIN ticket t ON t.id = s.ticketFk
|
||||||
|
AND t.warehouseFk = vWarehouseFk
|
||||||
|
JOIN item i ON i.id = s.itemFk
|
||||||
|
JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
|
||||||
|
JOIN buy b ON b.id = bu.buyFk
|
||||||
|
WHERE MOD(s.quantity, b.`grouping`)
|
||||||
|
GROUP BY s.id
|
||||||
|
ON DUPLICATE KEY UPDATE hasRounding = TRUE;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tmp.buyUltimate;
|
||||||
|
END LOOP;
|
||||||
|
CLOSE vCursor;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tItemShelving, tmp.sale;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
|
@ -5,22 +5,19 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTic
|
||||||
)
|
)
|
||||||
BEGIN
|
BEGIN
|
||||||
/**
|
/**
|
||||||
* Calcula los problemas de cada venta
|
* Calcula los problemas de cada venta para un tickets.
|
||||||
* para un conjunto de tickets.
|
|
||||||
*
|
*
|
||||||
* @return Problems result
|
* @return Problems result
|
||||||
*/
|
*/
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
|
CREATE OR REPLACE TEMPORARY TABLE tmp.sale
|
||||||
(INDEX (ticketFk))
|
(INDEX (saleFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT vTicketFk ticketFk;
|
SELECT id saleFk FROM sale WHERE ticketFk = vTicketFk;
|
||||||
|
|
||||||
CALL ticket_getProblems(vIsTodayRelative);
|
CALL sale_getProblems(vIsTodayRelative);
|
||||||
|
|
||||||
SELECT * FROM tmp.saleProblems;
|
SELECT * FROM tmp.saleProblems;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE
|
DROP TEMPORARY TABLE tmp.saleProblems;
|
||||||
tmp.ticket,
|
|
||||||
tmp.ticketProblems;
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
|
|
@ -5,163 +5,23 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getProblems`(
|
||||||
BEGIN
|
BEGIN
|
||||||
/**
|
/**
|
||||||
* Calcula los problemas para un conjunto de tickets.
|
* Calcula los problemas para un conjunto de tickets.
|
||||||
* Agrupados por ticket
|
|
||||||
*
|
*
|
||||||
* @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
|
* @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
|
||||||
* @return tmp.ticketProblems
|
* @return tmp.ticketProblems, tmp.saleProblems
|
||||||
*/
|
*/
|
||||||
DECLARE vWarehouseFk INT;
|
CREATE OR REPLACE TEMPORARY TABLE tmp.sale (
|
||||||
DECLARE vDate DATE;
|
|
||||||
DECLARE vAvailableCache INT;
|
|
||||||
DECLARE vVisibleCache INT;
|
|
||||||
DECLARE vDone BOOL;
|
|
||||||
DECLARE vCursor CURSOR FOR
|
|
||||||
SELECT DISTINCT t.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(t.shipped))
|
|
||||||
FROM tmp.ticket t
|
|
||||||
JOIN ticket t ON t.id = t.ticketFk
|
|
||||||
WHERE t.shipped BETWEEN util.VN_CURDATE()
|
|
||||||
AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY);
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.saleProblems(
|
|
||||||
ticketFk INT(11),
|
|
||||||
saleFk INT(11),
|
saleFk INT(11),
|
||||||
hasItemShortage BOOL DEFAULT FALSE,
|
PRIMARY KEY (saleFk)
|
||||||
hasItemLost BOOL DEFAULT FALSE,
|
) ENGINE = MEMORY
|
||||||
hasItemDelay BOOL DEFAULT FALSE,
|
SELECT DISTINCT s.id saleFk
|
||||||
hasRounding BOOL DEFAULT FALSE,
|
|
||||||
PRIMARY KEY (ticketFk, saleFk)
|
|
||||||
) ENGINE = MEMORY;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tItemShelving
|
|
||||||
(INDEX (itemFk, warehouseFk))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT ish.itemFk itemFk,
|
|
||||||
SUM(ish.visible) visible,
|
|
||||||
s.warehouseFk warehouseFk
|
|
||||||
FROM itemShelving ish
|
|
||||||
JOIN shelving sh ON sh.code = ish.shelvingFk
|
|
||||||
JOIN parking p ON p.id = sh.parkingFk
|
|
||||||
JOIN sector s ON s.id = p.sectorFk
|
|
||||||
GROUP BY ish.itemFk, s.warehouseFk;
|
|
||||||
|
|
||||||
-- Disponible, faltas, inventario y retrasos
|
|
||||||
OPEN vCursor;
|
|
||||||
l: LOOP
|
|
||||||
SET vDone = FALSE;
|
|
||||||
FETCH vCursor INTO vWarehouseFk, vDate;
|
|
||||||
|
|
||||||
IF vDone THEN
|
|
||||||
LEAVE l;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
-- Disponible: no va a haber suficiente producto para preparar todos los pedidos
|
|
||||||
CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate);
|
|
||||||
|
|
||||||
-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
|
|
||||||
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
|
|
||||||
|
|
||||||
INSERT INTO tmp.saleProblems(ticketFk, saleFk, hasItemShortage)
|
|
||||||
SELECT tt.ticketFk, s.id, TRUE
|
|
||||||
FROM tmp.ticket tt
|
FROM tmp.ticket tt
|
||||||
JOIN ticket t ON t.id = tt.ticketFk
|
JOIN ticket t ON t.id = tt.ticketFk
|
||||||
JOIN sale s ON s.ticketFk = t.id
|
JOIN sale s ON s.ticketFk = t.id
|
||||||
JOIN item i ON i.id = s.itemFk
|
WHERE t.shipped BETWEEN util.VN_CURDATE()
|
||||||
JOIN itemType it ON it.id = i.typeFk
|
AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY)
|
||||||
JOIN itemCategory ic ON ic.id = it.categoryFk
|
|
||||||
LEFT JOIN cache.visible v ON v.item_id = i.id
|
|
||||||
AND v.calc_id = vVisibleCache
|
|
||||||
LEFT JOIN cache.available av ON av.item_id = i.id
|
|
||||||
AND av.calc_id = vAvailableCache
|
|
||||||
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
|
|
||||||
AND tis.warehouseFk = t.warehouseFk
|
|
||||||
WHERE IFNULL(v.visible, 0) < s.quantity
|
|
||||||
AND IFNULL(av.available, 0) < s.quantity
|
|
||||||
AND IFNULL(tis.visible, 0) < s.quantity
|
|
||||||
AND NOT s.isPicked
|
|
||||||
AND NOT s.reserved
|
|
||||||
AND ic.merchandise
|
|
||||||
AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
|
|
||||||
AND NOT i.generic
|
|
||||||
AND util.VN_CURDATE() = vDate
|
|
||||||
AND t.warehouseFk = vWarehouseFk
|
|
||||||
GROUP BY s.id;
|
GROUP BY s.id;
|
||||||
|
|
||||||
-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
|
CALL sale_getProblems(vIsTodayRelative);
|
||||||
INSERT INTO tmp.saleProblems(ticketFk, saleFk, hasItemLost)
|
|
||||||
SELECT tt.ticketFk, s.id, TRUE
|
|
||||||
FROM tmp.ticket tt
|
|
||||||
JOIN ticket t ON t.id = tt.ticketFk
|
|
||||||
JOIN sale s ON s.ticketFk = t.id
|
|
||||||
JOIN item i ON i.id = s.itemFk
|
|
||||||
JOIN itemType it ON it.id = i.typeFk
|
|
||||||
JOIN itemCategory ic ON ic.id = it.categoryFk
|
|
||||||
LEFT JOIN cache.visible v ON v.item_id = s.itemFk
|
|
||||||
AND v.calc_id = vVisibleCache
|
|
||||||
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
|
|
||||||
AND tis.warehouseFk = t.warehouseFk
|
|
||||||
WHERE IFNULL(v.visible, 0) >= s.quantity
|
|
||||||
AND IFNULL(tis.visible, 0) < s.quantity
|
|
||||||
AND s.quantity > 0
|
|
||||||
AND NOT s.isPicked
|
|
||||||
AND NOT s.reserved
|
|
||||||
AND ic.merchandise
|
|
||||||
AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
|
|
||||||
AND NOT i.generic
|
|
||||||
AND util.VN_CURDATE() = vDate
|
|
||||||
AND t.warehouseFk = vWarehouseFk
|
|
||||||
GROUP BY s.id
|
|
||||||
ON DUPLICATE KEY UPDATE hasItemLost = TRUE;
|
|
||||||
|
|
||||||
-- Retraso: Disponible suficiente, pero no visible ni ubicado
|
|
||||||
INSERT INTO tmp.saleProblems(ticketFk, saleFk, hasItemDelay)
|
|
||||||
SELECT tt.ticketFk, s.id, TRUE
|
|
||||||
FROM tmp.ticket tt
|
|
||||||
JOIN ticket t ON t.id = tt.ticketFk
|
|
||||||
JOIN sale s ON s.ticketFk = t.id
|
|
||||||
JOIN item i ON i.id = s.itemFk
|
|
||||||
JOIN itemType it ON it.id = i.typeFk
|
|
||||||
JOIN itemCategory ic ON ic.id = it.categoryFk
|
|
||||||
LEFT JOIN cache.visible v ON v.item_id = s.itemFk
|
|
||||||
AND v.calc_id = vVisibleCache
|
|
||||||
LEFT JOIN cache.available av ON av.item_id = i.id
|
|
||||||
AND av.calc_id = vAvailableCache
|
|
||||||
LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
|
|
||||||
AND tis.warehouseFk = t.warehouseFk
|
|
||||||
WHERE IFNULL(v.visible, 0) < s.quantity
|
|
||||||
AND IFNULL(av.available, 0) >= s.quantity
|
|
||||||
AND IFNULL(tis.visible, 0) < s.quantity
|
|
||||||
AND s.quantity > 0
|
|
||||||
AND NOT s.isPicked
|
|
||||||
AND NOT s.reserved
|
|
||||||
AND ic.merchandise
|
|
||||||
AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
|
|
||||||
AND NOT i.generic
|
|
||||||
AND util.VN_CURDATE() = vDate
|
|
||||||
AND t.warehouseFk = vWarehouseFk
|
|
||||||
GROUP BY s.id
|
|
||||||
ON DUPLICATE KEY UPDATE hasItemDelay = TRUE;
|
|
||||||
|
|
||||||
-- Redondeo: cantidad incorrecta con respecto al grouping
|
|
||||||
CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
|
|
||||||
|
|
||||||
INSERT INTO tmp.saleProblems(ticketFk, saleFk, hasRounding)
|
|
||||||
SELECT tt.ticketFk, s.id, TRUE
|
|
||||||
FROM tmp.ticket tt
|
|
||||||
JOIN ticket t ON t.id = tt.ticketFk
|
|
||||||
AND t.warehouseFk = vWarehouseFk
|
|
||||||
JOIN sale s ON s.ticketFk = tt.ticketFk
|
|
||||||
JOIN item i ON i.id = s.itemFk
|
|
||||||
JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
|
|
||||||
JOIN buy b ON b.id = bu.buyFk
|
|
||||||
WHERE MOD(s.quantity, b.`grouping`)
|
|
||||||
GROUP BY s.id
|
|
||||||
ON DUPLICATE KEY UPDATE hasRounding = TRUE;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tmp.buyUltimate;
|
|
||||||
END LOOP;
|
|
||||||
CLOSE vCursor;
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketProblems (
|
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketProblems (
|
||||||
ticketFk INT(11),
|
ticketFk INT(11),
|
||||||
|
|
@ -195,27 +55,14 @@ BEGIN
|
||||||
SUM(IFNULL(ts.hasItemDelay,0)) hasItemDelay,
|
SUM(IFNULL(ts.hasItemDelay,0)) hasItemDelay,
|
||||||
SUM(IFNULL(ts.hasItemLost,0)) hasItemLost,
|
SUM(IFNULL(ts.hasItemLost,0)) hasItemLost,
|
||||||
IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
|
IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
|
||||||
SUM(IFNULL(ts.hasRounding,0)) hasRounding,
|
SUM(IFNULL(ts.hasRounding,0)) hasRounding
|
||||||
LEFT(CONCAT('F: ',GROUP_CONCAT(CONCAT(i.id, ' ', i.longName) SEPARATOR ', ')), 250) itemShortage,
|
|
||||||
LEFT(CONCAT('R: ',GROUP_CONCAT(CONCAT(i2.id, ' ', i2.longName) SEPARATOR ', ')), 250) itemDelay,
|
|
||||||
LEFT(CONCAT('I: ',GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost,
|
|
||||||
LEFT(CONCAT('C: ',GROUP_CONCAT(CONCAT(i4.id, ' ', i4.longName) SEPARATOR ', ')), 250) componentLack,
|
|
||||||
LEFT(CONCAT('RE: ',GROUP_CONCAT(CONCAT(i5.id, ' ', i5.longName) SEPARATOR ', ')), 250) rounding
|
|
||||||
FROM tmp.ticket tt
|
FROM tmp.ticket tt
|
||||||
JOIN ticket t ON t.id = tt.ticketFk
|
JOIN ticket t ON t.id = tt.ticketFk
|
||||||
JOIN client c ON c.id = t.clientFk
|
JOIN client c ON c.id = t.clientFk
|
||||||
LEFT JOIN sale s ON s.ticketFk = t.id
|
LEFT JOIN sale s ON s.ticketFk = t.id
|
||||||
LEFT JOIN tmp.saleProblems ts ON ts.saleFk = s.id
|
LEFT JOIN tmp.saleProblems ts ON ts.saleFk = s.id
|
||||||
LEFT JOIN item i ON i.id = s.itemFk AND ts.hasItemShortage
|
|
||||||
LEFT JOIN item i2 ON i2.id = s.itemFk AND ts.hasItemDelay
|
|
||||||
LEFT JOIN item i3 ON i3.id = s.itemFk AND ts.hasItemLost
|
|
||||||
LEFT JOIN item i4 ON i4.id = s.itemFk AND FIND_IN_SET('hasComponentLack', s.problem)
|
|
||||||
LEFT JOIN item i5 ON i5.id = s.itemFk AND ts.hasRounding
|
|
||||||
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
|
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
|
||||||
AND zc.dated = util.VN_CURDATE()
|
AND zc.dated = util.VN_CURDATE()
|
||||||
WHERE s.problem <> '' OR t.problem <> '' OR t.risk
|
|
||||||
GROUP BY t.id;
|
GROUP BY t.id;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tItemShelving;
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue