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

…/cit-grp-adm-materiais into tarefa-3822

Merge branch 'tarefa-3822' of http://ferramentasgo.centralit.com.br:8080/scm/git…
…/cit-grp-adm-materiais into tarefa-3822
Ronan Tavares Camargo
2 parents 81499402 a0f59786
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
cit-adm-materiais-api/src/main/java/br/com/centralit/api/viewHelper/RequisicaoVH.java
cit-adm-materiais-api/src/main/resources/scripts-bd/postgres/v1.16.0/01-cit-adm-materiais-v1.16.0-postgres.sql
@@ -202,7 +202,7 @@ public class ContaContabilServiceImpl extends GenericServiceImpl&lt;ContaContabil, 
 			this.montaContaContabilSaldoAnterior(entity);
 		}
  
-		contaContabil = calcularTaxaDepreciacao(entity);
+		calcularTaxaDepreciacao(entity);
  
 		return super.merge(entity);
  
@@ -78,6 +78,8 @@ public class RequisicaoVH implements Serializable {
 	@JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class)
 	private Calendar dataFinalizacao;
  
+	private Boolean statusAtendimentoRequsicao;
+
 	/**
 	 * Retorna o valor do atributo <code>idsTtipoStatusRequisicao</code>
 	 * 
@@ -238,4 +240,12 @@ public class RequisicaoVH implements Serializable {
 		this.dataFinalizacao = dataFinalizacao;
 	}
  
+	public Boolean getStatusAtendimentoRequsicao() {
+		return statusAtendimentoRequsicao;
+	}
+
+	public void setStatusAtendimentoRequsicao(Boolean statusAtendimentoRequsicao) {
+		this.statusAtendimentoRequsicao = statusAtendimentoRequsicao;
+	}
+
 }
@@ -37,11 +37,7 @@ ALTER TABLE alm_rc_atendimentoitem
   numeroatendimento character varying(30),
   autor_id bigint,
   editor_id bigint,
-  requisicaoconsumo_id bigint,
-  CONSTRAINT alm_rc_atendimento_aud_pkey PRIMARY KEY (id, rev),
-  CONSTRAINT fk_7h0q6ppws69l2ydhge05fat5c FOREIGN KEY (rev)
-      REFERENCES revinfo (rev) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION
+  requisicaoconsumo_id bigint
 );
  
 CREATE TABLE alm_requisicaoconsumo_aud
@@ -61,11 +57,7 @@ CREATE TABLE alm_requisicaoconsumo_aud
   almoxarifado_id bigint,
   centrocusto_id bigint,
   tipostatusrequisicao_id bigint,
-  unidaderequisitante_id bigint,
-  CONSTRAINT alm_requisicaoconsumo_aud_pkey PRIMARY KEY (id, rev),
-  CONSTRAINT fk_kgoc7f7kdp4lovhkwcuhikj14 FOREIGN KEY (rev)
-      REFERENCES revinfo (rev) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION
+  unidaderequisitante_id bigint
 );
  
 CREATE TABLE centrocusto_aud
@@ -81,11 +73,7 @@ CREATE TABLE centrocusto_aud
   descricao character varying(255),
   autor_id bigint,
   editor_id bigint,
-  centrocustoparent_id bigint,
-  CONSTRAINT centrocusto_aud_pkey PRIMARY KEY (id, rev),
-  CONSTRAINT fk_ot4be1e8ga8qnvne6h2lih7hq FOREIGN KEY (rev)
-      REFERENCES revinfo (rev) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION
+  centrocustoparent_id bigint
 );
  
  
@@ -104,11 +92,7 @@ CREATE TABLE alm_rc_item_aud
   autor_id bigint,
   editor_id bigint,
   materialconsumo_id bigint,
-  requisicaoconsumo_id bigint,
-  CONSTRAINT alm_rc_item_aud_pkey PRIMARY KEY (id, rev),
-  CONSTRAINT fk_7agol5t6grqpqno4w0emglvec FOREIGN KEY (rev)
-      REFERENCES revinfo (rev) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION
+  requisicaoconsumo_id bigint
 );
  
  
@@ -127,11 +111,7 @@ CREATE TABLE alm_rc_atenditem_aud
   atendimentoreqconsumo_id bigint,
   material_id bigint,
   materiallocalestoque_id bigint,
-  requisicaoconsumoitem_id bigint,
-  CONSTRAINT alm_rc_atenditem_aud_pkey PRIMARY KEY (id, rev),
-  CONSTRAINT fk_hhl6gjpufv2132tv6vijp3gpr FOREIGN KEY (rev)
-      REFERENCES revinfo (rev) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION
+  requisicaoconsumoitem_id bigint
 );
  
 -- ERICK FIM 19/05/2016      
@@ -174,4 +154,19 @@ CREATE TABLE alm_rc_at_item_endereco
       ON UPDATE NO ACTION ON DELETE NO ACTION
 )
  
--- RONAN FIM 19/05/2016
 \ No newline at end of file
+-- RONAN FIM 19/05/2016
+
+-- Erick INICIO 23/05/2016
+CREATE TABLE alm_rc_at_item_end_aud
+(
+  id bigint NOT NULL,
+  rev integer NOT NULL,
+  revtype smallint,
+  databloqueio date,
+  datainativo date,
+  quantidade numeric(19,2),
+  at_req_consumoitem_id bigint,
+  materiallocalestoque_id bigint
+);
+
+-- ERICK FIM 23/05/2016
 \ No newline at end of file
...	...	@@ -202,7 +202,7 @@ public class ContaContabilServiceImpl extends GenericServiceImpl<ContaContabil,
202	202	this.montaContaContabilSaldoAnterior(entity);
203	203	}
204	204
205		- contaContabil = calcularTaxaDepreciacao(entity);
	205	+ calcularTaxaDepreciacao(entity);
206	206
207	207	return super.merge(entity);
208	208
...	...
...	...	@@ -78,6 +78,8 @@ public class RequisicaoVH implements Serializable {
78	78	@JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class)
79	79	private Calendar dataFinalizacao;
80	80
	81	+ private Boolean statusAtendimentoRequsicao;
	82	+
81	83	/**
82	84	* Retorna o valor do atributo <code>idsTtipoStatusRequisicao</code>
83	85	*
...	...	@@ -238,4 +240,12 @@ public class RequisicaoVH implements Serializable {
238	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	}
...	...
...	...	@@ -37,11 +37,7 @@ ALTER TABLE alm_rc_atendimentoitem
37	37	numeroatendimento character varying(30),
38	38	autor_id bigint,
39	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	43	CREATE TABLE alm_requisicaoconsumo_aud
...	...	@@ -61,11 +57,7 @@ CREATE TABLE alm_requisicaoconsumo_aud
61	57	almoxarifado_id bigint,
62	58	centrocusto_id bigint,
63	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	63	CREATE TABLE centrocusto_aud
...	...	@@ -81,11 +73,7 @@ CREATE TABLE centrocusto_aud
81	73	descricao character varying(255),
82	74	autor_id bigint,
83	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	92	autor_id bigint,
105	93	editor_id bigint,
106	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	111	atendimentoreqconsumo_id bigint,
128	112	material_id bigint,
129	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	117	-- ERICK FIM 19/05/2016
...	...	@@ -174,4 +154,19 @@ CREATE TABLE alm_rc_at_item_endereco
174	154	ON UPDATE NO ACTION ON DELETE NO ACTION
175	155	)
176	156
177		--- RONAN FIM 19/05/2016
178	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	174	\ No newline at end of file
...	...