Download as
Browse Code »

Commit e64a5355be4bd068e42ad1beb922675ac41d95e3

Authored by Ronan Tavares Camargo
2 parents 81499402 a0f59786
Exists in master

Merge branch 'tarefa-3822' of http://ferramentasgo.centralit.com.br:8080/scm/git… 

…/cit-grp-adm-materiais into tarefa-3822
Showing 3 changed files with 32 additions and 27 deletions   Show diff stats
cit-adm-materiais-api/src/main/java/br/com/centralit/api/service/impl/ContaContabilServiceImpl.java
  Diff comments   View file @e64a535
@@ -202,7 +202,7 @@ public class ContaContabilServiceImpl extends GenericServiceImpl<ContaContabil, @@ -202,7 +202,7 @@ public class ContaContabilServiceImpl extends GenericServiceImpl<ContaContabil,
202 this.montaContaContabilSaldoAnterior(entity); 202 this.montaContaContabilSaldoAnterior(entity);
203 } 203 }
204 204
205 - contaContabil = calcularTaxaDepreciacao(entity); 205 + calcularTaxaDepreciacao(entity);
206 206
207 return super.merge(entity); 207 return super.merge(entity);
208 208
cit-adm-materiais-api/src/main/java/br/com/centralit/api/viewHelper/RequisicaoVH.java
  Diff comments   View file @e64a535
@@ -78,6 +78,8 @@ public class RequisicaoVH implements Serializable { @@ -78,6 +78,8 @@ public class RequisicaoVH implements Serializable {
78 @JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class) 78 @JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class)
79 private Calendar dataFinalizacao; 79 private Calendar dataFinalizacao;
80 80
  81 + private Boolean statusAtendimentoRequsicao;
  82 +
81 /** 83 /**
82 * Retorna o valor do atributo <code>idsTtipoStatusRequisicao</code> 84 * Retorna o valor do atributo <code>idsTtipoStatusRequisicao</code>
83 * 85 *
@@ -238,4 +240,12 @@ public class RequisicaoVH implements Serializable { @@ -238,4 +240,12 @@ public class RequisicaoVH implements Serializable {
238 this.dataFinalizacao = dataFinalizacao; 240 this.dataFinalizacao = dataFinalizacao;
239 } 241 }
240 242
  243 + public Boolean getStatusAtendimentoRequsicao() {
  244 + return statusAtendimentoRequsicao;
  245 + }
  246 +
  247 + public void setStatusAtendimentoRequsicao(Boolean statusAtendimentoRequsicao) {
  248 + this.statusAtendimentoRequsicao = statusAtendimentoRequsicao;
  249 + }
  250 +
241 } 251 }
cit-adm-materiais-api/src/main/resources/scripts-bd/postgres/v1.16.0/01-cit-adm-materiais-v1.16.0-postgres.sql
  Diff comments   View file @e64a535
@@ -37,11 +37,7 @@ ALTER TABLE alm_rc_atendimentoitem @@ -37,11 +37,7 @@ ALTER TABLE alm_rc_atendimentoitem
37 numeroatendimento character varying(30), 37 numeroatendimento character varying(30),
38 autor_id bigint, 38 autor_id bigint,
39 editor_id bigint, 39 editor_id bigint,
40 - requisicaoconsumo_id bigint,  
41 - CONSTRAINT alm_rc_atendimento_aud_pkey PRIMARY KEY (id, rev),  
42 - CONSTRAINT fk_7h0q6ppws69l2ydhge05fat5c FOREIGN KEY (rev)  
43 - REFERENCES revinfo (rev) MATCH SIMPLE  
44 - ON UPDATE NO ACTION ON DELETE NO ACTION 40 + requisicaoconsumo_id bigint
45 ); 41 );
46 42
47 CREATE TABLE alm_requisicaoconsumo_aud 43 CREATE TABLE alm_requisicaoconsumo_aud
@@ -61,11 +57,7 @@ CREATE TABLE alm_requisicaoconsumo_aud @@ -61,11 +57,7 @@ CREATE TABLE alm_requisicaoconsumo_aud
61 almoxarifado_id bigint, 57 almoxarifado_id bigint,
62 centrocusto_id bigint, 58 centrocusto_id bigint,
63 tipostatusrequisicao_id bigint, 59 tipostatusrequisicao_id bigint,
64 - unidaderequisitante_id bigint,  
65 - CONSTRAINT alm_requisicaoconsumo_aud_pkey PRIMARY KEY (id, rev),  
66 - CONSTRAINT fk_kgoc7f7kdp4lovhkwcuhikj14 FOREIGN KEY (rev)  
67 - REFERENCES revinfo (rev) MATCH SIMPLE  
68 - ON UPDATE NO ACTION ON DELETE NO ACTION 60 + unidaderequisitante_id bigint
69 ); 61 );
70 62
71 CREATE TABLE centrocusto_aud 63 CREATE TABLE centrocusto_aud
@@ -81,11 +73,7 @@ CREATE TABLE centrocusto_aud @@ -81,11 +73,7 @@ CREATE TABLE centrocusto_aud
81 descricao character varying(255), 73 descricao character varying(255),
82 autor_id bigint, 74 autor_id bigint,
83 editor_id bigint, 75 editor_id bigint,
84 - centrocustoparent_id bigint,  
85 - CONSTRAINT centrocusto_aud_pkey PRIMARY KEY (id, rev),  
86 - CONSTRAINT fk_ot4be1e8ga8qnvne6h2lih7hq FOREIGN KEY (rev)  
87 - REFERENCES revinfo (rev) MATCH SIMPLE  
88 - ON UPDATE NO ACTION ON DELETE NO ACTION 76 + centrocustoparent_id bigint
89 ); 77 );
90 78
91 79
@@ -104,11 +92,7 @@ CREATE TABLE alm_rc_item_aud @@ -104,11 +92,7 @@ CREATE TABLE alm_rc_item_aud
104 autor_id bigint, 92 autor_id bigint,
105 editor_id bigint, 93 editor_id bigint,
106 materialconsumo_id bigint, 94 materialconsumo_id bigint,
107 - requisicaoconsumo_id bigint,  
108 - CONSTRAINT alm_rc_item_aud_pkey PRIMARY KEY (id, rev),  
109 - CONSTRAINT fk_7agol5t6grqpqno4w0emglvec FOREIGN KEY (rev)  
110 - REFERENCES revinfo (rev) MATCH SIMPLE  
111 - ON UPDATE NO ACTION ON DELETE NO ACTION 95 + requisicaoconsumo_id bigint
112 ); 96 );
113 97
114 98
@@ -127,11 +111,7 @@ CREATE TABLE alm_rc_atenditem_aud @@ -127,11 +111,7 @@ CREATE TABLE alm_rc_atenditem_aud
127 atendimentoreqconsumo_id bigint, 111 atendimentoreqconsumo_id bigint,
128 material_id bigint, 112 material_id bigint,
129 materiallocalestoque_id bigint, 113 materiallocalestoque_id bigint,
130 - requisicaoconsumoitem_id bigint,  
131 - CONSTRAINT alm_rc_atenditem_aud_pkey PRIMARY KEY (id, rev),  
132 - CONSTRAINT fk_hhl6gjpufv2132tv6vijp3gpr FOREIGN KEY (rev)  
133 - REFERENCES revinfo (rev) MATCH SIMPLE  
134 - ON UPDATE NO ACTION ON DELETE NO ACTION 114 + requisicaoconsumoitem_id bigint
135 ); 115 );
136 116
137 -- ERICK FIM 19/05/2016 117 -- ERICK FIM 19/05/2016
@@ -174,4 +154,19 @@ CREATE TABLE alm_rc_at_item_endereco @@ -174,4 +154,19 @@ CREATE TABLE alm_rc_at_item_endereco
174 ON UPDATE NO ACTION ON DELETE NO ACTION 154 ON UPDATE NO ACTION ON DELETE NO ACTION
175 ) 155 )
176 156
177 --- RONAN FIM 19/05/2016  
178 \ No newline at end of file 157 \ No newline at end of file
  158 +-- RONAN FIM 19/05/2016
  159 +
  160 +-- Erick INICIO 23/05/2016
  161 +CREATE TABLE alm_rc_at_item_end_aud
  162 +(
  163 + id bigint NOT NULL,
  164 + rev integer NOT NULL,
  165 + revtype smallint,
  166 + databloqueio date,
  167 + datainativo date,
  168 + quantidade numeric(19,2),
  169 + at_req_consumoitem_id bigint,
  170 + materiallocalestoque_id bigint
  171 +);
  172 +
  173 +-- ERICK FIM 23/05/2016
179 \ No newline at end of file 174 \ No newline at end of file