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

Merge pull request 'fixes bug#AL-3984' (!436) from AL-3984 into master 

Reviewed-on: adm/VentaBoletosAdm#436
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.56.1
wallace 2024-03-13 12:30:42 +00:00
parent 8a2694b035 288117d61d
commit d1372a8995
15 changed files with 53 additions and 30 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.56.0</version> <version>1.56.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

15
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgencia.java
View File

@ -44,8 +44,9 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio {
Date datainicial = (Date) parametros.get("DATA_INICIAL"); Date datainicial = (Date) parametros.get("DATA_INICIAL");
Date dataFinal = (Date) parametros.get("DATA_FINAL"); Date dataFinal = (Date) parametros.get("DATA_FINAL");
Integer aidfTipoId = (Integer) parametros.get("AIDFTIPO_ID"); 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.setInt("EMPRESA_ID", empresa);
stmt.setString("dataInicio", DateUtil.getStringDate(datainicial, "dd/MM/yyyy") + " 00:00:00"); stmt.setString("dataInicio", DateUtil.getStringDate(datainicial, "dd/MM/yyyy") + " 00:00:00");
@ -53,6 +54,9 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio {
if(aidfTipoId != null) { if(aidfTipoId != null) {
stmt.setInt("aidfTipo",aidfTipoId); stmt.setInt("aidfTipo",aidfTipoId);
} }
if(aidfId != null) {
stmt.setInt("aidfId",aidfId);
}
ResultSet rset = stmt.executeQuery(); ResultSet rset = stmt.executeQuery();
List<RelatorioBilhetesVendidosEstoqueAgenciaBean> lsTemp = new ArrayList<>(); List<RelatorioBilhetesVendidosEstoqueAgenciaBean> lsTemp = new ArrayList<>();
@ -117,7 +121,7 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio {
return lsDadosRelatorio; return lsDadosRelatorio;
} }
private String sql(String puntoVentasId, Integer aidfTipoId) { private String sql(String puntoVentasId, Integer aidfTipoId, Integer aidfId) {
StringBuilder sql = new StringBuilder(); 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 EM.EMPRESA_ID = AB.EMPRESA_ID ");
sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_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(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 EM.EMPRESA_ID =:EMPRESA_ID ");
sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, "); sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, ");
sql.append(" c.puntoventa_id, "); 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 EM.EMPRESA_ID = AB.EMPRESA_ID ");
sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_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(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 EM.EMPRESA_ID =:EMPRESA_ID ");
sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, "); sql.append(" GROUP BY DAB.AIDF_ID,c.numseriepreimpresa, c.numfoliopreimpreso, ");
sql.append(" c.puntoventa_id, "); sql.append(" c.puntoventa_id, ");
@ -192,6 +198,7 @@ public class RelatorioBilhetesVendidosEstoqueAgencia extends Relatorio {
sql.append(" em.nombEmpresa, AIT.DESCTIPO "); sql.append(" em.nombEmpresa, AIT.DESCTIPO ");
sql.append(" )TB "); sql.append(" )TB ");
sql.append(" ORDER BY to_number(TB.FOLIO) "); sql.append(" ORDER BY to_number(TB.FOLIO) ");
System.out.println(sql.toString());
return sql.toString(); return sql.toString();

18
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java
View File

@ -42,8 +42,9 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
Date datainicial = (Date) parametros.get("DATA_INICIAL"); Date datainicial = (Date) parametros.get("DATA_INICIAL");
Date dataFinal = (Date) parametros.get("DATA_FINAL"); Date dataFinal = (Date) parametros.get("DATA_FINAL");
Integer aidfTipoId = (Integer) parametros.get("AIDFTIPO_ID"); 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.setInt("EMPRESA_ID", empresa);
stmt.setString("dataInicio", DateUtil.getStringDate(datainicial, "dd/MM/yyyy") + " 00:00:00"); stmt.setString("dataInicio", DateUtil.getStringDate(datainicial, "dd/MM/yyyy") + " 00:00:00");
@ -51,6 +52,9 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
if(aidfTipoId != null) { if(aidfTipoId != null) {
stmt.setInt("aidfTipo",aidfTipoId); stmt.setInt("aidfTipo",aidfTipoId);
} }
if(aidfId != null) {
stmt.setInt("aidfId",aidfId);
}
ResultSet rset = stmt.executeQuery(); ResultSet rset = stmt.executeQuery();
List<RelatorioBilhetesVendidosEstoqueAgenciaBean> lsTemp = new ArrayList<>(); List<RelatorioBilhetesVendidosEstoqueAgenciaBean> lsTemp = new ArrayList<>();
@ -94,7 +98,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
return lsDadosRelatorio; return lsDadosRelatorio;
} }
private String sql(String puntoVentasId, Integer aidfTipoId) { private String sql(String puntoVentasId, Integer aidfTipoId, Integer aidfId) {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" SELECT TB.aidfId AS aidfId, "); 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 c.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ");
sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID "); sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_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 EM.EMPRESA_ID =:EMPRESA_ID ");
sql.append(" AND po.parada_id = c.origen_id "); sql.append(" AND po.parada_id = c.origen_id ");
sql.append(" AND co.ciudad_id = po.ciudad_id "); sql.append(" AND co.ciudad_id = po.ciudad_id ");
sql.append(" AND pd.parada_id = c.destino_id "); sql.append(" AND pd.parada_id = c.destino_id ");
sql.append(" AND cd.ciudad_id = pd.ciudad_id "); sql.append(" AND cd.ciudad_id = pd.ciudad_id ");
sql.append(" AND est.estado_id = co.estado_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 c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL AND AI.ACTIVO = 1 AND AIT.ACTIVO = 1 ");
sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID ");
sql.append(" GROUP BY DAB.AIDF_ID, "); sql.append(" GROUP BY DAB.AIDF_ID, ");
sql.append(" c.numseriepreimpresa, "); sql.append(" c.numseriepreimpresa, ");
sql.append(" c.numfoliopreimpreso, "); 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 EM.EMPRESA_ID = AB.EMPRESA_ID ");
sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_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(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 EM.EMPRESA_ID =:EMPRESA_ID ");
sql.append(" GROUP BY DAB.AIDF_ID, "); sql.append(" GROUP BY DAB.AIDF_ID, ");
sql.append(" c.numseriepreimpresa, "); sql.append(" c.numseriepreimpresa, ");
@ -209,7 +215,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
sql.append(" AIT.DESCTIPO, "); sql.append(" AIT.DESCTIPO, ");
sql.append(" c.PRECIO)TB "); sql.append(" c.PRECIO)TB ");
sql.append(" ORDER BY to_number(TB.FOLIO) "); sql.append(" ORDER BY to_number(TB.FOLIO) ");
System.out.println(sql.toString());
return sql.toString(); return sql.toString();

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -511,7 +511,7 @@ public class RelatorioEstoque extends Relatorio {
Integer folioInicialInt = Integer.valueOf(folioInicial); Integer folioInicialInt = Integer.valueOf(folioInicial);
Integer folioFinalInt = Integer.valueOf(folioFinal); Integer folioFinalInt = Integer.valueOf(folioFinal);
return folioInicialInt == folioFinalInt ? 1 : (folioFinalInt - folioInicialInt); return folioInicialInt == folioFinalInt ? 1 : (folioFinalInt - folioInicialInt)+1;
} }

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jasper
View File

Binary file not shown.

2
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgencia.jrxml
View File

@ -113,7 +113,7 @@
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Tipo Aidf]]></text> <text><![CDATA[Tipo]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="1" y="16" width="119" height="18" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/> <reportElement x="1" y="16" width="119" height="18" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.jasper
View File

Binary file not shown.

2
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.jrxml
View File

@ -117,7 +117,7 @@
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Tipo Aidf]]></text> <text><![CDATA[Tipo ]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="1" y="16" width="101" height="17" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/> <reportElement x="1" y="16" width="101" height="17" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper
View File

Binary file not shown.

14
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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="RelatorioEstoque" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="/ventaboletosadm/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021"> <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="RelatorioEstoque" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="/ventaboletosadm/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
<property name="ireport.zoom" value="3.797498335832437"/> <property name="ireport.zoom" value="2.593742460100018"/>
<property name="ireport.x" value="637"/> <property name="ireport.x" value="183"/>
<property name="ireport.y" value="445"/> <property name="ireport.y" value="208"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
<parameter name="NOME_RELATORIO" class="java.lang.String"/> <parameter name="NOME_RELATORIO" class="java.lang.String"/>
@ -112,7 +112,7 @@
<text><![CDATA[De]]></text> <text><![CDATA[De]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="405" y="16" width="75" height="18" uuid="fcf366c0-0f13-44f7-84de-38ae1122b647"/> <reportElement x="394" y="16" width="86" height="18" uuid="fcf366c0-0f13-44f7-84de-38ae1122b647"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
@ -175,7 +175,7 @@
<text><![CDATA[Data Vencimento ]]></text> <text><![CDATA[Data Vencimento ]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="350" y="16" width="55" height="18" uuid="0df8c358-831f-4013-9b52-5e082ff250a5"/> <reportElement x="350" y="16" width="44" height="18" uuid="0df8c358-831f-4013-9b52-5e082ff250a5"/>
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="10" isBold="true"/> <font size="10" isBold="true"/>
</textElement> </textElement>
@ -201,7 +201,7 @@
<textFieldExpression><![CDATA[$F{folioInicial}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{folioInicial}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="405" y="2" width="75" height="18" uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc"/> <reportElement x="394" y="2" width="86" height="18" uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
@ -266,7 +266,7 @@
<textFieldExpression><![CDATA[$F{fecVencimento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{fecVencimento}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="350" y="2" width="55" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="5dbce9fd-364b-4f4c-a95f-dd7d474e4243"/> <reportElement mode="Transparent" x="350" y="2" width="44" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="5dbce9fd-364b-4f4c-a95f-dd7d474e4243"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java
View File

@ -2,8 +2,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -25,16 +23,13 @@ import org.zkoss.zul.Intbox;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Aidf;
import com.rjconsultores.ventaboletos.entidad.AidfTipo; import com.rjconsultores.ventaboletos.entidad.AidfTipo;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEstoque; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEstoque;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; 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.AidfService;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;

10
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosEstoqueAgenciaController.java
View File

@ -20,6 +20,7 @@ import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
import org.zkoss.zul.Radiogroup; import org.zkoss.zul.Radiogroup;
@ -75,6 +76,7 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaController extends MyGeneric
private List<AidfTipo> lsAidfTipo; private List<AidfTipo> lsAidfTipo;
@Autowired @Autowired
private AidfService aidfService; private AidfService aidfService;
private Intbox aidfIdIntBox;
@ -201,6 +203,14 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaController extends MyGeneric
filtro.append(" Todas; "); 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) { if(novoLayout) {
relatorio = new RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout(parametros, dataSourceRead.getConnection()); relatorio = new RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout(parametros, dataSourceRead.getConnection());
}else{ }else{

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

@ -1104,7 +1104,7 @@ relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial
relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final
relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada
relatorioAidfDetalhadoController.aidfTipo.label=Tipo Aidf relatorioAidfDetalhadoController.aidfTipo.label=Tipo Aidf
relatorioAidfDetalhadoController.aidf.label=Aidf relatorioAidfDetalhadoController.aidf.label=AIDF ID
#Relatório de Vendas PTA #Relatório de Vendas PTA
relatorioVendasPTAController.window.title = Reporte de Ventas PTA relatorioVendasPTAController.window.title = Reporte de Ventas PTA

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

@ -1224,8 +1224,8 @@ relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie
relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial
relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final
relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada
relatorioAidfDetalhadoController.aidfTipo.label=Tipo Aidf relatorioAidfDetalhadoController.aidfTipo.label=Tipo AIDF
relatorioAidfDetalhadoController.aidf.label=Aidf ID relatorioAidfDetalhadoController.aidf.label=AIDF ID
relatorioAidfDetalhadoController.window.title = Relatório Saldo de Estoque relatorioAidfDetalhadoController.window.title = Relatório Saldo de Estoque
relatorioBilhetesVendidosEstoqueAgenciaController.consumoEstoqueDetalhado.label = Consumo Estoque - Detalhado relatorioBilhetesVendidosEstoqueAgenciaController.consumoEstoqueDetalhado.label = Consumo Estoque - Detalhado

7
web/gui/relatorios/filtroRelatorioBilhetesVendidosEstoqueAgencia.zul
View File

@ -6,7 +6,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioBilhetesVendidosEstoqueAgencia" <window id="winFiltroRelatorioBilhetesVendidosEstoqueAgencia"
apply="${relatorioBilhetesVendidosEstoqueAgenciaController}" apply="${relatorioBilhetesVendidosEstoqueAgenciaController}"
contentStyle="overflow:auto" height="330px" width="550px" contentStyle="overflow:auto" height="350px" width="550px"
border="normal"> border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
@ -107,6 +107,11 @@
mold="rounded" buttonVisible="true" mold="rounded" buttonVisible="true"
width="100%" model="@{winFiltroRelatorioBilhetesVendidosEstoqueAgencia$composer.lsAidfTipo}"/> width="100%" model="@{winFiltroRelatorioBilhetesVendidosEstoqueAgencia$composer.lsAidfTipo}"/>
</row> </row>
<row spans="1,3">
<label
value="${c:l('relatorioAidfDetalhadoController.aidf.label')}" />
<intbox id="aidfIdIntBox"></intbox>
</row>
</rows> </rows>
</grid> </grid>