5134-ModelsSalix #1768

Merged
alexm merged 9 commits from 5134-ModelsSalix into dev 2023-09-28 11:20:22 +00:00
19 changed files with 289 additions and 5 deletions

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');

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');

View File

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

View File

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

View File

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

View File

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

View File

@ -9,12 +9,11 @@
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
"description": "Identifier",
"id": true
sergiodt marked this conversation as resolved Outdated
Outdated
Review

Ns si es gitea, pero te com una tabulacio de mes

Ns si es gitea, pero te com una tabulacio de mes
},
"code": {
"type": "string",
"required": true
"type": "string"
},
"parkingFk": {
"type": "number"

View File

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

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"
sergiodt marked this conversation as resolved Outdated
Outdated
Review

Afegir tabulacio

Afegir tabulacio
},
"ExpeditionMistakeType": {
"dataSource": "vn"
},
"PrintServerQueue": {
"dataSource": "vn"
},
@ -47,6 +56,9 @@
"SaleGroup": {
"dataSource": "vn"
},
"SaleMistake": {
"dataSource": "vn"
},
"SaleGroupDetail": {
"dataSource": "vn"
},

View File

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

View File

@ -0,0 +1,19 @@
{
"name": "ExpeditionMistakeType",
"base": "VnModel",
"options": {
"mysql": {
"table": "expeditionMistakeType"
}
},
"properties": {
"code": {
"id":true,
"type": "string"
},
sergiodt marked this conversation as resolved
Review

LLevar espai

LLevar espai
"description": {
"type": "string"
}
}
}

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"
}]
}

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"
}]
}

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"
}
}
}

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"
},

View File

@ -0,0 +1,20 @@
{
"name": "MistakeType",
"base": "VnModel",
"options": {
"mysql": {
"table": "mistakeType"
}
},
"properties": {
"id": {
sergiodt marked this conversation as resolved Outdated
Outdated
Review

Tabulació

Tabulació
"id":true,
"type": "number"
},
"description": {
"type": "string"
}
}
}

View File

@ -0,0 +1,25 @@
{
"name": "WorkerMistake",
"base": "VnModel",
"options": {
"mysql": {
"table": "workerMistake"
}
},
"properties": {
"id": {
sergiodt marked this conversation as resolved Outdated
Outdated
Review

Tabulació

Tabulació
"id":true,
"type": "number"
},
"userFk": {
"type": "number"
},
"workerMistakeTypeFk": {
"type": "string"
},
"created": {
"type": "date"
}
}
}

View File

@ -0,0 +1,26 @@
{
"name": "WorkerMistakeType",
"base": "VnModel",
"options": {
"mysql": {
"table": "workerMistakeType"
}
},
"properties": {
"code": {
sergiodt marked this conversation as resolved Outdated
Outdated
Review

Tabulació

Tabulació
"id":true,
"type": "string"
},
"description": {
"type": "string"
}
},
"relations": {
"type": {
"type": "belongsTo",
"model": "WorkerMistakeType",
"foreignKey": "code"
}
}
}