Download as
Browse Code »

Commit 4d0e45a596048480345b4c2530dd0b0cc9f1332c

Authored by thiago.coimbra
2 parents 412b7dc4 210ef764
Exists in master

Merge branch 'tarefa-2359' into adm-1.16.0

Showing 7 changed files with 70 additions and 59 deletions   Show diff stats
cit-almoxarifado-web/src/main/resources/reports/PosicaoEstoqueAnalitico.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3   -<!-- 2016-05-12T15:15:23 -->
  3 +<!-- 2016-05-16T15:44:53 -->
4 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="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">
5 5 <property name="ireport.zoom" value="1.3636363636363635"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -55,31 +55,34 @@
55 55 <parameter name="siglaOrganizacao" class="java.lang.String"/>
56 56 <parameter name="codigoOrganizacao" class="java.lang.String"/>
57 57 <queryString>
58   - <![CDATA[select
59   - contacontabil.codigo as codigoContaContabil,
60   - contacontabil.descricao as contaContabil,
61   - material.id as idMaterial,
62   - material.descricao as material,
63   - material.codigo as codigoMaterial,
64   - um.sigla as unidadeMedida,
65   - (select sum(valorsobra) from entradaalmoxarifadoitem
66   - inner join entradaalmoxarifado entradaalmoxarifado on entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
67   - and entradaalmoxarifado.almoxarifado_id = $P{idAlmoxarifado} where material_id = materialconsumo.id) as residuo,
68   - materialestoquesaldomedio.valorunitariomedio as precoMedio,
  58 + <![CDATA[ select
  59 + contacontabil.codigo as codigoContaContabil,
  60 + contacontabil.descricao as contaContabil,
  61 + material.id as idMaterial,
  62 + material.descricao as material,
  63 + material.codigo as codigoMaterial,
  64 + um.sigla as unidadeMedida,
  65 + (select sum(materialestoquefifoitem.valorsobra) from alm_en_entradaitem entradaalmoxarifadoitem
  66 + inner join alm_me_fifoitem materialestoquefifoitem on materialestoquefifoitem.entradaitem_id = entradaalmoxarifadoitem.id
  67 + inner join alm_entrada entradaalmoxarifado on entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
  68 + and entradaalmoxarifado.almoxarifado_id = $P{idAlmoxarifado} where entradaalmoxarifadoitem.material_id = materialconsumo.id) as residuo,
  69 + materialestoque.valorunitariomedio as precoMedio,
69 70 materialestoquesaldo.quantidade as quantidadeEstoqueSaldo,
70   - (select sum(quantidade) from movimentoestoque
71   - where material_id = materialconsumo.id and materialestoquesaldo_id is null and datainativo is null) as quantidadeMovimento,
72   - (select sum(quantidade) from atendimentoreqconsumoitem arci
73   - inner join atendimentorequisicaoconsumo arc on arc.id = arci.atendimentoreqconsumo_id
  71 + (select sum(quantidade) from alm_me_movimentoestoque
  72 + where material_id = materialconsumo.id and (datareferencia between $P{dataReferenciaAnterior} and $P{dataReferencia}) and datainativo is null) as quantidadeMovimento,
  73 + (select sum(quantidade) from alm_rc_atendimentoitem arci
  74 + inner join alm_rc_atendimento arc on arc.id = arci.atendimentoreqconsumo_id
74 75 where arci.material_id = materialconsumo.id and arci.datainativo is null
75 76 and arc.dataatendimento between $P{dataReferenciaAnterior} and $P{dataReferencia}) as quantidadeAtendida
76   - from materialconsumo materialconsumo
  77 + from alm_materialconsumo materialconsumo
77 78 inner join material material on materialconsumo.id = material.id and material.datainativo is null
78 79 inner join unidademedida um on materialconsumo.unidadearmazenamento_id = um.id
79   -inner join materialestoquesaldomedio materialestoquesaldomedio on materialestoquesaldomedio.material_id = material.id
80   -left join materialestoquesaldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
  80 +inner join alm_materialestoque materialestoque on materialestoque.material_id = material.id
  81 +left join alm_me_saldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
81 82 inner join contacontabil contacontabil on material.contacontabil_id = contacontabil.id and $X{IN,contacontabil.id,idsContas}
82   -left join localestoque localestoque on materialestoquesaldo.localestoque_id = localestoque.id and localestoque.almoxarifado_id = $P{idAlmoxarifado}
  83 +left join alm_me_localestoque materiallocalestoque on materialestoquesaldo.localestoque_id = materiallocalestoque.id
  84 +inner join alm_es_enderecoestoque enderecoestoque on materiallocalestoque.endereco_id = enderecoestoque.id
  85 +inner join alm_estoque estoque on enderecoestoque.estoque_id = estoque.id and estoque.almoxarifado_id = $P{idAlmoxarifado}
83 86 order by contaContabil, material]]>
84 87 </queryString>
85 88 <field name="codigocontacontabil" class="java.lang.String"/>
... ...
cit-almoxarifado-web/src/main/resources/reports/PosicaoEstoqueResumoAnalitico.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3   -<!-- 2016-05-12T16:05:27 -->
  3 +<!-- 2016-05-16T17:04:38 -->
4 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="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">
5 5 <property name="ireport.zoom" value="1.2396694214876032"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -58,16 +58,18 @@
58 58 contacontabil.codigo as codigoContaContabil,
59 59 contacontabil.descricao as contaContabil,
60 60 material.id as material,
61   - materialestoquesaldomedio.valorunitariomedio as precoMedio,
  61 + materialestoque.valorunitariomedio as precoMedio,
62 62 materialestoquesaldo.quantidade as quantidadeEstoqueSaldo,
63   - (select sum(quantidade) from movimentoestoque
64   - where material_id = materialconsumo.id and materialestoquesaldo_id is null and datainativo is null) as quantidadeMovimento
65   - from materialconsumo materialconsumo
  63 + (select sum(quantidade) from alm_me_movimentoestoque
  64 + where material_id = materialconsumo.id and (datamovimento between $P{dataReferenciaAnterior} and $P{dataReferencia}) and datainativo is null) as quantidadeMovimento
  65 + from alm_materialconsumo materialconsumo
66 66 inner join material material on materialconsumo.id = material.id and material.datainativo is null
67   -inner join materialestoquesaldomedio materialestoquesaldomedio on materialestoquesaldomedio.material_id = materialconsumo.id
68   -left join materialestoquesaldo materialestoquesaldo on materialestoquesaldo.material_id = materialconsumo.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
  67 +inner join alm_materialestoque materialestoque on materialestoque.material_id = material.id
  68 +left join alm_me_saldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
69 69 inner join contacontabil contacontabil on material.contacontabil_id = contacontabil.id and $X{IN,contacontabil.id,idsContas}
70   -left join localestoque localestoque on materialestoquesaldo.localestoque_id = localestoque.id and localestoque.almoxarifado_id = $P{idAlmoxarifado}
  70 +left join alm_me_localestoque materiallocalestoque on materialestoquesaldo.localestoque_id = materiallocalestoque.id
  71 +inner join alm_es_enderecoestoque enderecoestoque on materiallocalestoque.endereco_id = enderecoestoque.id
  72 +inner join alm_estoque estoque on enderecoestoque.estoque_id = estoque.id and estoque.almoxarifado_id = $P{idAlmoxarifado}
71 73 order by contaContabil]]>
72 74 </queryString>
73 75 <field name="codigocontacontabil" class="java.lang.String"/>
... ...
cit-almoxarifado-web/src/main/resources/reports/RelatorioMaterialEstoqueAlmoxarifado.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3   -<!-- 2016-05-12T16:15:39 -->
  3 +<!-- 2016-05-16T17:15:06 -->
4 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="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">
5 5 <property name="ireport.zoom" value="1.3636363636363638"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -68,13 +68,15 @@
68 68 $P!{movimento_estoque} as quantidademovimento,
69 69 materialestoquesaldo.valorfechado as valorEstoque,
70 70 0 as pontopedido,
71   - materialestoquesaldomedio.valorunitariomedio as precomedio
72   - from materialconsumo materialconsumo
  71 + materialestoque.valorunitariomedio as precomedio
  72 + from alm_materialconsumo materialconsumo
73 73 inner join material material on materialconsumo.id = material.id and material.datainativo is null
74 74 inner join unidademedida um on materialconsumo.unidadearmazenamento_id = um.id
75   -inner join materialestoquesaldomedio materialestoquesaldomedio on materialestoquesaldomedio.material_id = material.id
76   -left join materialestoquesaldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
77   -left join localestoque localestoque on materialestoquesaldo.localestoque_id = localestoque.id and localestoque.almoxarifado_id = $P{idAlmoxarifado}
  75 +inner join alm_materialestoque materialestoque on materialestoque.material_id = material.id
  76 +left join alm_me_saldo materialestoquesaldo on materialestoquesaldo.material_id = material.id and materialestoquesaldo.datareferencia = $P{dataReferencia}
  77 +left join alm_me_localestoque materiallocalestoque on materialestoquesaldo.localestoque_id = materiallocalestoque.id
  78 +inner join alm_es_enderecoestoque enderecoestoque on materiallocalestoque.endereco_id = enderecoestoque.id
  79 +inner join alm_estoque estoque on enderecoestoque.estoque_id = estoque.id and estoque.almoxarifado_id = $P{idAlmoxarifado}
78 80 where $X{IN,material.id,idsMateriais}
79 81 order by material]]>
80 82 </queryString>
... ...
cit-almoxarifado-web/src/main/resources/reports/SaidaMaterialPorContaSintetico.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3   -<!-- 2016-05-12T16:30:04 -->
  3 +<!-- 2016-05-17T08:18:29 -->
4 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="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">
5 5 <property name="ireport.zoom" value="1.610510000000001"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -105,13 +105,14 @@ u.sigla as unidade,
105 105 sum(me.quantidade) as quantidade,
106 106 0 as quantidadedevolvida,
107 107 sum(me.valorfifo) as valortotal
108   -from movimentoestoque me
109   -inner join baixaalmoxarifadoitem bmi on me.baixaalmoxarifadoitem_id = bmi.id and bmi.dataestorno is null
  108 +from alm_me_movimentoestoque me
  109 +inner join alm_bx_item bmi on me.idclassereferencia = bmi.id and bmi.dataestorno is null
110 110 inner join material m on me.material_id = m.id
111   -left join materialconsumo mc on m.id = mc.id
  111 +left join alm_materialconsumo mc on m.id = mc.id
112 112 left join unidademedida u on mc.unidadearmazenamento_id = u.id
113 113 inner join contacontabil cc on m.contacontabil_id = cc.id
114 114 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
  115 +and ((select id from dominio where chave = 'classeReferencia' and codigo = 13) = me.dominioclassereferencia_id)
115 116 group by codigocontacontabil, contacontabil, material, codigomaterial, unidade
116 117 union
117 118 select
... ... @@ -123,14 +124,15 @@ u.sigla as unidade,
123 124 sum(me.quantidade) as quantidade,
124 125 sum(rci.quantidadedevolvida) as quantidadedevolvida,
125 126 sum(me.valorfifo) as valortotal
126   -from movimentoestoque me
127   -inner join atendimentoreqconsumoitem arci on me.atendimentoreqconsumoitem_id = arci.id
128   -inner join requisicaoconsumoitem rci on arci.requisicaoconsumoitem_id = rci.id
  127 +from alm_me_movimentoestoque me
  128 +inner join alm_rc_atendimentoitem arci on me.idclassereferencia = arci.id
  129 +inner join alm_rc_item rci on arci.requisicaoconsumoitem_id = rci.id
129 130 inner join material m on me.material_id = m.id
130   -left join materialconsumo mc on m.id = mc.id
  131 +left join alm_materialconsumo mc on m.id = mc.id
131 132 left join unidademedida u on mc.unidadearmazenamento_id = u.id
132 133 inner join contacontabil cc on m.contacontabil_id = cc.id
133 134 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
  135 +and and ((select id from dominio where chave = 'classeReferencia' and codigo = 14) = me.dominioclassereferencia_id)
134 136 group by codigocontacontabil, contacontabil, material, codigomaterial, unidade
135 137 ) view
136 138 group by codigocontacontabil, contacontabil, material, unidade, codigomaterial
... ...
cit-almoxarifado-web/src/main/resources/reports/consumoAlmoxarifado.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
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 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 5 <property name="ireport.zoom" value="2.2000000000000015"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -26,15 +26,17 @@ from
26 26 select m.descricao as nomeMaterial,
27 27 to_char(me.datamovimento, 'YYYY') as ano,
28 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 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 34 inner join material m on m.id = me.material_id
35 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 40 union
39 41 select
40 42 material.descricao as nomeMaterial,
... ... @@ -44,10 +46,10 @@ from
44 46 0 as quantidadeDevolucao,
45 47 requisicaoconsumoitem.quantidadeatendida as quantidadeRequisicao,
46 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 53 inner join material material on requisicaoconsumoitem.materialconsumo_id = material.id
52 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 55 ) view
... ...
cit-almoxarifado-web/src/main/resources/reports/entradaMaterialAnaliticoEntrada.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3   -<!-- 2016-05-12T14:41:32 -->
  3 +<!-- 2016-05-16T10:29:35 -->
4 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="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">
5 5 <property name="ireport.zoom" value="1.331000000000001"/>
6 6 <property name="ireport.x" value="0"/>
... ... @@ -75,13 +75,13 @@ WHERE ed.entrada_id = $P{idEntrada}]]&gt;
75 75 entradaalmoxarifadoitem.quantidade AS quantidade,
76 76 entradaalmoxarifadoitem.valorunitario AS valorUnitario,
77 77 entradaalmoxarifadoitem.valortotal AS valorTotal
78   -FROM entradaalmoxarifado entradaalmoxarifado
  78 +FROM alm_entrada entradaalmoxarifado
79 79 INNER JOIN dominio dominio ON dominio.id = entradaalmoxarifado.dominiotiporecebimento_id
80 80 INNER JOIN parceiro parceiro ON parceiro.id = entradaalmoxarifado.fornecedor_id
81 81 INNER JOIN pessoa pessoa ON pessoa.id = parceiro.pessoa_id
82 82 LEFT JOIN pessoajuridica pessoajuridica ON pessoa.id = pessoajuridica.pessoa_id
83 83 LEFT JOIN pessoafisica pessoafisica ON pessoa.id = pessoafisica.pessoa_id
84   - INNER JOIN entradaalmoxarifadoitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
  84 + INNER JOIN alm_en_entradaitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
85 85 LEFT JOIN unidademedida unidademedida ON entradaalmoxarifadoitem.unidademedidaentrada_id = unidademedida.id
86 86 INNER JOIN material material ON material.id = entradaalmoxarifadoitem.material_id
87 87 LEFT JOIN contacontabil contacontabil ON material.contacontabil_id = contacontabil.id
... ...
cit-almoxarifado-web/src/main/resources/reports/entradaMaterialNotaRecebimento.jrxml
  Diff comments   View file @4d0e45a
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
3   -<!-- 2016-05-12T14:51:45 -->
  3 +<!-- 2016-05-16T10:33:33 -->
4 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="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">
5 5 <property name="ireport.zoom" value="1.6500000000000008"/>
6 6 <property name="ireport.x" value="25"/>
... ... @@ -85,13 +85,13 @@ ORDER BY contacontabil]]&gt;
85 85 entradaalmoxarifadoitem.valorunitario AS valorUnitario,
86 86 entradaalmoxarifadoitem.valortotal AS valorTotal,
87 87 dominioFin.descricao AS finalidadeCompra
88   -FROM entradaalmoxarifado entradaalmoxarifado
  88 +FROM alm_entrada entradaalmoxarifado
89 89 INNER JOIN dominio dominio ON dominio.id = entradaalmoxarifado.dominiotiporecebimento_id
90 90 INNER JOIN parceiro parceiro ON parceiro.id = entradaalmoxarifado.fornecedor_id
91 91 INNER JOIN pessoa pessoa ON pessoa.id = parceiro.pessoa_id
92 92 LEFT JOIN pessoajuridica pessoajuridica ON pessoa.id = pessoajuridica.pessoa_id
93 93 LEFT JOIN pessoafisica pessoafisica ON pessoa.id = pessoafisica.pessoa_id
94   - INNER JOIN entradaalmoxarifadoitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
  94 + INNER JOIN alm_en_entradaitem entradaalmoxarifadoitem ON entradaalmoxarifadoitem.entrada_id = entradaalmoxarifado.id
95 95 LEFT JOIN dominio dominioFin ON dominioFin.id = entradaalmoxarifado.dominiofinalidade_id
96 96 LEFT JOIN unidademedida unidademedida ON entradaalmoxarifadoitem.unidademedidaentrada_id = unidademedida.id
97 97 INNER JOIN material material ON material.id = entradaalmoxarifadoitem.material_id
... ...