From 288117d61d9df12463925fcc72ab85c9e1e4258b Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Wed, 13 Mar 2024 09:30:11 -0300 Subject: [PATCH] fixes bug#AL-3984 --- pom.xml | 2 +- ...latorioBilhetesVendidosEstoqueAgencia.java | 15 +++++++++++---- ...hetesVendidosEstoqueAgenciaNovoLayout.java | 18 ++++++++++++------ .../relatorios/impl/RelatorioEstoque.java | 2 +- ...torioBilhetesVendidosEstoqueAgencia.jasper | Bin 33337 -> 33334 bytes ...atorioBilhetesVendidosEstoqueAgencia.jrxml | 2 +- ...tesVendidosEstoqueAgenciaNovoLayout.jasper | Bin 34102 -> 34207 bytes ...etesVendidosEstoqueAgenciaNovoLayout.jrxml | 2 +- .../templates/RelatorioEstoque.jasper | Bin 35659 -> 35723 bytes .../templates/RelatorioEstoque.jrxml | 14 +++++++------- .../RelatorioAidfDetalhadoController.java | 5 ----- ...hetesVendidosEstoqueAgenciaController.java | 10 ++++++++++ web/WEB-INF/i3-label_es_MX.label | 2 +- web/WEB-INF/i3-label_pt_BR.label | 4 ++-- ...elatorioBilhetesVendidosEstoqueAgencia.zul | 7 ++++++- 15 files changed, 53 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index cdefb5bb6..8905984f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.56.0 + 1.56.1 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgencia.java index 0fd033790..42c818c1c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgencia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgencia.java @@ -44,8 +44,9 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio { Date datainicial = (Date) parametros.get("DATA_INICIAL"); Date dataFinal = (Date) parametros.get("DATA_FINAL"); Integer aidfTipoId = (Integer) parametros.get("AIDFTIPO_ID"); + Integer aidfId = (Integer) parametros.get("AIDF_ID"); - NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql(pnutoVentasIds, aidfTipoId)); + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql(pnutoVentasIds, aidfTipoId, aidfId)); stmt.setInt("EMPRESA_ID", empresa); stmt.setString("dataInicio", DateUtil.getStringDate(datainicial, "dd/MM/yyyy") + " 00:00:00"); @@ -53,6 +54,9 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio { if(aidfTipoId != null) { stmt.setInt("aidfTipo",aidfTipoId); } + if(aidfId != null) { + stmt.setInt("aidfId",aidfId); + } ResultSet rset = stmt.executeQuery(); List lsTemp = new ArrayList<>(); @@ -117,7 +121,7 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio { return lsDadosRelatorio; } - private String sql(String puntoVentasId, Integer aidfTipoId) { + private String sql(String puntoVentasId, Integer aidfTipoId, Integer aidfId) { StringBuilder sql = new StringBuilder(); @@ -150,8 +154,9 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio { } sql.append(" AND EM.EMPRESA_ID = AB.EMPRESA_ID "); sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); - sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID "); + sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); + sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, "); sql.append(" c.puntoventa_id, "); @@ -182,8 +187,9 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio { } sql.append(" AND EM.EMPRESA_ID = AB.EMPRESA_ID "); sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); - sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID "); + sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); + sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, "); sql.append(" c.puntoventa_id, "); @@ -192,6 +198,7 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio { sql.append(" em.nombEmpresa, AIT.DESCTIPO "); sql.append(" )TB "); sql.append(" ORDER BY to_number(TB.FOLIO) "); + System.out.println(sql.toString()); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java index c45ea1c0c..796fdd0c2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java @@ -42,8 +42,9 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio Date datainicial = (Date) parametros.get("DATA_INICIAL"); Date dataFinal = (Date) parametros.get("DATA_FINAL"); Integer aidfTipoId = (Integer) parametros.get("AIDFTIPO_ID"); + Integer aidfId = (Integer) parametros.get("AIDF_ID"); - NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql(pnutoVentasIds, aidfTipoId)); + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql(pnutoVentasIds, aidfTipoId, aidfId)); stmt.setInt("EMPRESA_ID", empresa); stmt.setString("dataInicio", DateUtil.getStringDate(datainicial, "dd/MM/yyyy") + " 00:00:00"); @@ -51,6 +52,9 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio if(aidfTipoId != null) { stmt.setInt("aidfTipo",aidfTipoId); } + if(aidfId != null) { + stmt.setInt("aidfId",aidfId); + } ResultSet rset = stmt.executeQuery(); List lsTemp = new ArrayList<>(); @@ -94,7 +98,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio return lsDadosRelatorio; } - private String sql(String puntoVentasId, Integer aidfTipoId) { + private String sql(String puntoVentasId, Integer aidfTipoId, Integer aidfId) { StringBuilder sql = new StringBuilder(); sql.append(" SELECT TB.aidfId AS aidfId, "); @@ -145,14 +149,15 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); + sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); + sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" AND po.parada_id = c.origen_id "); sql.append(" AND co.ciudad_id = po.ciudad_id "); sql.append(" AND pd.parada_id = c.destino_id "); sql.append(" AND cd.ciudad_id = pd.ciudad_id "); sql.append(" AND est.estado_id = co.estado_id "); - sql.append(" and c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL "); - sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); + sql.append(" and c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(" GROUP BY DAB.AIDF_ID, "); sql.append(" c.numseriepreimpresa, "); sql.append(" c.numfoliopreimpreso, "); @@ -196,8 +201,9 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio } sql.append(" AND EM.EMPRESA_ID = AB.EMPRESA_ID "); sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); - sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID "); + sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 "); sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID "); + sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID "); sql.append(" GROUP BY DAB.AIDF_ID, "); sql.append(" c.numseriepreimpresa, "); @@ -209,7 +215,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio sql.append(" AIT.DESCTIPO, "); sql.append(" c.PRECIO)TB "); sql.append(" ORDER BY to_number(TB.FOLIO) "); - + System.out.println(sql.toString()); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java index bbdc50fc7..0ba50ac6e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java @@ -511,7 +511,7 @@ public class RelatorioEstoque extends Relatorio { Integer folioInicialInt = Integer.valueOf(folioInicial); Integer folioFinalInt = Integer.valueOf(folioFinal); - return folioInicialInt == folioFinalInt ? 1 : (folioFinalInt - folioInicialInt); + return folioInicialInt == folioFinalInt ? 1 : (folioFinalInt - folioInicialInt)+1; } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jasper index 0da02e2c50501bfb3a503e3fb82b13bfc70c2002..3d7221c1971001254769227941da24c5451113c7 100644 GIT binary patch delta 125 zcmdnl!nCc0X~Sw+R+f;=g8a=}Wd+;L61>~kwG;mH7BtozbG@`wYVg| zurxK^(A?0#*x1m($kf8pEZ)M@(9+V9oq>^&L1%IytIXv1boR{(Dd%M+MX{?{_ delta 121 zcmdni!nCu6X~Sw+F3yn5f_w$X%#^gv8)OCCEYwf^+qI8@fkBT^hmk=gC^aXsB)=## z-?g|Tzpykl-q768z{u3p(9Fof%rxHA#Kgjaoq>^&L1%IytITBk4ED`3Dd%NHMX)KH I%-CcK02*^5$p8QV diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jrxml index 13007a6d6..fe1f91585 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jrxml @@ -113,7 +113,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.jasper index 538f59b748670a0a4bbfe1f9f2ba3dfd4a20f1a0..a2c2b9609b610c5fce59b63faa55178df705f3b0 100644 GIT binary patch delta 5656 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 - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper index 5a7fcefac9b244aee65bd3d4ecd8822f60705162..6b8fd7f30a92936058b026559c8b9941d269959e 100644 GIT binary patch delta 6281 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml index db3af0ce5..4596ee132 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -112,7 +112,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java index 5745bcaa2..5af31a09c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java @@ -2,8 +2,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,16 +23,13 @@ import org.zkoss.zul.Intbox; import org.zkoss.zul.Paging; import org.zkoss.zul.Textbox; -import com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.AidfTipo; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEstoque; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioBilhetesVendidosEstoqueAgenciaBean; import com.rjconsultores.ventaboletos.service.AidfService; import com.rjconsultores.ventaboletos.service.EmpresaService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosEstoqueAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosEstoqueAgenciaController.java index 84a1ec6bf..dbfe351e3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosEstoqueAgenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosEstoqueAgenciaController.java @@ -20,6 +20,7 @@ import org.zkoss.zul.Checkbox; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; +import org.zkoss.zul.Intbox; import org.zkoss.zul.Paging; import org.zkoss.zul.Radiogroup; @@ -75,6 +76,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaController extends MyGeneric private List lsAidfTipo; @Autowired private AidfService aidfService; + private Intbox aidfIdIntBox; @@ -200,6 +202,14 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaController extends MyGeneric } else { filtro.append(" Todas; "); } + + if (aidfIdIntBox.getValue() != null) { + Integer aidfId = aidfIdIntBox.getValue(); + parametros.put("AIDF_ID", aidfId ); + filtro.append(aidfId + ";"); + } else { + filtro.append(" Todas; "); + } if(novoLayout) { relatorio = new RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout(parametros, dataSourceRead.getConnection()); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index ab5ab3fd8..4f871e11e 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1104,7 +1104,7 @@ relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada relatorioAidfDetalhadoController.aidfTipo.label=Tipo Aidf -relatorioAidfDetalhadoController.aidf.label=Aidf +relatorioAidfDetalhadoController.aidf.label=AIDF ID #Relatório de Vendas PTA relatorioVendasPTAController.window.title = Reporte de Ventas PTA diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 60e365f78..1e641d62f 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1224,8 +1224,8 @@ relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada -relatorioAidfDetalhadoController.aidfTipo.label=Tipo Aidf -relatorioAidfDetalhadoController.aidf.label=Aidf ID +relatorioAidfDetalhadoController.aidfTipo.label=Tipo AIDF +relatorioAidfDetalhadoController.aidf.label=AIDF ID relatorioAidfDetalhadoController.window.title = Relatório Saldo de Estoque relatorioBilhetesVendidosEstoqueAgenciaController.consumoEstoqueDetalhado.label = Consumo Estoque - Detalhado diff --git a/web/gui/relatorios/filtroRelatorioBilhetesVendidosEstoqueAgencia.zul b/web/gui/relatorios/filtroRelatorioBilhetesVendidosEstoqueAgencia.zul index 3f837de30..98d9053c7 100644 --- a/web/gui/relatorios/filtroRelatorioBilhetesVendidosEstoqueAgencia.zul +++ b/web/gui/relatorios/filtroRelatorioBilhetesVendidosEstoqueAgencia.zul @@ -6,7 +6,7 @@ @@ -107,6 +107,11 @@ mold="rounded" buttonVisible="true" width="100%" model="@{winFiltroRelatorioBilhetesVendidosEstoqueAgencia$composer.lsAidfTipo}"/> + +