Merge branch 'tarefa-2359' into adm-1.16.0

thiago.coimbra
2 parents 412b7dc4 210ef764
Showing 7 changed files with 70 additions and 59 deletions Show diff stats
cit-almoxarifado-web/src/main/resources/reports/PosicaoEstoqueAnalitico.jrxml
cit-almoxarifado-web/src/main/resources/reports/PosicaoEstoqueResumoAnalitico.jrxml
cit-almoxarifado-web/src/main/resources/reports/RelatorioMaterialEstoqueAlmoxarifado.jrxml
cit-almoxarifado-web/src/main/resources/reports/SaidaMaterialPorContaSintetico.jrxml
cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml
cit-almoxarifado-web/src/main/resources/reports/entradaMaterialAnaliticoEntrada.jrxml
cit-almoxarifado-web/src/main/resources/reports/entradaMaterialNotaRecebimento.jrxml
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T15:15:23 -->
+<!-- 2016-05-16T15:44:53 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PosicaoEstoqueAnalítico" language="groovy" pageWidth="802" pageHeight="555" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="ad8f14cf-4bc6-4008-beb0-a366c90e1c3f">
 	<property name="ireport.zoom" value="1.3636363636363635"/>
 	<property name="ireport.x" value="0"/>
@@ -55,31 +55,34 @@
 	<parameter name="siglaOrganizacao" class="java.lang.String"/>
 	<parameter name="codigoOrganizacao" class="java.lang.String"/>
 	<queryString>
-		<![CDATA[select
-	contacontabil.codigo as codigoContaContabil,
-	contacontabil.descricao as contaContabil,
-	material.id as idMaterial,
-	material.descricao as material,
-	material.codigo as codigoMaterial,
-	um.sigla as unidadeMedida,
-	(select sum(valorsobra) from entradaalmoxarifadoitem
-	inner join entradaalmoxarifado entradaalmoxarifado on entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
-	and entradaalmoxarifado.almoxarifado_id = $P{idAlmoxarifado} where material_id = materialconsumo.id) as residuo,
-	materialestoquesaldomedio.valorunitariomedio as precoMedio,
+		<![CDATA[ select
+ 	contacontabil.codigo as codigoContaContabil,
+ 	contacontabil.descricao as contaContabil,
+ 	material.id as idMaterial,
+ 	material.descricao as material,
+ 	material.codigo as codigoMaterial,
+ 	um.sigla as unidadeMedida,
+	(select sum(materialestoquefifoitem.valorsobra) from alm_en_entradaitem entradaalmoxarifadoitem
+	inner join alm_me_fifoitem materialestoquefifoitem on materialestoquefifoitem.entradaitem_id = entradaalmoxarifadoitem.id
+	inner join alm_entrada entradaalmoxarifado on entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
+	and entradaalmoxarifado.almoxarifado_id = $P{idAlmoxarifado} where entradaalmoxarifadoitem.material_id = materialconsumo.id) as residuo,
+	materialestoque.valorunitariomedio as precoMedio,
 	materialestoquesaldo.quantidade as quantidadeEstoqueSaldo,
-	(select sum(quantidade) from movimentoestoque
-	where  material_id = materialconsumo.id and materialestoquesaldo_id is null and datainativo is null) as quantidadeMovimento,
-	(select sum(quantidade) from atendimentoreqconsumoitem arci
-		inner join atendimentorequisicaoconsumo arc on arc.id = arci.atendimentoreqconsumo_id
+	(select sum(quantidade) from alm_me_movimentoestoque
+	where  material_id = materialconsumo.id and (datareferencia between $P{dataReferenciaAnterior} and $P{dataReferencia}) and datainativo is null) as quantidadeMovimento,
+	(select sum(quantidade) from alm_rc_atendimentoitem arci
+		inner join alm_rc_atendimento arc on arc.id = arci.atendimentoreqconsumo_id
 		where arci.material_id = materialconsumo.id and arci.datainativo is null
 		and arc.dataatendimento between $P{dataReferenciaAnterior} and $P{dataReferencia}) as quantidadeAtendida
-	from materialconsumo materialconsumo
+	from alm_materialconsumo materialconsumo
 inner join material material on materialconsumo.id = material.id  and material.datainativo is null
 inner join unidademedida um on materialconsumo.unidadearmazenamento_id = um.id
-inner join materialestoquesaldomedio materialestoquesaldomedio on materialestoquesaldomedio.material_id = material.id
-left join materialestoquesaldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
+inner join alm_materialestoque materialestoque on materialestoque.material_id = material.id
+left join alm_me_saldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
 inner join contacontabil contacontabil on material.contacontabil_id = contacontabil.id and $X{IN,contacontabil.id,idsContas}
-left join localestoque localestoque on materialestoquesaldo.localestoque_id = localestoque.id and localestoque.almoxarifado_id = $P{idAlmoxarifado}
+left join alm_me_localestoque materiallocalestoque on materialestoquesaldo.localestoque_id = materiallocalestoque.id 
+inner join alm_es_enderecoestoque enderecoestoque on materiallocalestoque.endereco_id = enderecoestoque.id
+inner join alm_estoque estoque on enderecoestoque.estoque_id = estoque.id and estoque.almoxarifado_id = $P{idAlmoxarifado}
 order by contaContabil, material]]>
 	</queryString>
 	<field name="codigocontacontabil" class="java.lang.String"/>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T16:05:27 -->
+<!-- 2016-05-16T17:04:38 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PosicaoEstoqueAnalítico" language="groovy" pageWidth="802" pageHeight="555" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="ad8f14cf-4bc6-4008-beb0-a366c90e1c3f">
 	<property name="ireport.zoom" value="1.2396694214876032"/>
 	<property name="ireport.x" value="0"/>
@@ -58,16 +58,18 @@
 	contacontabil.codigo as codigoContaContabil,
 	contacontabil.descricao as contaContabil,
 	material.id as material,
-	materialestoquesaldomedio.valorunitariomedio as precoMedio,
+	materialestoque.valorunitariomedio as precoMedio,
 	materialestoquesaldo.quantidade as quantidadeEstoqueSaldo,
-	(select sum(quantidade) from movimentoestoque
-		where material_id = materialconsumo.id and materialestoquesaldo_id is null and datainativo is null) as quantidadeMovimento
-	from materialconsumo materialconsumo
+	(select sum(quantidade) from alm_me_movimentoestoque 
+		where material_id = materialconsumo.id and (datamovimento between $P{dataReferenciaAnterior} and $P{dataReferencia}) and datainativo is null) as quantidadeMovimento
+	from alm_materialconsumo materialconsumo
 inner join material material on materialconsumo.id = material.id and material.datainativo is null
-inner join materialestoquesaldomedio materialestoquesaldomedio on materialestoquesaldomedio.material_id = materialconsumo.id
-left join materialestoquesaldo materialestoquesaldo on materialestoquesaldo.material_id = materialconsumo.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
+inner join alm_materialestoque materialestoque on materialestoque.material_id = material.id
+left join alm_me_saldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
 inner join contacontabil contacontabil on material.contacontabil_id = contacontabil.id and $X{IN,contacontabil.id,idsContas}
-left join localestoque localestoque on materialestoquesaldo.localestoque_id = localestoque.id and localestoque.almoxarifado_id = $P{idAlmoxarifado}
+left join alm_me_localestoque materiallocalestoque on materialestoquesaldo.localestoque_id = materiallocalestoque.id 
+inner join alm_es_enderecoestoque enderecoestoque on materiallocalestoque.endereco_id = enderecoestoque.id
+inner join alm_estoque estoque on enderecoestoque.estoque_id = estoque.id and estoque.almoxarifado_id = $P{idAlmoxarifado}
 order by contaContabil]]>
 	</queryString>
 	<field name="codigocontacontabil" class="java.lang.String"/>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T16:15:39 -->
+<!-- 2016-05-16T17:15:06 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioMaterialEstoqueAlmoxarifado" language="groovy" pageWidth="802" pageHeight="555" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="ad8f14cf-4bc6-4008-beb0-a366c90e1c3f">
 	<property name="ireport.zoom" value="1.3636363636363638"/>
 	<property name="ireport.x" value="0"/>
@@ -68,13 +68,15 @@
 	$P!{movimento_estoque} as quantidademovimento,
 	materialestoquesaldo.valorfechado as valorEstoque,
 	0 as pontopedido,
-	materialestoquesaldomedio.valorunitariomedio as precomedio
-	from materialconsumo materialconsumo
+	materialestoque.valorunitariomedio as precomedio
+	from alm_materialconsumo materialconsumo
 inner join material material on materialconsumo.id = material.id and material.datainativo is null
 inner join unidademedida um on materialconsumo.unidadearmazenamento_id = um.id
-inner join materialestoquesaldomedio materialestoquesaldomedio on materialestoquesaldomedio.material_id = material.id
-left join materialestoquesaldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
-left join localestoque localestoque on materialestoquesaldo.localestoque_id = localestoque.id and localestoque.almoxarifado_id = $P{idAlmoxarifado}
+inner join alm_materialestoque materialestoque on materialestoque.material_id = material.id
+left join alm_me_saldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
+left join alm_me_localestoque materiallocalestoque on materialestoquesaldo.localestoque_id = materiallocalestoque.id 
+inner join alm_es_enderecoestoque enderecoestoque on materiallocalestoque.endereco_id = enderecoestoque.id
+inner join alm_estoque estoque on enderecoestoque.estoque_id = estoque.id and estoque.almoxarifado_id = $P{idAlmoxarifado}
 where $X{IN,material.id,idsMateriais}
 order by material]]>
 	</queryString>
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T16:30:04 -->
+<!-- 2016-05-17T08:18:29 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="entradaMaterialAnalitico" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="151318af-6127-44c9-89d0-65848a7d6d80">
 	<property name="ireport.zoom" value="1.610510000000001"/>
 	<property name="ireport.x" value="0"/>
@@ -105,13 +105,14 @@ u.sigla as unidade,
 sum(me.quantidade) as quantidade,
 0 as quantidadedevolvida,
 sum(me.valorfifo) as valortotal
-from  movimentoestoque me
-inner join baixaalmoxarifadoitem bmi on me.baixaalmoxarifadoitem_id = bmi.id and bmi.dataestorno is null
+from  alm_me_movimentoestoque me
+inner join alm_bx_item bmi on me.idclassereferencia = bmi.id and bmi.dataestorno is null
 inner join material m on me.material_id = m.id
-left join materialconsumo mc on m.id = mc.id
+left join alm_materialconsumo mc on m.id = mc.id
 left join unidademedida u on mc.unidadearmazenamento_id = u.id
 inner join contacontabil cc on m.contacontabil_id = cc.id
 where me.organizacao_id = $P{idOrganizacao} and me.datamovimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and me.datainativo is null
+and ((select id from dominio where chave = 'classeReferencia' and codigo = 13) =  me.dominioclassereferencia_id)
 group by codigocontacontabil, contacontabil, material, codigomaterial, unidade
 union
 select
@@ -123,14 +124,15 @@ u.sigla as unidade,
 sum(me.quantidade) as quantidade,
 sum(rci.quantidadedevolvida) as quantidadedevolvida,
 sum(me.valorfifo) as valortotal
-from  movimentoestoque me
-inner join atendimentoreqconsumoitem arci on me.atendimentoreqconsumoitem_id = arci.id
-inner join requisicaoconsumoitem rci on arci.requisicaoconsumoitem_id = rci.id
+from  alm_me_movimentoestoque me
+inner join alm_rc_atendimentoitem arci on me.idclassereferencia = arci.id
+inner join alm_rc_item rci on arci.requisicaoconsumoitem_id = rci.id
 inner join material m on me.material_id = m.id
-left join materialconsumo mc on m.id = mc.id
+left join alm_materialconsumo mc on m.id = mc.id
 left join unidademedida u on mc.unidadearmazenamento_id = u.id
 inner join contacontabil cc on m.contacontabil_id = cc.id
 where me.organizacao_id = $P{idOrganizacao} and me.datamovimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and me.datainativo is null
+and and ((select id from dominio where chave = 'classeReferencia' and codigo = 14) =  me.dominioclassereferencia_id)
 group by codigocontacontabil, contacontabil, material, codigomaterial, unidade
 	) view
 group by codigocontacontabil, contacontabil, material, unidade, codigomaterial
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T11:49:02 -->
+<!-- 2016-05-16T10:00:19 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="consumoAlmoxarifado" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="16b0028f-e4d1-4c28-96d2-f9a51170b4df">
 	<property name="ireport.zoom" value="2.2000000000000015"/>
 	<property name="ireport.x" value="0"/>
@@ -26,15 +26,17 @@ from
 	select m.descricao as nomeMaterial,
 		to_char(me.datamovimento, 'YYYY') as ano,
 		to_char(me.datamovimento, 'MM') as mes,
-		case when (entradaalmoxarifadoitem_id is null) then 0 else me.quantidade end as quantidadeEntrada,
-		case when (devolucaoitem_id is null) then 0 else me.quantidade end as quantidadeDevolucao,
+		case when ((select id from dominio where chave = 'classeReferencia' and codigo = 12) != dominioclassereferencia_id) then 0 else me.quantidade end as quantidadeEntrada,
+		case when ((select id from dominio where chave = 'classeReferencia' and codigo = 6) != dominioclassereferencia_id) then 0 else me.quantidade end as quantidadeDevolucao,
 		0 as quantidadeRequisicao,
-		case when (baixaalmoxarifadoitem_id is null) then 0 else me.quantidade end as quantidadeBaixa
-	from movimentoestoque me
+		case when ((select id from dominio where chave = 'classeReferencia' and codigo = 13) != dominioclassereferencia_id ) then 0 else me.quantidade end as quantidadeBaixa
+	from alm_me_movimentoestoque me
 		inner join material m on m.id = me.material_id
 		inner join dominio d on d.id = me.tipomovimento_id
-		inner join localestoque le on le.id = me.localestoque_id
-	where le.almoxarifado_id = $P{idAlmoxarifado} and d.codigo in (1,2,4) and me.datamovimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and me.datainativo is null $P!{filtroMateriais}
+		inner join alm_me_localestoque materialLocalEstoque on  materialLocalEstoque.id = me.materiallocalestoque_id
+		inner join alm_es_enderecoestoque enderecoEstoque on enderecoEstoque.id = materialLocalEstoque.endereco_id
+		inner join alm_estoque estoque on estoque.id = enderecoEstoque.estoque_id 
+	where estoque.almoxarifado_id = $P{idAlmoxarifado} and d.codigo in (1,2,4) and me.datamovimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and me.datainativo is null $P!{filtroMateriais}
 	union
 	select
 		material.descricao as nomeMaterial,
@@ -44,10 +46,10 @@ from
 		0 as quantidadeDevolucao,
 		requisicaoconsumoitem.quantidadeatendida as quantidadeRequisicao,
 		0 as quantidadeBaixa
-	from atendimentorequisicaoconsumo atendimentorequisicaoconsumo
-		inner join requisicaoconsumo requisicaoconsumo on atendimentorequisicaoconsumo.requisicaoconsumo_id =requisicaoconsumo.id
-		inner join requisicaoconsumoitem requisicaoconsumoitem on requisicaoconsumo.id = requisicaoconsumoitem.requisicaoconsumo_id
-		inner join atendimentoreqconsumoitem atendimentoreqconsumoitem on requisicaoconsumoitem.id = atendimentoreqconsumoitem.requisicaoconsumoitem_id
+	from alm_rc_atendimento atendimentorequisicaoconsumo
+		inner join alm_requisicaoconsumo requisicaoconsumo on atendimentorequisicaoconsumo.requisicaoconsumo_id =requisicaoconsumo.id
+		inner join alm_rc_item requisicaoconsumoitem on requisicaoconsumo.id = requisicaoconsumoitem.requisicaoconsumo_id
+		inner join alm_rc_atendimentoitem atendimentoreqconsumoitem on requisicaoconsumoitem.id = atendimentoreqconsumoitem.requisicaoconsumoitem_id
 		inner join material material on requisicaoconsumoitem.materialconsumo_id = material.id
 where requisicaoconsumo.almoxarifado_id = $P{idAlmoxarifado} and atendimentorequisicaoconsumo.dataatendimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and atendimentorequisicaoconsumo.datainativo is null $P!{filtroMateriais}
 	) view
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T14:41:32 -->
+<!-- 2016-05-16T10:29:35 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="entradaMaterialAnaliticoEntrada" language="groovy" pageWidth="802" pageHeight="555" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5ed15610-1772-4ec5-9238-b8bb4567a519">
 	<property name="ireport.zoom" value="1.331000000000001"/>
 	<property name="ireport.x" value="0"/>
@@ -75,13 +75,13 @@ WHERE ed.entrada_id = $P{idEntrada}]]&gt;
 	entradaalmoxarifadoitem.quantidade AS quantidade,
 	entradaalmoxarifadoitem.valorunitario AS valorUnitario,
 	entradaalmoxarifadoitem.valortotal AS valorTotal
-FROM entradaalmoxarifado entradaalmoxarifado
+FROM alm_entrada entradaalmoxarifado
 	INNER JOIN dominio dominio ON dominio.id = entradaalmoxarifado.dominiotiporecebimento_id
 	INNER JOIN parceiro parceiro ON parceiro.id = entradaalmoxarifado.fornecedor_id
 	INNER JOIN pessoa pessoa ON pessoa.id = parceiro.pessoa_id
 	LEFT JOIN pessoajuridica pessoajuridica ON pessoa.id = pessoajuridica.pessoa_id
 	LEFT JOIN pessoafisica pessoafisica ON pessoa.id = pessoafisica.pessoa_id
-	INNER JOIN entradaalmoxarifadoitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
+	INNER JOIN alm_en_entradaitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
 	LEFT JOIN unidademedida unidademedida ON entradaalmoxarifadoitem.unidademedidaentrada_id = unidademedida.id
 	INNER JOIN material material ON material.id = entradaalmoxarifadoitem.material_id
 	LEFT JOIN contacontabil contacontabil ON material.contacontabil_id = contacontabil.id
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2  -->
-<!-- 2016-05-12T14:51:45 -->
+<!-- 2016-05-16T10:33:33 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="entradaMaterialAnaliticoEntrada" language="groovy" pageWidth="802" pageHeight="555" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5ed15610-1772-4ec5-9238-b8bb4567a519">
 	<property name="ireport.zoom" value="1.6500000000000008"/>
 	<property name="ireport.x" value="25"/>
@@ -85,13 +85,13 @@ ORDER BY contacontabil]]&gt;
 	entradaalmoxarifadoitem.valorunitario AS valorUnitario,
 	entradaalmoxarifadoitem.valortotal AS valorTotal,
 	dominioFin.descricao AS finalidadeCompra
-FROM entradaalmoxarifado entradaalmoxarifado
+FROM alm_entrada entradaalmoxarifado
  	INNER JOIN dominio dominio ON dominio.id = entradaalmoxarifado.dominiotiporecebimento_id
 	INNER JOIN parceiro parceiro ON parceiro.id = entradaalmoxarifado.fornecedor_id
 	INNER JOIN pessoa pessoa ON pessoa.id = parceiro.pessoa_id
 	LEFT JOIN pessoajuridica pessoajuridica ON pessoa.id = pessoajuridica.pessoa_id
 	LEFT JOIN pessoafisica pessoafisica ON pessoa.id = pessoafisica.pessoa_id
-	INNER JOIN entradaalmoxarifadoitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
+	INNER JOIN alm_en_entradaitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
 	LEFT JOIN dominio dominioFin ON dominioFin.id = entradaalmoxarifado.dominiofinalidade_id
 	LEFT JOIN unidademedida unidademedida ON entradaalmoxarifadoitem.unidademedidaentrada_id = unidademedida.id
 	INNER JOIN material material ON material.id = entradaalmoxarifadoitem.material_id
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->	2	<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3	-<!-- 2016-05-12T11:49:02 -->	3	+<!-- 2016-05-16T10:00:19 -->
4	<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="consumoAlmoxarifado" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="16b0028f-e4d1-4c28-96d2-f9a51170b4df">	4	<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="consumoAlmoxarifado" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="16b0028f-e4d1-4c28-96d2-f9a51170b4df">
5	<property name="ireport.zoom" value="2.2000000000000015"/>	5	<property name="ireport.zoom" value="2.2000000000000015"/>
6	<property name="ireport.x" value="0"/>	6	<property name="ireport.x" value="0"/>
	@@ -26,15 +26,17 @@ from		@@ -26,15 +26,17 @@ from
26	select m.descricao as nomeMaterial,	26	select m.descricao as nomeMaterial,
27	to_char(me.datamovimento, 'YYYY') as ano,	27	to_char(me.datamovimento, 'YYYY') as ano,
28	to_char(me.datamovimento, 'MM') as mes,	28	to_char(me.datamovimento, 'MM') as mes,
29	- case when (entradaalmoxarifadoitem_id is null) then 0 else me.quantidade end as quantidadeEntrada,
30	- case when (devolucaoitem_id is null) then 0 else me.quantidade end as quantidadeDevolucao,	29	+ case when ((select id from dominio where chave = 'classeReferencia' and codigo = 12) != dominioclassereferencia_id) then 0 else me.quantidade end as quantidadeEntrada,
		30	+ case when ((select id from dominio where chave = 'classeReferencia' and codigo = 6) != dominioclassereferencia_id) then 0 else me.quantidade end as quantidadeDevolucao,
31	0 as quantidadeRequisicao,	31	0 as quantidadeRequisicao,
32	- case when (baixaalmoxarifadoitem_id is null) then 0 else me.quantidade end as quantidadeBaixa
33	- from movimentoestoque me	32	+ case when ((select id from dominio where chave = 'classeReferencia' and codigo = 13) != dominioclassereferencia_id ) then 0 else me.quantidade end as quantidadeBaixa
		33	+ from alm_me_movimentoestoque me
34	inner join material m on m.id = me.material_id	34	inner join material m on m.id = me.material_id
35	inner join dominio d on d.id = me.tipomovimento_id	35	inner join dominio d on d.id = me.tipomovimento_id
36	- inner join localestoque le on le.id = me.localestoque_id
37	- where le.almoxarifado_id = $P{idAlmoxarifado} and d.codigo in (1,2,4) and me.datamovimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and me.datainativo is null $P!{filtroMateriais}	36	+ inner join alm_me_localestoque materialLocalEstoque on materialLocalEstoque.id = me.materiallocalestoque_id
		37	+ inner join alm_es_enderecoestoque enderecoEstoque on enderecoEstoque.id = materialLocalEstoque.endereco_id
		38	+ inner join alm_estoque estoque on estoque.id = enderecoEstoque.estoque_id
		39	+ where estoque.almoxarifado_id = $P{idAlmoxarifado} and d.codigo in (1,2,4) and me.datamovimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and me.datainativo is null $P!{filtroMateriais}
38	union	40	union
39	select	41	select
40	material.descricao as nomeMaterial,	42	material.descricao as nomeMaterial,
	@@ -44,10 +46,10 @@ from		@@ -44,10 +46,10 @@ from
44	0 as quantidadeDevolucao,	46	0 as quantidadeDevolucao,
45	requisicaoconsumoitem.quantidadeatendida as quantidadeRequisicao,	47	requisicaoconsumoitem.quantidadeatendida as quantidadeRequisicao,
46	0 as quantidadeBaixa	48	0 as quantidadeBaixa
47	- from atendimentorequisicaoconsumo atendimentorequisicaoconsumo
48	- inner join requisicaoconsumo requisicaoconsumo on atendimentorequisicaoconsumo.requisicaoconsumo_id =requisicaoconsumo.id
49	- inner join requisicaoconsumoitem requisicaoconsumoitem on requisicaoconsumo.id = requisicaoconsumoitem.requisicaoconsumo_id
50	- inner join atendimentoreqconsumoitem atendimentoreqconsumoitem on requisicaoconsumoitem.id = atendimentoreqconsumoitem.requisicaoconsumoitem_id	49	+ from alm_rc_atendimento atendimentorequisicaoconsumo
		50	+ inner join alm_requisicaoconsumo requisicaoconsumo on atendimentorequisicaoconsumo.requisicaoconsumo_id =requisicaoconsumo.id
		51	+ inner join alm_rc_item requisicaoconsumoitem on requisicaoconsumo.id = requisicaoconsumoitem.requisicaoconsumo_id
		52	+ inner join alm_rc_atendimentoitem atendimentoreqconsumoitem on requisicaoconsumoitem.id = atendimentoreqconsumoitem.requisicaoconsumoitem_id
51	inner join material material on requisicaoconsumoitem.materialconsumo_id = material.id	53	inner join material material on requisicaoconsumoitem.materialconsumo_id = material.id
52	where requisicaoconsumo.almoxarifado_id = $P{idAlmoxarifado} and atendimentorequisicaoconsumo.dataatendimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and atendimentorequisicaoconsumo.datainativo is null $P!{filtroMateriais}	54	where requisicaoconsumo.almoxarifado_id = $P{idAlmoxarifado} and atendimentorequisicaoconsumo.dataatendimento between (TO_TIMESTAMP($P{dataInicio},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and (TO_TIMESTAMP($P{dataFim},'YYYY-MM-DD HH24:MI:SS')::timestamp without time zone) and atendimentorequisicaoconsumo.datainativo is null $P!{filtroMateriais}
53	) view	55	) view