Merge pull request '5134-ModelsSalix' (!1768) from 5134-ModelsSalix into dev

Reviewed-on: #1768
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

db/changes/234001/00-models.sql

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

db/dump/fixtures.sql

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

modules/invoiceOut/back/models/printer.json

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

modules/item/back/models/item-shelving-placement-supply.json

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

modules/item/back/models/item-shelving.json

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

modules/shelving/back/model-config.json

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

modules/shelving/back/models/shelving.json

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

modules/shelving/back/models/train.json

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

modules/ticket/back/model-config.json

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

modules/ticket/back/models/expeditionMistake.json

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

modules/ticket/back/models/expeditionMistakeType.json

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

modules/ticket/back/models/expeditionPallet.json

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

modules/ticket/back/models/expeditionScan.json

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

modules/ticket/back/models/sale-mistake.json

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

modules/worker/back/model-config.json

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

modules/worker/back/models/mistakeType.json

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

modules/worker/back/models/workerMistake.json

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

modules/worker/back/models/workerMistakeType.json

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