fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#AL-4120

master
celio.souza 2024-06-27 09:05:31 -03:00
parent 57e045c67c
commit d8f1f25ea6
9 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.91.0</version>
<version>1.92.0</version>
<packaging>war</packaging>
<properties>

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
View File

@ -47,6 +47,7 @@ public class RelatorioTaxasLinha extends Relatorio {
Connection conexao = this.relatorio.getConexao();
Map<String, Object> parametros = this.relatorio.getParametros();
String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA");
Boolean isSubNoShow = (Boolean) parametros.get("B_SUBTRAIR_NO_SHOW");
Boolean isTxEmbarque = (Boolean) parametros.get("IS_TX_EMBARQUE");
Boolean isPedagio = (Boolean) parametros.get("IS_PEDAGIO");
@ -55,7 +56,7 @@ public class RelatorioTaxasLinha extends Relatorio {
lsDadosRelatorio = new ArrayList<RelatorioTaxasLinhaBean>();
String sql = getSql(puntosVentaIds);
String sql = getSql(puntosVentaIds, isSubNoShow);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@ -247,7 +248,7 @@ public class RelatorioTaxasLinha extends Relatorio {
return cacheConfig;
}
private String getSql(String puntosVentaIds) {
private String getSql(String puntosVentaIds, Boolean isSubNoShow) {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT RT.PREFIXO, ");
@ -298,7 +299,10 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append("AND CJ.INDREIMPRESION = 0 ");
sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append("AND EM.EMPRESA_ID = COALESCE(:EMPRESA_ID, EM.EMPRESA_ID) ");
if (isSubNoShow) {
sql.append(" AND CJ.MOTIVOCANCELACION_ID NOT IN (23,27) ");
}
if (!puntosVentaIds.equals("Todas")) {
sql.append(" AND PV.PUNTOVENTA_ID IN (").append(puntosVentaIds).append(") ");
}

9
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinhaPorDataEmissao.java
View File

@ -47,6 +47,7 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
Connection conexao = this.relatorio.getConexao();
Map<String, Object> parametros = this.relatorio.getParametros();
String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA");
Boolean isSubNoShow = (Boolean) parametros.get("B_SUBTRAIR_NO_SHOW");
Boolean isTxEmbarque = (Boolean) parametros.get("IS_TX_EMBARQUE");
Boolean isPedagio = (Boolean) parametros.get("IS_PEDAGIO");
@ -55,7 +56,7 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
lsDadosRelatorio = new ArrayList<RelatorioTaxasLinhaBean>();
String sql = getSql(puntosVentaIds);
String sql = getSql(puntosVentaIds, isSubNoShow);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@ -249,7 +250,7 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
return cacheConfig;
}
private String getSql(String puntosVentaIds) {
private String getSql(String puntosVentaIds, Boolean isSubNoShow) {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT RT.PREFIXO, ");
@ -300,7 +301,9 @@ public class RelatorioTaxasLinhaPorDataEmissao extends Relatorio {
sql.append("AND CJ.INDREIMPRESION = 0 ");
sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append("AND EM.EMPRESA_ID = COALESCE(:EMPRESA_ID, EM.EMPRESA_ID) ");
if (isSubNoShow) {
sql.append(" AND CJ.MOTIVOCANCELACION_ID NOT IN (23,27) ");
}
if (!puntosVentaIds.equals("Todas")) {
sql.append(" AND PV.PUNTOVENTA_ID IN (").append(puntosVentaIds).append(") ");
}

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTaxasLinhaController.java
View File

@ -91,6 +91,7 @@ public class RelatorioTaxasLinhaController extends MyGenericForwardComposer {
private MyTextbox txtNombrePuntoVenta;
private Radiogroup rdGroupTipoData;
private Checkbox chkSubtrairIcms;
private Checkbox chkSubtrairNoShow;
private MyComboboxEstandar cmbEmpresa;
private Bandbox bbPesquisaPuntoVenta;
private MyListbox puntoVentaList;
@ -224,6 +225,7 @@ public class RelatorioTaxasLinhaController extends MyGenericForwardComposer {
parametros.put("TIPO_DATA", Integer.parseInt(rdGroupTipoData.getSelectedItem().getValue()));
parametros.put("NUMPUNTOVENTA", puntoVentaIds);
parametros.put("B_SUBTRAIR_ICMS", ((Boolean) (chkSubtrairIcms.isChecked())));
parametros.put("B_SUBTRAIR_NO_SHOW", ((Boolean) (chkSubtrairNoShow.isChecked())));
parametros.put("IS_TX_EMBARQUE", ((Boolean) (chkTaxaEmbarque.isChecked())));
parametros.put("IS_PEDAGIO", (Boolean) chkTaxaPedagio.isChecked());
parametros.put("IS_SEGURO", chkTaxaSeguro.isChecked());
@ -316,6 +318,7 @@ public class RelatorioTaxasLinhaController extends MyGenericForwardComposer {
parametros.put("TIPO_DATA", Integer.parseInt(rdGroupTipoData.getSelectedItem().getValue()));
parametros.put("NUMPUNTOVENTA", puntoVentaIds);
parametros.put("B_SUBTRAIR_ICMS", ((Boolean) (chkSubtrairIcms.isChecked())));
parametros.put("B_SUBTRAIR_NO_SHOW", ((Boolean) (chkSubtrairNoShow.isChecked())));
parametros.put("IS_TX_EMBARQUE", ((Boolean) (chkTaxaEmbarque.isChecked())));
parametros.put("IS_PEDAGIO", (Boolean) chkTaxaPedagio.isChecked());
parametros.put("IS_SEGURO", chkTaxaSeguro.isChecked());

1
web/WEB-INF/i3-label_en.label
View File

@ -9474,6 +9474,7 @@ relatorioTabelaPrecoController.window.title = Relatório de Tabela de Preços
relatorioTaxasLinhaController.lbAte.value = até
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exportar .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Subtrair ICMS
relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Subtrair No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Taxa de Embarque
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Pedagio
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Seguro

1
web/WEB-INF/i3-label_es_MX.label
View File

@ -9619,6 +9619,7 @@ relatorioTabelaPrecoController.window.title = Reporte de Tabla de Precios
relatorioTaxasLinhaController.lbAte.value = Hasta
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exportar .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Subtrair ICMS
relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Subtrair No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Taxa de Embarque
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Pedagio
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Seguro

1
web/WEB-INF/i3-label_fr_FR.label
View File

@ -9591,6 +9591,7 @@ relatorioTabelaPrecoController.window.title = Rapport sur le tableau des prix
relatorioTaxasLinhaController.lbAte.value = jusqu'à
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exporter le .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Soustraire ICMS
relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Soustraire No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Frais d'embarquement
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Péage
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Coffre-fort

1
web/WEB-INF/i3-label_pt_BR.label
View File

@ -9596,6 +9596,7 @@ relatorioTabelaPrecoController.window.title = Relatório de Tabela de Preços
relatorioTaxasLinhaController.lbAte.value = até
relatorioTaxasLinhaController.lbChkDownloadTxt.value = Exportar .txt
relatorioTaxasLinhaController.lbChkSubtrairIcms.value = Subtrair ICMS
relatorioTaxasLinhaController.lbChkSubtrairNoShow.value = Subtrair No Show
relatorioTaxasLinhaController.lbChkTaxaEmbarque.value = Taxa de Embarque
relatorioTaxasLinhaController.lbChkTaxaPedagio.value = Pedagio
relatorioTaxasLinhaController.lbChkTaxaSeguro.value = Seguro

4
web/gui/relatorios/filtroRelatorioTaxasLinha.zul
View File

@ -71,6 +71,10 @@
<checkbox id="chkSubtrairIcms"
label="${c:l('relatorioTaxasLinhaController.lbChkSubtrairIcms.value')}" />
<checkbox id="chkSubtrairNoShow"
label="${c:l('relatorioTaxasLinhaController.lbChkSubtrairNoShow.value')}" />
</hbox>
</row>
<row spans="1,1,2">