Merge pull request '7986-workerMoto' (!3095) from 7986-workerMoto into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3095 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
8609e85ba1
|
@ -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');
|
|
@ -24,13 +24,28 @@
|
|||
"warehouseFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"sectorFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"labelerFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"isOnReservationMode": {
|
||||
"type": "boolean",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
"machineFk": {
|
||||
"type": "number"
|
||||
},
|
||||
"linesLimit": {
|
||||
"type": "number"
|
||||
},
|
||||
"volumeLimit": {
|
||||
"type": "number"
|
||||
},
|
||||
"sizeLimit": {
|
||||
"type": "number"
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
"sector": {
|
||||
|
@ -53,6 +68,11 @@
|
|||
"model": "ItemPackingType",
|
||||
"foreignKey": "itemPackingTypeFk",
|
||||
"primaryKey": "code"
|
||||
}
|
||||
},
|
||||
"machine": {
|
||||
"type": "belongsTo",
|
||||
"model": "Machine",
|
||||
"foreignKey": "machineFk"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue