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

fixes bug #10268 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77518 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2017-12-21 16:57:37 +00:00
parent b8afe9eb44
commit dee05cc57d
6 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,8 +131,9 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append("SELECT tir.DESCTIPO TIPO_DOCUMENTO_REMARCADO,tio.DESCTIPO TIPO_DOCUMENTO_VENDA, r2.CCF CCF_REMARCADO, r2r.CCF CCF_VENDA, E.NOMBEMPRESA EMPRESA_REMARCADO,EV.NOMBEMPRESA EMPRESA_VENDA, ");
sql.append(" tp.DESCTIPOVENTA TIPO_VENDA, cao.DESCCATEGORIA TIPO_PASSAGEM_VENDA, car.DESCCATEGORIA TIPO_PASSAGEM_REMARCADO, ");
sql.append("SELECT original.DESCTIPODOC TIPO_DOCUMENTO_REMARCADO,remarcado.DESCTIPODOC TIPO_DOCUMENTO_VENDA, r2.CCF CCF_REMARCADO, r2r.CCF CCF_VENDA, E.NOMBEMPRESA EMPRESA_REMARCADO,EV.NOMBEMPRESA EMPRESA_VENDA, ");
sql.append(" case when tp.tipoventa_id = 73 then 'VENDA EXTRAVIADA' WHEN tp.tipoventa_id in(5,12,18,41,49) then 'PTA' WHEN tp.tipoventa_id = 82 then 'CONFIRM.EM ABERT' ELSE tp.DESCTIPOVENTA END TIPO_VENDA, " );
sql.append(" cao.DESCCATEGORIA TIPO_PASSAGEM_VENDA, car.DESCCATEGORIA TIPO_PASSAGEM_REMARCADO, ");
sql.append(" cao.CVECATEGORIA SIGLA_TIPO_PASSAGEM_VENDA, ");
sql.append(" car.CVECATEGORIA SIGLA_TIPO_PASSAGEM_REMARCADO, ");
sql.append(" rr.DESCRUTA LINHA_REMARCADO, ");
@ -205,14 +206,12 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio {
sql.append("LEFT JOIN FISCAL_R2 r2 ON (r4.NUMSERIE20 = r2.NUMSERIE20 and r4.DATAMOV = r2.DATAMOV) ");
sql.append("LEFT JOIN FISCAL_R4 r4r ON r4r.BOLETO_ID = original.BOLETO_ID ");
sql.append("LEFT JOIN FISCAL_R2 r2r ON (r4r.NUMSERIE20 = r2r.NUMSERIE20 and r4r.DATAMOV = r2r.DATAMOV) ");
sql.append("LEFT JOIN TIPO_IDENTIFICACION tir ON (tir.TIPOIDENTIFICACION_ID = remarcado.TIPOIDENTIFICACION_ID) ");
sql.append("LEFT JOIN TIPO_IDENTIFICACION tio ON (tio.TIPOIDENTIFICACION_ID = original.TIPOIDENTIFICACION_ID) ");
sql.append("inner JOIN USUARIO UR ON remarcado.USUARIO_ID = UR.USUARIO_ID ");
sql.append("inner JOIN TIPO_VENTA tp ON original.TIPOVENTA_ID = tp.TIPOVENTA_ID ");
sql.append("inner JOIN CATEGORIA cao ON original.CATEGORIA_ID = cao.CATEGORIA_ID ");
sql.append("inner JOIN CATEGORIA car ON remarcado.CATEGORIA_ID = car.CATEGORIA_ID ");
sql.append("WHERE remarcado.TIPOVENTA_ID IN (81) ");
sql.append("AND to_date(original.FECHORVENTA,'DD/MM/YY') BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append("AND to_date(remarcado.FECHORVENTA,'DD/MM/YY') BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append(empresaId == null || empresaId.equals("-1") ? "" : " AND original.EMPRESACORRIDA_ID= " + empresaId + " ");
sql.append(puntoVentasId == null || puntoVentasId.equals("-1") ? "" : " AND original.PUNTOVENTA_ID in(" + puntoVentasId + ") ");

13
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties
View File

@ -7,6 +7,8 @@ label.servico=Servi
label.dataViagem=Data Viagem
label.origem=Origem
label.destino=Destino
label.codOrigem=Cod.Origem
label.codDestino=Cod.Destino
label.poltrona=Poltrona
label.dataVenda=Data Venda
label.bilheteiro=Bilheteiro
@ -19,4 +21,15 @@ label.pedagio=Ped
label.coo=Coo
label.preImpresso=Pre Imp.
label.serieImpFiscal=Série
label.nomeEmpresa=Empresa
label.nomeAgencia=Agência
label.dataServico=Data Serviço
label.horaServico=Hora Serviço
label.horaTransacao=Hora Trans.
label.linha=Linha
label.ccf=ccf
label.ecf=ecf
label.siglaTipoPassagem=Sigl.Tip.Pass
label.tipoPassagem=Tp.Pass
label.valorTotal=Vlr.Tot
msg.noData=Não foi possivel obter dados com os parâmetros informados.

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

Binary file not shown.

74
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jrxml
View File

@ -1,8 +1,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="Relatorio Remarcação Passagens Transferência" pageWidth="2500" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="2500" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" uuid="6d46a2d2-555e-4b7f-944f-b25c672e5feb">
<property name="ireport.zoom" value="2.662000000000066"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="211"/>
<property name="ireport.zoom" value="3.5431220000000914"/>
<property name="ireport.x" value="6042"/>
<property name="ireport.y" value="404"/>
<parameter name="DATA_INICIAL" class="java.util.Date"/>
<parameter name="DATA_FINAL" class="java.util.Date"/>
<parameter name="codconvenio" class="java.lang.String"/>
@ -486,7 +486,7 @@
<textFieldExpression><![CDATA[$R{label.horaServico}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="1728" y="93" width="73" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="16d80320-b83d-4005-8e0c-e756430b9e00"/>
<reportElement mode="Transparent" x="1753" y="93" width="48" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="16d80320-b83d-4005-8e0c-e756430b9e00"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -494,7 +494,7 @@
<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="1801" y="93" width="73" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="030ca332-b36e-4e75-b0d8-2db9dab52f51"/>
<reportElement mode="Transparent" x="1826" y="93" width="48" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="030ca332-b36e-4e75-b0d8-2db9dab52f51"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -637,22 +637,6 @@
</textElement>
<textFieldExpression><![CDATA[$R{label.tpp}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="2454" y="93" width="22" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="f6dc2969-9537-40cb-9373-a2488fabe423"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.valorMulta}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="2476" y="93" width="24" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="cd9aa648-a70d-4582-b2a6-489b54e1ed2c"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.valorDiferenca}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="464" y="93" width="24" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8471eaf2-18d7-44c4-9825-950f797e4c54"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
@ -669,6 +653,22 @@
</textElement>
<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="1801" y="93" width="25" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="e491a859-8671-4b25-9254-5b6219e52d48"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Transparent" x="1728" y="93" width="25" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="9ab96ed7-453f-4b6c-8bdf-1952de438ae8"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.codOrigem}]]></textFieldExpression>
</textField>
</band>
</title>
<columnHeader>
@ -844,21 +844,21 @@
</textElement>
<textFieldExpression><![CDATA[$F{tipoPassagemRemarcado}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="959" y="0" width="31" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="46c0ecf4-aa5a-41fe-9d9e-966bf4aead34"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{valorPassagemRemarcado}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="990" y="0" width="31" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="e138cebd-8e9b-429a-b92f-244dcfdcb71a"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{percentualDescontoRemarcado}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="1021" y="0" width="35" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="21829d9d-0434-49f8-8dd2-ade3e4109d1b"/>
<textElement textAlignment="Center">
<font size="7"/>
@ -1019,42 +1019,42 @@
</textElement>
<textFieldExpression><![CDATA[$F{siglaTipoPassagemVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2191" y="0" width="40" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="39543877-830e-488b-867b-3eea6eef414f"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipoPassagemVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2231" y="0" width="27" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="6fcc0516-6371-430b-9f82-8cce9ec85539"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{valorPassagemVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2258" y="0" width="26" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="74d6ce93-2cb6-454d-9976-635b5b384d19"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{percentualDescontoVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2284" y="0" width="35" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="38c6dd96-e6ae-4764-8fe0-fc1df49d3115"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{valorTotalVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2319" y="0" width="33" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="19b95f00-009f-440f-943a-1e305ae3abef"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{tarifaVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2352" y="0" width="28" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="f8a5565a-a3ca-4135-a852-6eaf66bc2525"/>
<textElement textAlignment="Center">
<font size="7"/>
@ -1075,20 +1075,6 @@
</textElement>
<textFieldExpression><![CDATA[$F{tppVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2476" y="0" width="24" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="7f8770d1-1257-4fc3-a7f7-714dc3b70e7f"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{diferenca}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="2454" y="0" width="22" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="5bb391fe-01fa-448f-9659-efa968c4d771"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="1174" y="0" width="21" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="78937ff7-1c27-430d-9f19-7736b3f5acbc"/>
<textElement textAlignment="Center">

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

@ -82,8 +82,11 @@ public class RelatorioRemarcacaoPassagensTransferenciaController extends MyGener
parametros.put("DATA_INICIAL", dataInicio);
parametros.put("DATA_FINAL", dataFinal);
Empresa empresa =null;
if(cmbEmpresa.getSelectedItem() != null ){
empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue();
}
Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue();
lsNumPuntoVenta = new ArrayList(Arrays.asList(puntoVentaSelList.getData()));
if (lsNumPuntoVenta.size() > 0) {

1
web/gui/relatorios/filtroRelatorioRemarcacaoPassagensTransferencia.zul
View File

@ -65,7 +65,6 @@
<label
value="${c:l('relatorioRemarcacaoPassagensTransferenciaController.lbEmpresa.value')}" />
<combobox id="cmbEmpresa" buttonVisible="true"
constraint="no empty"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winFiltroRelatorioRemarcacaoPassagensTransferencia$composer.lsEmpresa}"
width="100%" />