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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado

This commit is contained in:
Alex Moreno 2023-09-28 13:21:12 +02:00
parent 65b0ec387f 2f22c2807a
commit 75e54bd82f
19 changed files with 289 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/changes/233401/.gitkeep
View File

11
db/changes/234001/00-models.sql Normal file
View File

@ -0,0 +1,11 @@
INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
VALUES
('ExpeditionMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
('WorkerMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
('ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'),
('WorkerMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'),
('MistakesTypes', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'),
('MistakeType','*','READ','ALLOW','ROLE','employee'),
('MachineWorker', '*', 'READ', 'ALLOW', 'ROLE', 'coolerAssist'),
('Printer','*','READ','ALLOW','ROLE','employee'),
('SaleMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');

4
db/dump/fixtures.sql
View File

@ -2974,3 +2974,7 @@ INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EU
(4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
(5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
(6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
INSERT INTO `vn`.`mistakeType` (`id`, `description`)
VALUES
(1, 'Incorrect quantity');

7
modules/invoiceOut/back/models/printer.json
View File

@ -18,6 +18,13 @@
"isLabeler": {
"type": "boolean"
}
},
"relations": {
"sector": {
"type": "belongsTo",
"model": "Sector",
"foreignKey": "sectorFk"
}
},
"acls": [{
"accessType": "READ",

6
modules/item/back/models/item-shelving-placement-supply.json
View File

@ -26,11 +26,17 @@
"shelving": {
"type": "string"
},
"subName": {
"type": "string"
},
"packing": {
"type": "number"
},
"stock": {
"type": "number"
},
"size": {
"type": "number"
}
}
}

6
modules/item/back/models/item-shelving.json
View File

@ -20,10 +20,16 @@
},
"created": {
"type": "date"
},
"grouping": {
"type": "number"
},
"isChecked": {
"type": "boolean"
},
"packing": {
"type": "number"
},
"visible": {
"type": "number"
},

3
modules/shelving/back/model-config.json
View File

@ -10,5 +10,8 @@
},
"Sector": {
"dataSource": "vn"
},
"Train": {
"dataSource": "vn"
}
}

7
modules/shelving/back/models/shelving.json
View File

@ -9,12 +9,11 @@
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
"description": "Identifier",
"id": true
},
"code": {
"type": "string",
"required": true
"type": "string"
},
"parkingFk": {
"type": "number"

19
modules/shelving/back/models/train.json Normal file
View File

@ -0,0 +1,19 @@
{
"name": "Train",
"options": {
"mysql": {
"table": "train"
}
},
"properties": {
"id": {
"type": "number",
"id": true
},
"name": {
"type": "string",
"required": true
}
}
}

12
modules/ticket/back/model-config.json
View File

@ -17,6 +17,12 @@
"Expedition": {
"dataSource": "vn"
},
"ExpeditionPallet": {
"dataSource": "vn"
},
"ExpeditionScan": {
"dataSource": "vn"
},
"ExpeditionState": {
"dataSource": "vn"
},
@ -32,6 +38,9 @@
"ExpeditionMistake": {
"dataSource": "vn"
},
"ExpeditionMistakeType": {
"dataSource": "vn"
},
"PrintServerQueue": {
"dataSource": "vn"
},
@ -47,6 +56,9 @@
"SaleGroup": {
"dataSource": "vn"
},
"SaleMistake": {
"dataSource": "vn"
},
"SaleGroupDetail": {
"dataSource": "vn"
},

2
modules/ticket/back/models/expeditionMistake.json
View File

@ -24,7 +24,7 @@
},
"type": {
"type": "belongsTo",
"model": "MistakeType",
"model": "ExpeditionMistakeType",
"foreignKey": "typeFk"
}
}

19
modules/ticket/back/models/expeditionMistakeType.json Normal file
View File

@ -0,0 +1,19 @@
{
"name": "ExpeditionMistakeType",
"base": "VnModel",
"options": {
"mysql": {
"table": "expeditionMistakeType"
}
},
"properties": {
"code": {
"id":true,
"type": "string"
},
"description": {
"type": "string"
}
}
}

22
modules/ticket/back/models/expeditionPallet.json Normal file
View File

@ -0,0 +1,22 @@
{
"name": "ExpeditionPallet",
"options": {
"mysql": {
"table": "expeditionPallet"
}
},
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
}
},
"acls": [{
"accessType": "WRITE",
"principalType": "ROLE",
"principalId": "production",
"permission": "ALLOW"
}]
}

47
modules/ticket/back/models/expeditionScan.json Normal file
View File

@ -0,0 +1,47 @@
{
"name": "ExpeditionScan",
"options": {
"mysql": {
"table": "expeditionScan"
}
},
"properties": {
"id": {
"type": "number",
"description": "Identifier"
},
"expeditionFk": {
"type": "number",
"description": "Identifier",
"id": true
},
"palletFk": {
"type": "number",
"description": "Identifier",
"id": true
},
"scanned": {
"type": "date",
"default": "$now"
}
},
"relations": {
"expedition": {
"type": "belongsTo",
"model": "Expedition",
"foreignKey": "expeditionFk"
},
"pallet": {
"type": "belongsTo",
"model": "expeditionPallet",
"foreignKey": "palletFk"
}
},
"acls": [{
"accessType": "WRITE",
"principalType": "ROLE",
"principalId": "production",
"permission": "ALLOW"
}]
}

49
modules/ticket/back/models/sale-mistake.json Normal file
View File

@ -0,0 +1,49 @@
{
"name": "SaleMistake",
"base": "VnModel",
"options": {
"mysql": {
"table": "saleMistake"
}
},
"properties": {
"id": {
"id": true,
"type": "number",
"description": "Identifier"
},
"created": {
"type": "date"
},
"saleFk": {
"type": "number",
"required": true
},
"userFk": {
"type": "number",
"required": true
},
"typeFk": {
"type": "number",
"required": true
}
},
"relations": {
"sale": {
"type": "belongsTo",
"model": "Sale",
"foreignKey": "saleFk"
},
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "userFk"
},
"mistakeType": {
"type": "belongsTo",
"model": "MistakeType",
"foreignKey": "typeFk"
}
}
}

9
modules/worker/back/model-config.json
View File

@ -43,6 +43,9 @@
},
"EducationLevel": {
"dataSource": "vn"
},
"MistakeType": {
"dataSource": "vn"
},
"ProfileType":{
"dataSource": "vn"
@ -83,6 +86,12 @@
"WorkerMana": {
"dataSource": "vn"
},
"WorkerMistake": {
"dataSource": "vn"
},
"WorkerMistakeType": {
"dataSource": "vn"
},
"WorkerMedia": {
"dataSource": "vn"
},

20
modules/worker/back/models/mistakeType.json Normal file
View File

@ -0,0 +1,20 @@
{
"name": "MistakeType",
"base": "VnModel",
"options": {
"mysql": {
"table": "mistakeType"
}
},
"properties": {
"id": {
"id":true,
"type": "number"
},
"description": {
"type": "string"
}
}
}

25
modules/worker/back/models/workerMistake.json Normal file
View File

@ -0,0 +1,25 @@
{
"name": "WorkerMistake",
"base": "VnModel",
"options": {
"mysql": {
"table": "workerMistake"
}
},
"properties": {
"id": {
"id":true,
"type": "number"
},
"userFk": {
"type": "number"
},
"workerMistakeTypeFk": {
"type": "string"
},
"created": {
"type": "date"
}
}
}

26
modules/worker/back/models/workerMistakeType.json Normal file
View File

@ -0,0 +1,26 @@
{
"name": "WorkerMistakeType",
"base": "VnModel",
"options": {
"mysql": {
"table": "workerMistakeType"
}
},
"properties": {
"code": {
"id":true,
"type": "string"
},
"description": {
"type": "string"
}
},
"relations": {
"type": {
"type": "belongsTo",
"model": "WorkerMistakeType",
"foreignKey": "code"
}
}
}