verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

hotfix item_getBalance #1563

Merged
alexandre merged 5 commits from hotfix-item_getBalance into master 2023-05-25 12:01:15 +00:00
Conversation 0 Commits 5 Files Changed 2 +195 -131
2 changed files with 195 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
db/dump/structure.sql
View File

@ -59861,69 +59861,76 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;; DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int) CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getBalance`(vItemFk int, vWarehouseFk int, vDate DATETIME)
BEGIN BEGIN
/**
* @vItemFk item a buscar
* @vWarehouseFk almacen donde buscar
* @vDate Si la fecha es null, muestra el histórico desde el inventario. Si la fecha no es null, muestra histórico desde la fecha pasada.
*/
DECLARE vDateInventory DATETIME; DECLARE vDateInventory DATETIME;
DECLARE vCurdate DATE DEFAULT util.VN_CURDATE(); DECLARE vInvCalculated INT;
DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
SELECT inventoried INTO vDateInventory FROM config; IF vDate IS NULL THEN
SET @a = 0; SELECT inventoried INTO vDateInventory
SET @currentLineFk = 0; FROM config;
SET @shipped = ''; ELSE
SELECT mockUtcTime INTO vDateInventory
FROM util.config;
END IF;
SELECT DATE(@shipped:= shipped) shipped, CREATE OR REPLACE TEMPORARY TABLE itemDiary(
alertLevel, shipped DATE,
stateName, `in` INT(11),
origin, `out` INT(11),
reference, alertLevel INT(11),
clientFk, stateName VARCHAR(20),
name, `name` VARCHAR(50),
`in` AS invalue, reference VARCHAR(50),
`out`, origin INT(11),
@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance, clientFk INT(11),
@currentLineFk := IF (@shipped < util.VN_CURDATE() isPicked INT(11),
OR (@shipped = util.VN_CURDATE() AND (isPicked OR alertLevel >= 2)), isTicket TINYINT(1),
lineFk,@currentLineFk) lastPreparedLineFk, lineFk INT(11),
isTicket, `order` TINYINT(3) UNSIGNED,
lineFk, clientType VARCHAR(20),
isPicked, claimFk INT(10) UNSIGNED
clientType, );
claimFk
FROM INSERT INTO itemDiary
( SELECT tr.landed AS shipped, SELECT tr.landed shipped,
b.quantity AS `in`, b.quantity `in`,
NULL AS `out`, NULL `out`,
al.id AS alertLevel, al.id alertLevel,
st.name AS stateName, st.name stateName,
s.name AS name, s.name `name`,
e.invoiceNumber AS reference, e.invoiceNumber reference,
e.id AS origin, e.id origin,
s.id AS clientFk, s.id clientFk,
IF(al.id = 3, TRUE, FALSE) isPicked, IF(al.code = 'DELIVERED', TRUE, FALSE) isPicked,
FALSE AS isTicket, FALSE isTicket,
b.id lineFk, b.id lineFk,
NULL `order`, NULL `order`,
NULL AS clientType, NULL clientType,
NULL AS claimFk NULL claimFk
FROM buy b FROM buy b
JOIN entry e ON e.id = b.entryFk JOIN entry e ON e.id = b.entryFk
JOIN travel tr ON tr.id = e.travelFk JOIN travel tr ON tr.id = e.travelFk
JOIN supplier s ON s.id = e.supplierFk JOIN supplier s ON s.id = e.supplierFk
JOIN alertLevel al ON al.id = JOIN alertLevel al ON al.code =
CASE CASE
WHEN tr.landed < util.VN_CURDATE() THEN 3 WHEN tr.landed < util.VN_CURDATE() THEN 'DELIVERED'
WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3 WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
ELSE 0 ELSE 'FREE'
END END
JOIN state st ON st.code = al.code JOIN state st ON st.code = al.code
WHERE tr.landed >= vDateInventory WHERE tr.landed >= vDateInventory
AND vWarehouse = tr.warehouseInFk AND vWarehouseFk = tr.warehouseInFk
AND b.itemFk = vItemId AND b.itemFk = vItemFk
AND e.isExcludedFromAvailable = FALSE AND e.isExcludedFromAvailable = FALSE
AND e.isRaid = FALSE AND e.isRaid = FALSE
UNION ALL UNION ALL
SELECT tr.shipped, SELECT tr.shipped,
NULL, NULL,
b.quantity, b.quantity,
@ -59933,7 +59940,7 @@ BEGIN
e.invoiceNumber, e.invoiceNumber,
e.id, e.id,
s.id, s.id,
IF(al.id = 3, TRUE, FALSE), IF(al.code = 'DELIVERED', TRUE, FALSE),
FALSE, FALSE,
b.id, b.id,
NULL, NULL,
@ -59944,26 +59951,26 @@ BEGIN
JOIN travel tr ON tr.id = e.travelFk JOIN travel tr ON tr.id = e.travelFk
JOIN warehouse w ON w.id = tr.warehouseOutFk JOIN warehouse w ON w.id = tr.warehouseOutFk
JOIN supplier s ON s.id = e.supplierFk JOIN supplier s ON s.id = e.supplierFk
JOIN alertLevel al ON al.id = JOIN alertLevel al ON al.code =
CASE CASE
WHEN tr.shipped < util.VN_CURDATE() THEN 3 WHEN tr.shipped < util.VN_CURDATE() THEN 'DELIVERED'
WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3 WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
ELSE 0 ELSE 'FREE'
END END
JOIN state st ON st.code = al.code JOIN state st ON st.code = al.code
JOIN entryConfig ec
WHERE tr.shipped >= vDateInventory WHERE tr.shipped >= vDateInventory
AND vWarehouse =tr.warehouseOutFk AND vWarehouseFk =tr.warehouseOutFk
AND s.id <> 4 AND s.id <> ec.inventorySupplierFk
AND b.itemFk = vItemId AND b.itemFk = vItemFk
AND e.isExcludedFromAvailable = FALSE AND e.isExcludedFromAvailable = FALSE
AND w.isFeedStock = FALSE AND w.isFeedStock = FALSE
AND e.isRaid = FALSE AND e.isRaid = FALSE
UNION ALL UNION ALL
SELECT DATE(t.shipped), SELECT DATE(t.shipped),
NULL, NULL,
s.quantity, s.quantity,
al.id, al3.id,
st.name, st.name,
t.nickname, t.nickname,
t.refFk, t.refFk,
@ -59981,21 +59988,78 @@ BEGIN
LEFT JOIN state st ON st.code = ts.code LEFT JOIN state st ON st.code = ts.code
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
JOIN clientType ct ON ct.id = c.clientTypeFk JOIN clientType ct ON ct.id = c.clientTypeFk
JOIN alertLevel al ON al.id = JOIN alertLevel al ON al.code = 'DELIVERED'
JOIN alertLevel al2 ON al2.code = 'FREE'
JOIN alertLevel al3 ON al3.id =
CASE CASE
WHEN t.shipped < util.VN_CURDATE() THEN 3 WHEN t.shipped < util.VN_CURDATE() THEN al.code
WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0 WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN al2.code
ELSE IFNULL(ts.alertLevel, 0) ELSE IFNULL(ts.alertLevel, al2.code)
END END
LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED' LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
LEFT JOIN claimBeginning cb ON s.id = cb.saleFk LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
WHERE t.shipped >= vDateInventory WHERE t.shipped >= vDateInventory
AND s.itemFk = vItemId AND s.itemFk = vItemFk
AND vWarehouse =t.warehouseFk AND vWarehouseFk =t.warehouseFk
ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC;
) AS itemDiary;
IF vDate IS NULL THEN
SET @a = 0;
SET @currentLineFk = 0;
SET @shipped = '';
SELECT DATE(@shipped:= shipped) shipped,
alertLevel,
stateName,
origin,
reference,
clientFk,
name,
`in` AS invalue,
`out`,
@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
@currentLineFk := IF (@shipped < util.VN_CURDATE()
OR (@shipped = util.VN_CURDATE() AND (isPicked OR a.code >= 'ON_PREPARATION')),
lineFk, @currentLineFk) lastPreparedLineFk,
isTicket,
lineFk,
isPicked,
clientType,
claimFk
FROM itemDiary
JOIN alertLevel a ON a.id = itemDiary.alertLevel;
ELSE
SELECT sum(`in`) - sum(`out`) INTO vInvCalculated
FROM itemDiary
WHERE shipped < vDate;
SELECT p1.*
FROM(
SELECT vDate shipped,
0 alertLevel,
0 stateName,
0 origin,
'' reference,
0 clientFk,
'Inventario calculado',
vInvCalculated invalue,
NULL `out`,
0 balance,
0 lastPreparedLineFk,
0 isTicket,
0 lineFk,
0 isPicked,
0 clientType,
0 claimFk
UNION ALL
SELECT shipped, alertlevel, stateName, origin, reference, clientFk, name, `in`, `out`, 0,0, isTicket, lineFk, isPicked, clientType, claimFk
FROM itemDiary
WHERE shipped >= vDate
)as p1;
END IF;
DROP TEMPORARY TABLE itemDiary;
END ;; END ;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;

4
modules/item/back/methods/item/getBalance.js
View File

@ -26,8 +26,8 @@ module.exports = Self => {
Object.assign(myOptions, options); Object.assign(myOptions, options);
const where = filter.where; const where = filter.where;
const query = 'CALL vn.item_getBalance(?, ?)'; const query = 'CALL vn.item_getBalance(?, ?, ?)';
const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk], myOptions); const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, null], myOptions);
for (const entry of diary) for (const entry of diary)
if (entry.clientType === 'loses') entry.highlighted = true; if (entry.clientType === 'loses') entry.highlighted = true;