verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 69 Releases Wiki Activity

Merge branch 'dev' into 8370-WorkerTimeControl
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2025-03-04 12:44:21 +00:00
parent d40d45206d 55e2bebff8
commit 4310d6d3e6
10 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
db/routines/cache/procedures/available_refresh.sql vendored
View File

@ -46,15 +46,15 @@ proc: BEGIN
END IF;
-- Calcula algunos parámetros necesarios
SELECT inventoried
INTO vInventoryDate
SELECT inventoried
INTO vInventoryDate
FROM vn.config;
SELECT DATE_SUB(vDated, INTERVAL MAX(life) DAY)
INTO vLifeScope
SELECT DATE_SUB(vDated, INTERVAL MAX(life) DAY)
INTO vLifeScope
FROM vn.itemType;
SELECT SUBTIME(util.VN_NOW(), reserveTime)
SELECT SUBTIME(util.VN_NOW(), reserveTime)
INTO vReserveDate
FROM hedera.orderConfig;
@ -67,7 +67,7 @@ proc: BEGIN
(PRIMARY KEY (itemFk))
ENGINE = MEMORY
SELECT i.id itemFk,
util.dayEnd(DATE_ADD(c.maxLanded, INTERVAL it.life DAY)) ended,
util.dayEnd(DATE_ADD(c.maxLanded, INTERVAL it.life DAY)) ended,
it.life
FROM vn.item i
LEFT JOIN (
@ -94,18 +94,18 @@ proc: BEGIN
CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
(INDEX (itemFk,warehouseFk))
ENGINE = MEMORY
SELECT itemFk,
SELECT itemFk,
vWarehouse warehouseFk,
dated,
SUM(quantity) quantity
FROM (
SELECT i.itemFk,
i.shipped dated,
SELECT i.itemFk,
i.shipped dated,
i.quantity
FROM vn.itemTicketOut i
JOIN itemRange ir ON ir.itemFk = i.itemFk
WHERE i.shipped >= vAvailabled
AND (ir.ended IS NULL
AND (ir.ended IS NULL
OR i.shipped <= ir.ended)
AND i.warehouseFk = vWarehouse
UNION ALL
@ -115,17 +115,17 @@ proc: BEGIN
FROM vn.itemEntryIn i
JOIN itemRange ir ON ir.itemFk = i.itemFk
WHERE i.availabled >= vAvailabled
AND (ir.ended IS NULL
AND (ir.ended IS NULL
OR i.availabled <= ir.ended)
AND i.warehouseInFk = vWarehouse
UNION ALL
SELECT i.itemFk,
i.shipped,
UNION ALL
SELECT i.itemFk,
i.shipped,
i.quantity
FROM vn.itemEntryOut i
JOIN itemRange ir ON ir.itemFk = i.itemFk
WHERE i.shipped >= vAvailabled
AND (ir.ended IS NULL
AND (ir.ended IS NULL
OR i.shipped <= ir.ended)
AND i.warehouseOutFk = vWarehouse
UNION ALL
@ -136,7 +136,7 @@ proc: BEGIN
JOIN hedera.`order` o ON o.id = r.order_id
JOIN itemRange ir ON ir.itemFk = r.item_id
WHERE r.shipment >= vDated
AND (ir.ended IS NULL
AND (ir.ended IS NULL
OR r.shipment <= ir.ended)
AND r.warehouse_id = vWarehouse
AND r.created >= vReserveDate
@ -147,8 +147,8 @@ proc: BEGIN
CALL vn.item_getAtp(vAvailabled);
INSERT INTO available (calc_id, item_id, available)
SELECT vCalc,
sub.itemFk,
SELECT vCalc,
sub.itemFk,
SUM(sub.quantity)
FROM (
SELECT ir.itemFk,

3
db/routines/vn/procedures/item_getBalance.sql
View File

@ -1,5 +1,4 @@
DELIMITER $$
$$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getBalance`(
vItemFk INT,
vWarehouseFk INT,
@ -100,7 +99,7 @@ BEGIN
),
sales AS (
WITH itemSales AS (
SELECT DATE(t.shipped) + INTERVAL HOUR(IFNULL(z.`hour`,0)) HOUR shipped,
SELECT DATE(t.shipped) + INTERVAL HOUR(IFNULL(z.`hour`,0)) HOUR shipped,
s.quantity,
st2.alertLevel,
st2.name,

2
db/routines/vn/procedures/item_getSimilar.sql
View File

@ -82,8 +82,6 @@ BEGIN
AND it.priority = vPriority
LEFT JOIN vn.tag t ON t.id = it.tagFk
LEFT JOIN vn.buy b ON b.id = bu.buyFk
LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
AND iss.warehouseFk = vWarehouseFk
LEFT JOIN vn.ink ink ON ink.id = i.tag5
JOIN itemTags its
WHERE a.available > 0

2
db/routines/vn/procedures/item_getStock.sql
View File

@ -1,5 +1,4 @@
DELIMITER $$
$$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getStock`(
vWarehouseFk SMALLINT,
vAvailabled DATETIME,
@ -55,6 +54,5 @@ BEGIN
) sub
GROUP BY itemFk
HAVING stock;
END$$
DELIMITER ;

6
db/routines/vn/triggers/ticket_beforeInsert.sql
View File

@ -7,11 +7,11 @@ BEGIN
SET NEW.editorFk = account.myUser_getId();
SELECT TIME(hour) INTO vTime
/* SELECT TIME(hour) INTO vTime
FROM zone
WHERE id = NEW.zoneFk;
/* IF vTime IS NOT NULL THEN
IF vTime IS NOT NULL THEN
SET NEW.shipped = ADDTIME(DATE(NEW.shipped), vTime);
END IF;*/
END IF; */
END$$
DELIMITER ;

2
db/routines/vn/triggers/ticket_beforeUpdate.sql
View File

@ -86,6 +86,6 @@ BEGIN
IF vZoneTime IS NOT NULL THEN
SET NEW.shipped = ADDTIME(DATE(NEW.shipped), vZoneTime);
END IF;
END IF;*/
END IF; */
END$$
DELIMITER ;

19
db/versions/11476-chocolateEucalyptus/00-firstScript.sql Normal file
View File

@ -0,0 +1,19 @@
UPDATE vn.town
SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
WHERE name IS NOT NULL
AND BINARY name = UPPER(name);
UPDATE vn.province
SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
WHERE name IS NOT NULL
AND BINARY name = UPPER(name);
UPDATE vn.autonomy
SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
WHERE name IS NOT NULL
AND BINARY name = UPPER(name);
UPDATE vn.country
SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
WHERE name IS NOT NULL
AND BINARY name = UPPER(name);

3
db/versions/11477-maroonCarnation/00-firstScript.sql Normal file
View File

@ -0,0 +1,3 @@
-- Place your SQL code here
ALTER TABLE vn.priceDelta MODIFY COLUMN itemTypeFk smallint(5) unsigned NULL;

7
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -262,10 +262,7 @@ module.exports = Self => {
(INDEX (ticketFk))
ENGINE = MEMORY
SELECT f.id ticketFk
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
AND f.shipped >= ?`, [date]);
FROM tmp.filter f`);
stmts.push(stmt);
stmts.push('CALL ticket_getProblems(FALSE)');
@ -288,7 +285,7 @@ module.exports = Self => {
stmts.push(stmt);
stmt = new ParameterizedSQL(`
SELECT *
SELECT f.*, tp.*
FROM tmp.filter f
LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id

6
modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
View File

@ -68,7 +68,7 @@ describe('SalesMonitor salesFilter()', () => {
const filter = {};
const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
expect(result.length).toEqual(5);
expect(result.length).toEqual(8);
await tx.rollback();
} catch (e) {
@ -254,8 +254,8 @@ describe('SalesMonitor salesFilter()', () => {
const firstTicket = result.shift();
const secondTicket = result.shift();
expect(firstTicket.totalProblems).toEqual(null);
expect(secondTicket.totalProblems).toEqual(null);
expect(firstTicket.totalProblems).toEqual(0);
expect(secondTicket.totalProblems).toEqual(0);
await tx.rollback();
} catch (e) {