Merge pull request '7986-workerMoto' (!3095) from 7986-workerMoto into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #3095
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2024-10-18 07:24:49 +00:00
commit 8609e85ba1
2 changed files with 29 additions and 3 deletions

View File

@ -0,0 +1,6 @@
ALTER TABLE `vn`.`operator`
ADD COLUMN `machineFk` int(11) DEFAULT NULL,
ADD CONSTRAINT `operator_machine_FK` FOREIGN KEY (`machineFk`) REFERENCES `vn`.`machine` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Machine','*','*','ALLOW','ROLE','productionBoss');

View File

@ -24,13 +24,28 @@
"warehouseFk": { "warehouseFk": {
"type": "number" "type": "number"
}, },
"sectorFk": {
"type": "number"
},
"labelerFk": { "labelerFk": {
"type": "number" "type": "number"
}, },
"isOnReservationMode": { "isOnReservationMode": {
"type": "boolean", "type": "boolean",
"required": true "required": true
} },
"machineFk": {
"type": "number"
},
"linesLimit": {
"type": "number"
},
"volumeLimit": {
"type": "number"
},
"sizeLimit": {
"type": "number"
}
}, },
"relations": { "relations": {
"sector": { "sector": {
@ -53,6 +68,11 @@
"model": "ItemPackingType", "model": "ItemPackingType",
"foreignKey": "itemPackingTypeFk", "foreignKey": "itemPackingTypeFk",
"primaryKey": "code" "primaryKey": "code"
} },
"machine": {
"type": "belongsTo",
"model": "Machine",
"foreignKey": "machineFk"
}
} }
} }