0022084: Adicionar informação de protocolo na consulta de bpe ADM

bug#22084
dev:Valdir
qua:Júnia

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106207 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java

@@ -63,6 +63,7 @@ public class RelatorioBPe extends Relatorio {
 					dataResult.put("dtviagem", rset.getString("dtviagem"));
 					dataResult.put("vlbpe", rset.getBigDecimal("vlbpe"));
 					dataResult.put("chbpe", rset.getString("chbpe"));
+					dataResult.put("protocolo", rset.getString("protocolo"));
 					dataResult.put("num_bpe", rset.getString("num_bpe"));
 					dataResult.put("numserie_bpe", rset.getString("numserie_bpe"));
 					dataResult.put("status", rset.getString("status"));
@@ -124,6 +125,7 @@ public class RelatorioBPe extends Relatorio {
 		sql.append("  COALESCE(bol.IMPORTEOUTROS,0) as valoroutros, ");
 		
 		sql.append("  bpe.CHBPE,  ");
+		sql.append("  bpe.nprot as protocolo,  ");
 		sql.append("  bol.NUM_BPE as num_bpe, ");
 		sql.append("  COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, ");
 		

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties

@@ -24,6 +24,7 @@ label.valorpedagio=Ped
 label.valorseguro=Seguro
 label.valoroutros=Outros
 label.chaveAcesso=Chave Acesso
+label.protocolo=Protocolo
 label.numBPe=Núm. BPe
 label.serie=Série
 label.status=Status

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties

@@ -25,6 +25,7 @@ label.valorpedagio=Ped
 label.valorseguro=Seguro
 label.valoroutros=Outros
 label.chaveAcesso=Chave Acesso
+label.protocolo=Protocolo
 label.numBPe=Núm. BPe
 label.serie=Série
 label.status=Status

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml

@@ -1,7 +1,7 @@
 <?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="RelatorioBPe" pageWidth="1350" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="1310" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f">
 	<property name="ireport.zoom" value="1.0980750000000004"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="21"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -34,6 +34,7 @@
 	<field name="valorpedagio" class="java.math.BigDecimal"/>
 	<field name="valorseguro" class="java.math.BigDecimal"/>
 	<field name="valoroutros" class="java.math.BigDecimal"/>
+	<field name="protocolo" class="java.lang.String"/>
 	<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{valortarifa}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
@@ -59,7 +60,7 @@
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
 	<title>
-		<band height="79" splitType="Stretch">
+		<band height="93" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
 				<reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="1021" height="41" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
@@ -123,7 +124,7 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="18">
+		<band height="19">
 			<textField>
 				<reportElement uuid="2d8bc8b7-05a7-493a-ac4f-52f7f39cfa8b" x="0" y="0" width="65" height="15"/>
 				<textElement>
@@ -160,7 +161,7 @@
 				<textFieldExpression><![CDATA[$R{label.valorBPe}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8" x="792" y="0" width="252" height="15"/>
+				<reportElement uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8" x="792" y="0" width="167" height="15"/>
 				<box leftPadding="5"/>
 				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
@@ -244,6 +245,14 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.obs}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="6cb48779-f12f-4422-bdcc-faba0f0bc6d2" x="959" y="0" width="85" height="15"/>
+				<box leftPadding="5"/>
+				<textElement>
+					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.protocolo}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
@@ -291,7 +300,7 @@
 				<textFieldExpression><![CDATA[$F{vlbpe}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true" hyperlinkType="Reference" hyperlinkTarget="Blank">
-				<reportElement uuid="6db62c93-f853-4396-89ce-afcc6d510d91" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="792" y="0" width="252" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="6db62c93-f853-4396-89ce-afcc6d510d91" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="792" y="0" width="167" height="15" isPrintWhenDetailOverflows="true"/>
 				<box leftPadding="5"/>
 				<textElement>
 					<font size="9"/>
@@ -369,6 +378,15 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true" hyperlinkType="Reference" hyperlinkTarget="Blank">
+				<reportElement uuid="4e216b77-b1b9-404a-8a0a-8a8323bcaf3d" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="959" y="0" width="85" height="15" isPrintWhenDetailOverflows="true"/>
+				<box leftPadding="5"/>
+				<textElement>
+					<font size="9"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{protocolo}]]></textFieldExpression>
+				<hyperlinkReferenceExpression><![CDATA[$F{qrcode}]]></hyperlinkReferenceExpression>
+			</textField>
 		</band>
 	</detail>
 	<lastPageFooter>