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

Merge branch 'dev' into 7648_dev_customerEntries

This commit is contained in:
Javier Segarra 2024-07-02 09:34:46 +02:00
parent f27bdec758 68b7f5baf6
commit f41c2489d9
2 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/routines/vn/procedures/setParking.sql
View File

@ -23,6 +23,7 @@ proc: BEGIN
LEAVE proc; LEAVE proc;
END IF; END IF;
IF vParam REGEXP '^[0-9]+$' THEN
-- Se comprueba si es una preparación previa -- Se comprueba si es una preparación previa
SELECT COUNT(*) INTO vIsSaleGroup SELECT COUNT(*) INTO vIsSaleGroup
FROM vn.saleGroup sg FROM vn.saleGroup sg
@ -54,8 +55,9 @@ proc: BEGIN
CALL vn.collection_setParking(vParam, vParkingFk); CALL vn.collection_setParking(vParam, vParkingFk);
LEAVE proc; LEAVE proc;
END IF; END IF;
ELSE
-- Por descarte, se considera una matrícula -- Por descarte, se considera una matrícula
CALL vn.shelving_setParking(vParam, vParkingFk); CALL vn.shelving_setParking(vParam, vParkingFk);
END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

4
modules/worker/back/models/operator.json
View File

@ -26,6 +26,10 @@
}, },
"labelerFk": { "labelerFk": {
"type": "number" "type": "number"
},
"isOnReservationMode": {
"type": "boolean",
"required": true
} }
}, },
"relations": { "relations": {