Merge branch 'develop' into dayana

41 files changed, 620 insertions, 97 deletions

diff --git a/back/aco-mdvrptw/pom.xml b/back/aco-mdvrptw/pom.xml
new file mode 100644
index 0000000..29293bc
--- /dev/null
+++ b/back/aco-mdvrptw/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>aco-mdvrptw</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java
new file mode 100644
index 0000000..f422f31
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java
@@ -0,0 +1,33 @@
+package com.odiparpack.acovrp;
+
+import java.util.ArrayList;
+
+public class Ant {
+    // graph
+    public int current_index;
+    public double vehicle_load;
+    public double vehicle_travel_time;
+    ArrayList<Integer> travel_path;
+    ArrayList<Integer> index_to_visit;
+    double total_travel_distance;
+
+    public Ant() {
+        travel_path = new ArrayList<>();
+        index_to_visit = new ArrayList<>();
+    }
+
+    public static void main(String[] args) {
+        int i = 0;
+        Ant a = new Ant();
+
+        for (i = 0; i < 100; i++) {
+            a.travel_path.add(100 - i);
+        }
+
+        for (i = 0; i < 100; i++) {
+            System.out.format("%d\n", a.travel_path.get(i));
+        }
+        System.out.println(a.travel_path);
+        System.out.println(a);
+    }
+}
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java
new file mode 100644
index 0000000..33320bc
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java
@@ -0,0 +1,19 @@
+package com.odiparpack.acovrp;
+
+public class Main {
+    public static void basic_aco() {
+
+    }
+
+    public static void vrptw_aco_figure() {
+
+    }
+
+    public static void example1() {
+
+    }
+
+    public static void main(String[] args) {
+        example1();
+    }
+}
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java
new file mode 100644
index 0000000..8ece5aa
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java
@@ -0,0 +1,4 @@
+package com.odiparpack.acovrp;
+
+public class MultipleAntColonySystem {
+}
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java
new file mode 100644
index 0000000..9ee546b
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java
@@ -0,0 +1,4 @@
+package com.odiparpack.acovrp;
+
+public class VrptwGraph {
+}
diff --git a/back/aco-mdvrptw/src/main/java/org/example/Main.java b/back/aco-mdvrptw/src/main/java/org/example/Main.java
new file mode 100644
index 0000000..ce5a91a
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/org/example/Main.java
@@ -0,0 +1,45 @@
+package org.example;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class Main {
+    public static void main(String[] args) {
+        String command = "pwd && date && ls ~";
+        command = "~/.odiparpack";
+        try {
+            System.out.println(
+                    System.getProperty("os.name") + "\n" +
+                    System.getProperty("user.name")
+            );
+            ProcessBuilder pb
+                    = new ProcessBuilder("sh", "-c", command);
+            pb.directory(
+                    new File(System.getProperty("user.home"))
+            );
+            Process process = pb.start();
+
+            StringBuilder output = new StringBuilder();
+            BufferedReader reader
+                    = new BufferedReader(new InputStreamReader(
+                            process.getInputStream()
+            ));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                output.append(line + '\n');
+            }
+            int exitVal = process.waitFor();
+            if (exitVal == 0) {
+                System.out.println("The output is:");
+                System.out.println(output);
+                //System.exit(0);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/back/odiparback/mvnw b/back/odiparback/mvnw
index 8a8fb22..8a8fb22 100644..100755
--- a/back/odiparback/mvnw
+++ b/back/odiparback/mvnw
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
index 575d38a..7a17ded 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
@@ -23,8 +23,10 @@ public class AlmacenDaoImp implements AlmacenDao {
     public List<Almacen> getAll() {
         List<Almacen> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Almacen";
-            resultado =  entityManager.createQuery(query).getResultList();
+            String hql = "FROM almacen ";
+            resultado = entityManager.createQuery(hql).getResultList();
+//            String query = "SELECT * FROM almacen";
+//            resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
             System.out.print(ex.getMessage()); 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java
index 1bf1882..745a0c2 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java
@@ -23,7 +23,7 @@ public class AveriaDaoImp implements AveriaDao{
     public List<Averia> getAll() {
         List<Averia> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Averia";
+            String query = "SELECT * FROM averia";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java
index 4c97808..00d723d 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java
@@ -23,7 +23,7 @@ public class CamionDaoImp implements CamionDao {
     public List<Camion> getAll() {
         List<Camion> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Camion";
+            String query = "SELECT * FROM camion";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java
index 2a9ae44..54b8d92 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java
@@ -23,7 +23,7 @@ public class ClienteDaoImp implements ClienteDao {
     public List<Cliente> getAll() {
         List<Cliente> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Cliente";
+            String query = "SELECT * FROM cliente";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java
index ac076cf..37d18df 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java
@@ -23,7 +23,7 @@ public class PTGDaoImp implements PTGDao{
     public List<PTG> getAll() {
         List<PTG> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_PTG";
+            String query = "SELECT * FROM ptg";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java
index 3ebc387..943a085 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java
@@ -23,7 +23,7 @@ public class PedidoDaoImp implements PedidoDao {
     public List<Pedido> getAll() {
         List<Pedido> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Pedido";
+            String query = "SELECT * FROM pedido";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java
index 15788d4..f5ca8ef 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java
@@ -23,7 +23,7 @@ public class RegionDaoImp implements RegionDao {
     public List<Region> getAll() {
         List<Region> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Region";
+            String query = "SELECT * FROM region";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java
index 0e491b7..de8ed6c 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java
@@ -23,7 +23,7 @@ public class RutaDaoImp implements RutaDao {
     public List<Ruta> getAll() {
         List<Ruta> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Ruta";
+            String query = "SELECT * FROM ruta";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java
index f2980cf..0248800 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java
@@ -23,7 +23,7 @@ public class TipoAveriaDaoImp implements TipoAveriaDao{
     public List<TipoAveria> getAll() {
         List<TipoAveria> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_TipoAveria";
+            String query = "SELECT * FROM tipoAveria";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java
index 0889570..9758a3b 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java
@@ -23,7 +23,7 @@ public class TipoCamionDaoImp implements TipoCamionDao{
     public List<TipoCamion> getAll() {
         List<TipoCamion> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_TipoCamion";
+            String query = "SELECT * FROM tipoCamion";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java
index 717dcf2..abd275d 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java
@@ -23,7 +23,7 @@ public class TramoDaoImp implements TramoDao{
     public List<Tramo> getAll() {
         List<Tramo> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Tramo";
+            String query = "SELECT * FROM tramo";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java
index 1808c61..7f5f7dd 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java
@@ -23,7 +23,7 @@ public class TramoRutaDaoImp implements TramoRutaDao {
     public List<TramoRuta> getAll() {
         List<TramoRuta> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_TramoRuta";
+            String query = "SELECT * FROM tramoRuta";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java
index c0e6ef1..9ed2f86 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java
@@ -23,7 +23,7 @@ public class UsuarioDaoImp implements UsuarioDao{
     public List<Usuario> getAll() {
         List<Usuario> resultado = null;
         try{
-            String query = "SELECT * FROM ODP_Usuario";
+            String query = "SELECT * FROM usuario";
             resultado =  entityManager.createQuery(query).getResultList();
         }
         catch(Exception ex){ 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/controllers/eliminame.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/controllers/eliminame.java
new file mode 100644
index 0000000..946b9ef
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/controllers/eliminame.java
@@ -0,0 +1,5 @@
+package pe.edu.pucp.odiparback.demo.controllers;
+
+public class eliminame {
+    
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/dao/impl/eliminame.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/dao/impl/eliminame.java
new file mode 100644
index 0000000..11a66ab
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/dao/impl/eliminame.java
@@ -0,0 +1,5 @@
+package pe.edu.pucp.odiparback.demo.dao.impl;
+
+public class eliminame {
+    
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java
index ab8e989..121b711 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java
@@ -28,22 +28,28 @@ import lombok.Setter;
 public class Almacen {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idAlmacen", updatable = false, nullable = false)
-    private int idAlmacen;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
-    @Column(name = "cuidad")
-    private String cuidad; //nombre del almacen = nombre cuidad
+    @Column(name = "ubigeo")
+    private String ubigeo;
 
-    @Column(name = "posicionX")
-    private int posicionX;
+    @Column(name = "departamento")
+    private String departamento;
 
-    @Column(name = "posicionY")
-    private int posicionY;
+    @Column(name = "provincia")
+    private String provincia;
+
+    @Column(name = "latitud")
+    private double latitud;
+
+    @Column(name = "longitud")
+    private double longitud;
 
     @Column(name = "esPrincipal")
     private boolean esPrincipal;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idRegion")
+    @JoinColumn(name = "region_fk")
     private Region region;
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java
index 69d69c3..dae9a24 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java
@@ -30,20 +30,20 @@ import lombok.Setter;
 public class Averia {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idAveria", updatable = false, nullable = false)
-    private int idAveria;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "descripcion")
-    private String nombre;
+    private String descripcion;
     
     @Column(name = "fechaRegistro")
     private Date fechaRegistro;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idCamion")
+    @JoinColumn(name = "camion_fk")
     private Camion camion;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idTipoAveria")
+    @JoinColumn(name = "tipoAveria_fk")
     private TipoAveria tipoAveria;
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java
index 123ce79..834e2d1 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java
@@ -28,20 +28,20 @@ import lombok.Setter;
 public class Camion {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idCamion", updatable = false, nullable = false)
-    private int idCamion;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "placa")
     private String placa;
 
     @Column(name = "kilometraje")
-    private Double kilometraje;
+    private double kilometraje;
 
     @Column(name = "estado")
     private int estado = 0; //0:
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idTipoCamion")
+    @JoinColumn(name = "tipoCamion_fk")
     private TipoCamion tipoCamion;
 
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java
index bea5d13..acb4213 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java
@@ -25,14 +25,14 @@ import lombok.Setter;
 public class Cliente {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idCliente", updatable = false, nullable = false)
-    private int idCliente;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "nombreCompleto")
-    private String nombreCompleto;
+    private String nombreCompleto;      // Razon Social
 
     @Column(name = "dni")
-    private int dni;
+    private int dni;            // RUC
 
     @Column(name = "correo")
     private String correo;
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java
index 2a21379..edc4194 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java
@@ -2,12 +2,7 @@ package pe.edu.pucp.odiparback.models;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
@@ -19,7 +14,7 @@ import lombok.Setter;
 
 @Entity
 @Table(name = "ptg")
-@SQLDelete(sql = "UPDATE ptg SET activo = 0 WHERE id = ?")
+@SQLDelete(sql = "UPDATE PTG SET activo = 0 WHERE id = ?")
 @Where(clause = "activo = 1")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -29,12 +24,16 @@ public class PTG {
     //Plan de transporte Generado
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idPTG", updatable = false, nullable = false)
+    @Column(name = "id", updatable = false, nullable = false)
     private int idPTG;
 
-    @Column(name = "fechaGenerada")
-    private Date fechaGenerada;
+    @Column(name = "fechaGenerado")
+    private Date fechaGenerado;
 
     @Column(name = "esSimulacion")
-    private boolean esSimulacion;   
+    private boolean esSimulacion;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "usuario_fk")
+    private Usuario usuario_fk;    // Usuario que genera
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java
index 616aea4..4df158b 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java
@@ -34,33 +34,33 @@ import lombok.Setter;
 public class Pedido {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idPedido", updatable = false, nullable = false)
-    private int idPedido;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "cantidad")
     private int cantidad;
 
     @Column(name = "estado")
-    private int estado; //0: pendiente
+    private int estado;         //0: pendiente
 
-    @Column(name = "codigo")
-    private int codigo;
+    @Column(name = "codigoPedido")
+    private String codigoPedido;    // URL
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idAlmacen")
+    @JoinColumn(name = "almacen_fk")
     private Almacen almacen;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idCliente")
+    @JoinColumn(name = "cliente_fk")
     private Cliente cliente;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idUsuario")
-    private Usuario usuarioRegistro; //Usuario que registra
+    @JoinColumn(name = "usuario_fk")
+    private Usuario usuarioRegistro;    //Usuario que registra
 
     @Temporal(TemporalType.TIMESTAMP)
     @Column(columnDefinition = "DATETIME", nullable = false)
-    protected Date fechaRegistro = new Date();
+    protected Date fechaPedido = new Date();
 
     @Temporal(TemporalType.TIMESTAMP)
     @Column(columnDefinition = "DATETIME", nullable = false)
@@ -73,7 +73,7 @@ public class Pedido {
 
     @PrePersist
     private void onCreate(){
-        fechaRegistro=fechaModificacion=addHoursToJavaUtilDate(new Date(), -5);
+        fechaPedido=fechaPedido=addHoursToJavaUtilDate(new Date(), -5);
     }
     
     public Date addHoursToJavaUtilDate(Date date, int hours) {
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java
index 1341317..b0d4625 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java
@@ -25,8 +25,8 @@ import lombok.Setter;
 public class Region {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idRegion", updatable = false, nullable = false)
-    private int idRegion;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "nombre")
     private String nombre;
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java
index a3bc5b5..0be1521 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java
@@ -25,8 +25,8 @@ import lombok.Setter;
 public class Rol {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idRol", updatable = false, nullable = false)
-    private int idRol;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "nombre")
     private String nombre;
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java
index b1a9368..2bc8ce0 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java
@@ -33,28 +33,24 @@ import lombok.Setter;
 public class Ruta {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idRuta", updatable = false, nullable = false)
-    private int idRuta;
-
-    @Column(name = "nombre")
-    private String nombre;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "fechaInicio")
     private Date fechaInicio;
 
-    @Column(name = "fechaFinEst")
-    private Date fechaFinEst;
-
-    
-    @Column(name = "fechaFinReal")
-    private Date fechaFinReal;
+    @Column(name = "fechaFin")
+    private Date fechaFin;
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinColumn(name = "idTramoRuta")
+    @JoinColumn(name = "id")
     private List<TramoRuta> tramoRutas;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idCamion")
+    @JoinColumn(name = "camion_fk")
     private Camion camion;
 
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "PTG_fk")
+    private PTG ptg;
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java
index 92156fd..84488eb 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java
@@ -27,12 +27,12 @@ import lombok.Setter;
 public class TipoAveria {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idTipoAveria", updatable = false, nullable = false)
-    private int idTipoAveria;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "nombre")
     private String nombre;
 
     @Column(name = "duracion")
-    private Date duracion;
+    private int duracion;
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java
index 608a089..f8aab31 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java
@@ -25,13 +25,13 @@ import lombok.Setter;
 public class TipoCamion {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idTipoCamion", updatable = false, nullable = false)
-    private int idTipoCamion;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "nombre")
     private String nombre; //Tipo A, B o C
 
-    @Column(name = "velocidad")
-    private Double velocidad;
+    @Column(name = "capacidad")
+    private int capacidad;
 
 }
\ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java
index 1a615d0..4f1ea69 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java
@@ -29,20 +29,20 @@ public class Tramo {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "idTramo", updatable = false, nullable = false)
-    private int idTramo;
+    private int id;
 
     @Column(name = "distancia")
     private double distancia;
 
-    @Column(name = "estado")
-    private boolean estado;
+    @Column(name = "estaBloqueado")
+    private boolean estaBloqueado;             // estado
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idAlmacen")
+    @JoinColumn(name = "almacen1_fk")
     private Almacen origen;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idAlmacen")
+    @JoinColumn(name = "almacen2_fk")
     private Almacen destino;
 
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java
index 7c55588..a2d9241 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java
@@ -21,8 +21,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "tramoRuta")
-@SQLDelete(sql = "UPDATE tramoRuta SET activo = 0 WHERE id = ?")
+@Table(name = "tramo_ruta")
+@SQLDelete(sql = "UPDATE tramo_ruta SET activo = 0 WHERE id = ?")
 @Where(clause = "activo = 1")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -30,11 +30,11 @@ import lombok.Setter;
 public class TramoRuta {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idTramoRuta", updatable = false, nullable = false)
-    private int idTramoRuta;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
 
     @Column(name = "orden")
-    private int orden; // idk
+    private int orden;      // idk -> Rpta: # de orden en la ruta
     
     @Column(name = "paquetesEntregar")
     private int paquetesEntregar;
@@ -52,6 +52,8 @@ public class TramoRuta {
     private Date horaLlegadaReal;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idTramo")
+    @JoinColumn(name = "tramo_fk")
     private Tramo tramo;
+
+    // ruta_fk
 }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java
index b7902ba..9920c12 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java
@@ -28,8 +28,8 @@ import lombok.Setter;
 public class Usuario {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idUsuario", updatable = false, nullable = false)
-    private int idUsuario;
+    @Column(name = "id", updatable = false, nullable = false)
+    private int id;
     
     @Column(name = "usuario")
     private String usuario;
@@ -50,6 +50,10 @@ public class Usuario {
     private String correo;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "idRol")
+    @JoinColumn(name = "creador_fk")
+    private Usuario creador;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "rol_fk")
     private Rol rol;
 }
diff --git a/back/odiparback/src/main/resources/application.properties b/back/odiparback/src/main/resources/application.properties
index 8b13789..6c4feb8 100644
--- a/back/odiparback/src/main/resources/application.properties
+++ b/back/odiparback/src/main/resources/application.properties
@@ -1 +1,7 @@
-
+# MySQL
+spring.datasource.url=jdbc:mysql://tokumori.xyz:3306/odiparback
+spring.datasource.username=gabs
+spring.datasource.password=odiparfront123odiparfront123odiparfront123
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+# com.mysql.cj.jdbc.Driver   (new driver)
\ No newline at end of file
diff --git a/back/sql/20220601dump.sampledata.sql b/back/sql/20220601dump.sampledata.sql
new file mode 100644
index 0000000..5042e32
--- /dev/null
+++ b/back/sql/20220601dump.sampledata.sql
@@ -0,0 +1,85 @@
+-- Adminer 4.7.9 MySQL dump
+
+SET NAMES utf8;
+SET time_zone = '+00:00';
+SET foreign_key_checks = 0;
+SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
+
+SET NAMES utf8mb4;
+
+TRUNCATE `almacen`;
+INSERT INTO `almacen` (`id`, `activo`, `ubigeo`, `departamento`, `provincia`, `latitud`, `longitud`, `esPrincipal`, `region_fk`) VALUES
+(1,	1,  '10201',	'Amazonas',	'Bagua',	-5.63906152,	-78.53166353,	0,	3),
+(2,	1,  '40101',	'Arequipa',	'Arequipa',	-16.39881421,	-71.537019649,	1,	1),
+(3,	1,  '50901',	'Ayacucho',	'Sucre',	-14.01125749,	-73.83884087,	0,	2),
+(4,	1,  '130101',	'La Libertad',	'Trujillo',	-8.11176389,	-79.02868652,	1,	1),
+(5,	1,  '150101',	'Lima',	'Lima',	-12.04591952,	-77.03049615,	1,	1),
+(6,	1,  '230101',	'Tacna',	'Tacna',	-18.0137008,	-70.2507964,	0,	1);
+
+TRUNCATE `averia`;
+
+TRUNCATE `camion`;
+INSERT INTO `camion` (`id`, `activo`, `placa`, `kilometraje`, `estado`, `tipoCamion_fk`) VALUES
+(1,	1,  'ETALLIC',	69420,	1,	1);
+
+TRUNCATE `cliente`;
+INSERT INTO `cliente` (`id`, `activo`, `nombreCompleto`, `dni`, `correo`, `telefono`) VALUES
+(1,	1,  'EmpresaAAA',	'1234567890',	'[email protected]',	'123456789'),
+(2,	1,  'EmpresaBBB',	'1234567890',	'[email protected]',	'123456789');
+
+TRUNCATE `pedido`;
+INSERT INTO `pedido` (`id`, `activo`, `fechaPedido`, `cantidad`, `plazoEntrega`, `estado`, `codigoPedido`, `almacen_fk`, `cliente_fk`, `usuario_fk`, `PTG_fk`) VALUES
+(2,	1,  '2022-01-01 00:00:00',	10,	1,	0,	'20220101_000001',	3,	1,	4,	NULL);
+
+TRUNCATE `PTG`;
+INSERT INTO `PTG` (`id`, `activo`, `fechaGenerado`, `esSimulacion`, `usuario_fk`) VALUES
+(1,	1,  '2022-06-01 05:10:47',	1,	1);
+
+TRUNCATE `region`;
+INSERT INTO `region` (`id`, `activo`, `nombre`) VALUES
+(1,	1,  'costa'),
+(2,	1,  'sierra'),
+(3,	1,  'selva');
+
+TRUNCATE `rol`;
+INSERT INTO `rol` (`id`, `activo`, `nombre`) VALUES
+(1,	1,  'superuser');
+
+TRUNCATE `ruta`;
+INSERT INTO `ruta` (`id`, `activo`, `fechaInicio`, `fechaFin`, `PTG_fk`, `camion_fk`) VALUES
+(1,	1,  '2022-01-01 00:00:00',	'2022-01-02 00:00:00',	1,	1);
+
+TRUNCATE `tipoAveria`;
+
+TRUNCATE `tipoCamion`;
+INSERT INTO `tipoCamion` (`id`, `activo`, `nombre`, `capacidad`) VALUES
+(1,	1,  'tipoA',	90),
+(2,	1,  'tipoB',	45),
+(3,	1,  'tipoC',	30);
+
+TRUNCATE `tramo`;
+INSERT INTO `tramo` (`id`, `activo`, `distancia`, `estaBloqueado`, `almacen1_fk`, `almacen2_fk`) VALUES
+(1,	1,  10,	0,	2,	5),
+(2,	1,  10,	0,	3,	5),
+(3,	1,  10,	0,	4,	5),
+(4,	1,  10,	0,	6,	5),
+(5,	1,  20,	0,	1,	4),
+(6,	1,  20,	0,	4,	1),
+(7,	1,  10,	0,	5,	2),
+(8,	1,  10,	0,	5,	3),
+(9,	1,  10,	0,	5,	4),
+(10,	1,  10,	0,	5,	6);
+
+TRUNCATE `tramo_ruta`;
+INSERT INTO `tramo_ruta` (`id`, `activo`, `orden`, `horaSalidaEst`, `horaLlegadaEst`, `horaSalidaReal`, `horaLlegadaReal`, `paquetesEntregar`, `ruta_fk`, `tramo_fk`) VALUES
+(1,	1,  1,	'2022-01-01 10:00:00',	'2022-01-01 15:00:00',	NULL,	NULL,	0,	1,	9),
+(2,	1,  2,	'2022-01-01 16:00:00',	'2022-01-01 21:00:00',	NULL,	NULL,	10,	1,	6);
+
+TRUNCATE `usuario`;
+INSERT INTO `usuario` (`id`, `activo`, `usuario`, `clave`, `nombre`, `apellido`, `dni`, `correo`, `creador_fk`, `rol_fk`) VALUES
+(1,	1,  'gabs',	'*6AB7931FB2D104A478932D23AF4C7700D1A0C61A',	'Gabriela',	'Hernandez',	'12345678',	'[email protected]',	NULL,	1),
+(2,	1,  'dayana',	'*D279131EA232308E083B3EA192B78A0C15EA8701',	'Dayana',	'Alarcon',	'12345678',	'[email protected]',	1,	1),
+(3,	1,  'jannina',	'*D279131EA232308E083B3EA192B84A0C15EA8701',	'Jannina',	'DeLosGodos',	'12345678',	'[email protected]',	1,	1),
+(4,	1,  'mitsuo',	'*D279131EA232308E083B3EA192B74A0C15EA8701',	'Mitsuo',	'Tokumori',	'12345678',	'[email protected]',	1,	1);
+
+-- 2022-06-01 06:13:09
diff --git a/back/sql/20220601dump.tables+views.sql b/back/sql/20220601dump.tables+views.sql
new file mode 100644
index 0000000..7ff1c24
--- /dev/null
+++ b/back/sql/20220601dump.tables+views.sql
@@ -0,0 +1,245 @@
+-- Adminer 4.7.9 MySQL dump
+
+SET NAMES utf8;
+SET time_zone = '+00:00';
+SET foreign_key_checks = 0;
+SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
+
+SET NAMES utf8mb4;
+
+DROP TABLE IF EXISTS `almacen`;
+CREATE TABLE `almacen` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `ubigeo` varchar(10) NOT NULL,
+  `departamento` varchar(100) NOT NULL,
+  `provincia` varchar(100) NOT NULL,
+  `latitud` double NOT NULL,
+  `longitud` double NOT NULL,
+  `esPrincipal` int(11) NOT NULL,
+  `region_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `region_fk` (`region_fk`),
+  CONSTRAINT `almacen_ibfk_1` FOREIGN KEY (`region_fk`) REFERENCES `region` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `averia`;
+CREATE TABLE `averia` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `descripcion` varchar(1000) NOT NULL,
+  `fechaRegistro` datetime NOT NULL,
+  `camion_fk` int(11) NOT NULL,
+  `tipoAveria_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `camion_fk` (`camion_fk`),
+  KEY `tipoAveria_fk` (`tipoAveria_fk`),
+  CONSTRAINT `averia_ibfk_1` FOREIGN KEY (`camion_fk`) REFERENCES `camion` (`id`),
+  CONSTRAINT `averia_ibfk_2` FOREIGN KEY (`tipoAveria_fk`) REFERENCES `tipoAveria` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `camion`;
+CREATE TABLE `camion` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `placa` varchar(10) NOT NULL,
+  `kilometraje` double NOT NULL,
+  `estado` int(11) NOT NULL,
+  `tipoCamion_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `tipoCamion_fk` (`tipoCamion_fk`),
+  CONSTRAINT `camion_ibfk_1` FOREIGN KEY (`tipoCamion_fk`) REFERENCES `tipoCamion` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `cliente`;
+CREATE TABLE `cliente` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `nombreCompleto` varchar(100) NOT NULL,
+  `dni` varchar(10) NOT NULL,
+  `correo` varchar(100) NOT NULL,
+  `telefono` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `pedido`;
+CREATE TABLE `pedido` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `fechaPedido` datetime NOT NULL,
+  `cantidad` int(11) NOT NULL,
+  `plazoEntrega` int(11) NOT NULL,
+  `estado` int(11) NOT NULL,
+  `codigoPedido` varchar(100) DEFAULT NULL,
+  `almacen_fk` int(11) NOT NULL,
+  `cliente_fk` int(11) NOT NULL,
+  `usuario_fk` int(11) NOT NULL,
+  `PTG_fk` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `usuario_fk` (`usuario_fk`),
+  KEY `PTG_fk` (`PTG_fk`),
+  KEY `cliente_fk` (`cliente_fk`),
+  KEY `almacen_fk` (`almacen_fk`),
+  CONSTRAINT `pedido_ibfk_1` FOREIGN KEY (`usuario_fk`) REFERENCES `usuario` (`id`),
+  CONSTRAINT `pedido_ibfk_2` FOREIGN KEY (`PTG_fk`) REFERENCES `PTG` (`id`),
+  CONSTRAINT `pedido_ibfk_3` FOREIGN KEY (`cliente_fk`) REFERENCES `cliente` (`id`),
+  CONSTRAINT `pedido_ibfk_4` FOREIGN KEY (`almacen_fk`) REFERENCES `almacen` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `PTG`;
+CREATE TABLE `PTG` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `fechaGenerado` datetime NOT NULL,
+  `esSimulacion` int(11) NOT NULL,
+  `usuario_fk` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `usuario_fk` (`usuario_fk`),
+  CONSTRAINT `PTG_ibfk_1` FOREIGN KEY (`usuario_fk`) REFERENCES `usuario` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `region`;
+CREATE TABLE `region` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `nombre` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `rol`;
+CREATE TABLE `rol` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `nombre` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `ruta`;
+CREATE TABLE `ruta` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `fechaInicio` datetime NOT NULL,
+  `fechaFin` datetime NOT NULL,
+  `PTG_fk` int(11) NOT NULL,
+  `camion_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `PTG_fk` (`PTG_fk`),
+  KEY `camion_fk` (`camion_fk`),
+  CONSTRAINT `ruta_ibfk_1` FOREIGN KEY (`PTG_fk`) REFERENCES `PTG` (`id`),
+  CONSTRAINT `ruta_ibfk_2` FOREIGN KEY (`camion_fk`) REFERENCES `camion` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tipoAveria`;
+CREATE TABLE `tipoAveria` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `nombre` int(11) NOT NULL,
+  `duracion` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tipoCamion`;
+CREATE TABLE `tipoCamion` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `nombre` varchar(100) NOT NULL,
+  `capacidad` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tramo`;
+CREATE TABLE `tramo` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `distancia` double NOT NULL,
+  `estaBloqueado` int(11) NOT NULL,
+  `almacen1_fk` int(11) NOT NULL,
+  `almacen2_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `almacen1_fk` (`almacen1_fk`),
+  KEY `almacen2_fk` (`almacen2_fk`),
+  CONSTRAINT `tramo_ibfk_1` FOREIGN KEY (`almacen1_fk`) REFERENCES `almacen` (`id`),
+  CONSTRAINT `tramo_ibfk_2` FOREIGN KEY (`almacen2_fk`) REFERENCES `almacen` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tramo_ruta`;
+CREATE TABLE `tramo_ruta` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `orden` int(11) NOT NULL,
+  `horaSalidaEst` datetime NOT NULL,
+  `horaLlegadaEst` datetime NOT NULL,
+  `horaSalidaReal` datetime DEFAULT NULL,
+  `horaLlegadaReal` datetime DEFAULT NULL,
+  `paquetesEntregar` int(11) NOT NULL,
+  `ruta_fk` int(11) NOT NULL,
+  `tramo_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `ruta_fk` (`ruta_fk`),
+  KEY `tramo_fk` (`tramo_fk`),
+  CONSTRAINT `tramo_ruta_ibfk_1` FOREIGN KEY (`ruta_fk`) REFERENCES `ruta` (`id`),
+  CONSTRAINT `tramo_ruta_ibfk_2` FOREIGN KEY (`tramo_fk`) REFERENCES `tramo` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `usuario`;
+CREATE TABLE `usuario` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `activo` int(11) NOT NULL,
+  `usuario` varchar(100) NOT NULL,
+  `clave` varchar(100) NOT NULL,
+  `nombre` varchar(100) NOT NULL,
+  `apellido` varchar(100) NOT NULL,
+  `dni` varchar(10) NOT NULL,
+  `correo` varchar(100) NOT NULL,
+  `creador_fk` int(11) DEFAULT NULL,
+  `rol_fk` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `creador_fk` (`creador_fk`),
+  KEY `rol_fk` (`rol_fk`),
+  CONSTRAINT `usuario_ibfk_2` FOREIGN KEY (`creador_fk`) REFERENCES `usuario` (`id`),
+  CONSTRAINT `usuario_ibfk_3` FOREIGN KEY (`rol_fk`) REFERENCES `usuario` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP VIEW IF EXISTS `v_almacen`;
+CREATE TABLE `v_almacen` (`ubigeo` varchar(10), `departamento` varchar(100), `provincia` varchar(100), `latitud` double, `longitud` double, `esPrincipal` int(11), `region` varchar(100));
+
+
+DROP VIEW IF EXISTS `v_camion`;
+CREATE TABLE `v_camion` (`id` int(11), `placa` varchar(10), `kilometraje` double, `estado` int(11), `tipo` varchar(100), `capacidad` int(11));
+
+
+DROP VIEW IF EXISTS `v_pedido`;
+CREATE TABLE `v_pedido` (`cliente` varchar(100), `RUC` varchar(10), `ubigeo` varchar(10), `provincia` varchar(100), `cantidad` int(11), `fechaPedido` datetime, `plazoEntrega` int(11), `estado` int(11), `URL_pedido` varchar(100), `registrado por` varchar(100));
+
+
+DROP VIEW IF EXISTS `v_usuario`;
+CREATE TABLE `v_usuario` (`usuario` varchar(100), `nombre` varchar(100), `apellido` varchar(100), `dni` varchar(10), `correo` varchar(100), `registered by` varchar(100), `rol` varchar(100));
+
+
+DROP TABLE IF EXISTS `v_almacen`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_almacen` AS select `a`.`ubigeo` AS `ubigeo`,`a`.`departamento` AS `departamento`,`a`.`provincia` AS `provincia`,`a`.`latitud` AS `latitud`,`a`.`longitud` AS `longitud`,`a`.`esPrincipal` AS `esPrincipal`,`r`.`nombre` AS `region` from (`almacen` `a` join `region` `r` on(`a`.`region_fk` = `r`.`id`)) where a.activo = 1;
+
+DROP TABLE IF EXISTS `v_camion`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_camion` AS select `c`.`id` AS `id`,`c`.`placa` AS `placa`,`c`.`kilometraje` AS `kilometraje`,`c`.`estado` AS `estado`,`tc`.`nombre` AS `tipo`,`tc`.`capacidad` AS `capacidad` from (`camion` `c` join `tipoCamion` `tc` on(`c`.`tipoCamion_fk` = `tc`.`id`)) where c.activo = 1;
+
+DROP TABLE IF EXISTS `v_pedido`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_pedido` AS select `cli`.`nombreCompleto` AS `cliente`,`cli`.`dni` AS `RUC`,`alm`.`ubigeo` AS `ubigeo`,`alm`.`provincia` AS `provincia`,`ped`.`cantidad` AS `cantidad`,`ped`.`fechaPedido` AS `fechaPedido`,`ped`.`plazoEntrega` AS `plazoEntrega`,`ped`.`estado` AS `estado`,`ped`.`codigoPedido` AS `URL_pedido`,`usu`.`usuario` AS `registrado por` from (((`pedido` `ped` join `cliente` `cli` on(`ped`.`cliente_fk` = `cli`.`id`)) join `usuario` `usu` on(`ped`.`usuario_fk` = `usu`.`id`)) join `almacen` `alm` on(`ped`.`almacen_fk` = `alm`.`id`)) where ped.activo = 1;
+
+DROP TABLE IF EXISTS `v_usuario`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_usuario` AS select `u`.`usuario` AS `usuario`,`u`.`nombre` AS `nombre`,`u`.`apellido` AS `apellido`,`u`.`dni` AS `dni`,`u`.`correo` AS `correo`,`u2`.`nombre` AS `registered by`,`r`.`nombre` AS `rol` from ((`usuario` `u` left join `usuario` `u2` on(`u`.`creador_fk` = `u2`.`id`)) join `rol` `r` on(`u`.`rol_fk` = `r`.`id`)) where u.activo = 1;
+
+-- 2022-06-01 06:30:20
diff --git a/back/sql/some_views_and_selects.sql b/back/sql/some_views_and_selects.sql
new file mode 100644
index 0000000..e5306e3
--- /dev/null
+++ b/back/sql/some_views_and_selects.sql
@@ -0,0 +1,47 @@
+-- v_almacen
+select a.ubigeo, a.departamento, a.provincia, a.latitud, a.longitud,
+    a.esPrincipal, r.nombre AS region 
+  from almacen a join region r on a.region_fk = r.id;
+
+-- v_camion
+select c.id, c.placa, c.kilometraje, c.estado, 
+    tc.nombre AS 'tipo', tc.capacidad
+  from camion c join tipoCamion tc on c.tipoCamion_fk = tc.id;
+
+-- v_pedido
+select cli.nombreCompleto AS cliente, cli.dni AS RUC, 
+    alm.ubigeo, alm.provincia,
+    ped.cantidad, ped.fechaPedido, ped.plazoEntrega, ped.estado, 
+    ped.codigoPedido AS URL_pedido, 
+    usu.usuario AS 'registrado por' 
+  from pedido ped join cliente cli on ped.cliente_fk = cli.id 
+      inner join usuario usu on ped.usuario_fk = usu.id
+      inner join almacen alm on ped.almacen_fk = alm.id;
+
+-- v_tramo
+select t.id as 'tramo', t.distancia, t.estaBloqueado, 
+    a1.id, a1.provincia, a2.id, a2.provincia
+  from tramo t inner join almacen a1 on t.almacen1_fk = a1.id
+    inner join almacen a2 on t.almacen2_fk = a2.id
+  order by a1.id;
+
+-- v_usuario
+select u.usuario, u.nombre, u.apellido, u.dni, u.correo, 
+    u2.nombre AS 'registered by', r.nombre AS rol 
+  from usuario u left join usuario u2 on u.creador_fk = u2.id 
+    inner join rol r on u.rol_fk = r.id;
+
+-- PTG (lista de rutas)
+
+-- "Select de ruta": Listado de tramos de la ruta con id=1
+select t_r.orden, r.fechaInicio, r.fechaFin,
+    a1.provincia, a2.provincia, t.distancia,
+    c.placa, t_r.paquetesEntregar
+  from ruta r inner join tramo_ruta t_r on r.id = t_r.ruta_fk
+    inner join tramo t on t.id = t_r.ruta_fk
+    inner join almacen a1 on t.almacen1_fk = a1.id
+    inner join almacen a2 on t.almacen2_fk = a2.id
+
+    inner join camion c on r.camion_fk = c.id
+  where r.id = 1
+  order by t_r.orden;
diff --git a/back/sql/ss_20220531_221843.png b/back/sql/ss_20220531_221843.png
new file mode 100644
index 0000000..fbec2c2
--- /dev/null
+++ b/back/sql/ss_20220531_221843.png