From 237f601e5c4671e99cc3f27db6aa3037fe71e341 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 11 Jul 2024 14:37:23 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Atualiza=C3=A7ao=20da=20lista=20de=20ignora?= =?UTF-8?q?dos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 8eb2db3a4..d052193ef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,9 @@ /.project /.settings /target +/settings.xml +/dist /.factorypath +/*.BASE.xml +/*.LOCAL.xml +/*.REMOTE.xml From 1e24bf145809d784b9f4b40ae07798dee98c76f5 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 11 Jul 2024 14:50:15 -0300 Subject: [PATCH 2/2] Cadastro de convenio transportadora bug#AL-4246 --- pom.xml | 2 +- src/db/migration/V20240704_0837__AL-4277.sql | 2 +- src/db/migration/V20240708_1537__AL-4346.sql | 31 +++++++++++++++++++ src/db/migration/V20240710_1052__AL-4343.sql | 24 +++++++++++++++ src/db/migration/V20240710_1053__AL-4343.sql | 32 ++++++++++++++++++++ src/db/migration/V20240710_1907__AL-4346.sql | 27 +++++++++++++++++ 6 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 src/db/migration/V20240708_1537__AL-4346.sql create mode 100644 src/db/migration/V20240710_1052__AL-4343.sql create mode 100644 src/db/migration/V20240710_1053__AL-4343.sql create mode 100644 src/db/migration/V20240710_1907__AL-4346.sql diff --git a/pom.xml b/pom.xml index c74166c41..b564832ac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.61.0 + 1.62.0 diff --git a/src/db/migration/V20240704_0837__AL-4277.sql b/src/db/migration/V20240704_0837__AL-4277.sql index ab50cd935..1812fa8cb 100644 --- a/src/db/migration/V20240704_0837__AL-4277.sql +++ b/src/db/migration/V20240704_0837__AL-4277.sql @@ -7,7 +7,7 @@ begin "NIT" VARCHAR2(20), "NOME_TRANSPORTADORA" VARCHAR2(150), "CLASSE_PAGAMENTO" NUMBER(7,0), - "FORMA_PAGAMENTO" NUMBER(7,0), + "EMAIL" VARCHAR2(150) NULL, "USUARIO_ID" NUMBER(7,0), "ACTIVO" NUMBER(1,0), "FECMODIF" DATE, diff --git a/src/db/migration/V20240708_1537__AL-4346.sql b/src/db/migration/V20240708_1537__AL-4346.sql new file mode 100644 index 000000000..a7c52af92 --- /dev/null +++ b/src/db/migration/V20240708_1537__AL-4346.sql @@ -0,0 +1,31 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CONVENIO_TRANSPORT ( + CONVENIOTRANSPORTADORA_ID NUMBER(7,0) PRIMARY KEY, + TRANSPORTADORA_ID NUMBER(7,0), + NOME_CONVENIO VARCHAR2(150), + NUMCONVENIO VARCHAR2(50), + VALOR NUMBER(15,2), + TIPO_CONVENIO NUMBER(7,0), + DATA_INICIAL DATE, + DATA_FINAL DATE, + USUARIO_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + CONSTRAINT fk_transportadora_convenio FOREIGN KEY (TRANSPORTADORA_ID) REFERENCES TRANSPORTADORA(TRANSPORTADORA_ID), + CONSTRAINT fk_usuario_convenio_transportadora FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) + )'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "CONVENIO_TRANSPORTADORA_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240710_1052__AL-4343.sql b/src/db/migration/V20240710_1052__AL-4343.sql new file mode 100644 index 000000000..30c1c8f91 --- /dev/null +++ b/src/db/migration/V20240710_1052__AL-4343.sql @@ -0,0 +1,24 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE TIPO_LANCAMENTO_CAIXA ( + TIPO_LANCAMENTO_ID NUMBER(7,0) PRIMARY KEY, + NOME_LANCAMENTO VARCHAR2(255), + INDACRESCIMO NUMBER(1,0), + ACTIVO NUMBER(1,0), + USUARIO_ID NUMBER(7,0), + FECMODIF DATE, + CONSTRAINT fk_usuario_tipo_lancamento FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "TIPO_LANCAMENTO_CAIXA_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240710_1053__AL-4343.sql b/src/db/migration/V20240710_1053__AL-4343.sql new file mode 100644 index 000000000..3356d57b1 --- /dev/null +++ b/src/db/migration/V20240710_1053__AL-4343.sql @@ -0,0 +1,32 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CAIXA_CONTRATO ( + CAIXACONTRATO_ID NUMBER(7,0) PRIMARY KEY, + CONTRATO_ID NUMBER(7,0), + DATA_LANCAMENTO DATE, + VALOR NUMBER(15,2), + CAJA_ID NUMBER(7,0), + EVENTOEXTRA_ID NUMBER(7,0), + USUARIO_ID NUMBER(7,0), + TIPO_LANCAMENTO_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + CONSTRAINT fk_contrato_caixa_contrato FOREIGN KEY (CONTRATO_ID) REFERENCES CONTRATO_CORPORATIVO(CONTRATO_ID), + CONSTRAINT fk_caja_caixa_contrato FOREIGN KEY (CAJA_ID) REFERENCES CAJA(CAJA_ID), + CONSTRAINT fk_eventoextra_caixa_contrato FOREIGN KEY (EVENTOEXTRA_ID) REFERENCES EVENTO_EXTRA(EVENTOEXTRA_ID), + CONSTRAINT fk_usuario_caixa_contrato FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID), + CONSTRAINT fk_tipo_lancamento_caixa_contrato FOREIGN KEY (TIPO_LANCAMENTO_ID) REFERENCES TIPO_LANCAMENTO_CAIXA(TIPO_LANCAMENTO_ID) + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "CAIXA_CONTRATO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240710_1907__AL-4346.sql b/src/db/migration/V20240710_1907__AL-4346.sql new file mode 100644 index 000000000..04e554507 --- /dev/null +++ b/src/db/migration/V20240710_1907__AL-4346.sql @@ -0,0 +1,27 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE TARIFA_CONVENIO_TRANSP ( + "TARIFACONVENIO_ID" NUMBER(7,0) PRIMARY KEY, + "CONVENIOTRANSPORTADORA_ID" NUMBER(7,0), + "ORIGEN_ID" NUMBER(7,0), + "DESTINO_ID" NUMBER(7,0), + "TARIFA" NUMBER(10, 2), + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE, + CONSTRAINT "fk_grupo_contrato" FOREIGN KEY ("CONVENIOTRANSPORTADORA_ID") REFERENCES "CONVENIO_TRANSPORTADORA"("CONVENIOTRANSPORTADORA_ID"), + CONSTRAINT "fk_parada_origen" FOREIGN KEY ("ORIGEN_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_parada_destino" FOREIGN KEY ("DESTINO_ID") REFERENCES "PARADA"("PARADA_ID") + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "TARIFA_CONVENIO_TRANSP_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; \ No newline at end of file