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

Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Guillermo Bonet 2024-07-09 14:49:51 +02:00
parent 5b9e6f0e59 64ed96c8ae
commit 0b61a175ef
5 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/routines/vn/procedures/collection_assign.sql
View File

@ -26,16 +26,16 @@ BEGIN
vErrorNumber = MYSQL_ERRNO, vErrorNumber = MYSQL_ERRNO,
vErrorMsg = MESSAGE_TEXT; vErrorMsg = MESSAGE_TEXT;
IF vLockName IS NOT NULL THEN
DO RELEASE_LOCK(vLockName);
CALL util.debugAdd('collection_assign', JSON_OBJECT( CALL util.debugAdd('collection_assign', JSON_OBJECT(
'errorNumber', vErrorNumber, 'errorNumber', vErrorNumber,
'errorMsg', vErrorMsg, 'errorMsg', vErrorMsg,
'lockName', vLockName, 'lockName', vLockName,
'userFk', vUserFk 'userFk', vUserFk
)); -- Tmp )); -- Tmp
END IF;
IF vLockName IS NOT NULL THEN
DO RELEASE_LOCK(vLockName);
END IF;
RESIGNAL; RESIGNAL;
END; END;

6
db/routines/vn/procedures/collection_new.sql
View File

@ -53,8 +53,6 @@ BEGIN
vErrorNumber = MYSQL_ERRNO, vErrorNumber = MYSQL_ERRNO,
vErrorMsg = MESSAGE_TEXT; vErrorMsg = MESSAGE_TEXT;
IF vLockName IS NOT NULL THEN
DO RELEASE_LOCK(vLockName);
CALL util.debugAdd('collection_new', JSON_OBJECT( CALL util.debugAdd('collection_new', JSON_OBJECT(
'errorNumber', vErrorNumber, 'errorNumber', vErrorNumber,
'errorMsg', vErrorMsg, 'errorMsg', vErrorMsg,
@ -62,8 +60,10 @@ BEGIN
'userFk', vUserFk, 'userFk', vUserFk,
'ticketFk', vTicketFk 'ticketFk', vTicketFk
)); -- Tmp )); -- Tmp
END IF;
IF vLockName IS NOT NULL THEN
DO RELEASE_LOCK(vLockName);
END IF;
RESIGNAL; RESIGNAL;
END; END;

12
db/routines/vn/procedures/ticket_splitItemPackingType.sql
View File

@ -16,6 +16,9 @@ BEGIN
DECLARE vNewTicketFk INT; DECLARE vNewTicketFk INT;
DECLARE vPackingTypesToSplit INT; DECLARE vPackingTypesToSplit INT;
DECLARE vDone INT DEFAULT FALSE; DECLARE vDone INT DEFAULT FALSE;
DECLARE vErrorNumber INT;
DECLARE vErrorMsg TEXT;
DECLARE vSaleGroup CURSOR FOR DECLARE vSaleGroup CURSOR FOR
SELECT itemPackingTypeFk SELECT itemPackingTypeFk
FROM tSaleGroup FROM tSaleGroup
@ -26,6 +29,15 @@ BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN BEGIN
GET DIAGNOSTICS CONDITION 1
vErrorNumber = MYSQL_ERRNO,
vErrorMsg = MESSAGE_TEXT;
CALL util.debugAdd('ticket_splitItemPackingType', JSON_OBJECT(
'errorNumber', vErrorNumber,
'errorMsg', vErrorMsg,
'ticketFk', vTicketFk
)); -- Tmp
ROLLBACK; ROLLBACK;
RESIGNAL; RESIGNAL;
END; END;

2
db/versions/11145-pinkLaurel/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.payrollWorker CHANGE grupotarifa__ grupotarifa int(10) NOT NULL;
ALTER TABLE vn.payrollWorker MODIFY COLUMN grupotarifa int(10) NOT NULL;

12
modules/ticket/back/methods/ticket/filter.js
View File

@ -347,6 +347,18 @@ module.exports = Self => {
if (hasWhere) if (hasWhere)
stmt.merge(conn.makeWhere(problems)); stmt.merge(conn.makeWhere(problems));
if (filter.order) {
if (typeof filter.order == 'string') filter.order = [filter.order];
const index = filter.order.findIndex(o => o.includes('stateFk'));
if (index > -1) {
filter.order = [
...filter.order.slice(0, index),
'refFk ' + filter.order[index].split(' ')[1],
...filter.order.slice(index)
];
}
}
stmt.merge(conn.makeOrderBy(filter.order)); stmt.merge(conn.makeOrderBy(filter.order));
stmt.merge(conn.makeLimit(filter)); stmt.merge(conn.makeLimit(filter));
const ticketsIndex = stmts.push(stmt) - 1; const ticketsIndex = stmts.push(stmt) - 1;