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

bug #6369 

bug #6376

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45365 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2015-06-24 20:00:47 +00:00
parent fe81247fe5
commit 61d5aa2e27
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java
View File

@ -146,13 +146,11 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
.append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") .append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ")
.append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ")
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ")
.append("LEFT JOIN ENDERECO_APANHE EA ON EA.ENDERECOAPANHE_ID = VP.ENDERECOAPANHE_ID ") .append("LEFT JOIN ENDERECO_APANHE EA ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID AND EA.ACTIVO = 1 ")
.append("LEFT JOIN CLIENTE_PACOTE CP ON CP.CLIENTEPACOTE_ID = VP.CLIENTEPACOTE_ID ") .append("LEFT JOIN CLIENTE_PACOTE CP ON CP.CLIENTEPACOTE_ID = VP.CLIENTEPACOTE_ID ")
.append("LEFT JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ") .append("LEFT JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ")
.append("WHERE P.ACTIVO = 1 ") .append("WHERE P.ACTIVO = 1 ")
.append("AND B.ACTIVO = 1 ") .append("AND (B.BOLETO_ID IS NULL OR (B.ACTIVO = 1 AND B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) ");
.append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND B.MOTIVOCANCELACION_ID IS NULL ");;
if(empresaId != null) { if(empresaId != null) {
sQuery.append("AND P.EMPRESA_ID = :empresaId "); sQuery.append("AND P.EMPRESA_ID = :empresaId ");

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

@ -198,7 +198,7 @@ public class RelatorioVendasPacotesResumido extends Relatorio {
.append("WHERE P.ACTIVO = 1 ") .append("WHERE P.ACTIVO = 1 ")
.append("AND B.ACTIVO = 1 ") .append("AND B.ACTIVO = 1 ")
.append("AND B.INDSTATUSBOLETO = 'V' ") .append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND B.MOTIVOCANCELACION_ID IS NULL ");; .append("AND B.MOTIVOCANCELACION_ID IS NULL ");
if(empresaId != null) { if(empresaId != null) {
sQuery.append("AND P.EMPRESA_ID = :empresaId "); sQuery.append("AND P.EMPRESA_ID = :empresaId ");

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

Binary file not shown.

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

Binary file not shown.

22
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml
View File

@ -1,6 +1,6 @@
<?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="RelatorioVendasPacotesDetalhadoItem" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc"> <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="RelatorioVendasPacotesDetalhadoItem" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
<property name="ireport.zoom" value="0.75"/> <property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<field name="numoperacion" class="java.lang.String"/> <field name="numoperacion" class="java.lang.String"/>
@ -36,70 +36,70 @@
</pageHeader> </pageHeader>
<columnHeader> <columnHeader>
<band height="21" splitType="Stretch"> <band height="21" splitType="Stretch">
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="0" y="1" width="27" height="20" uuid="479d9abe-f3fa-4903-922f-74be005b310c"/> <reportElement x="0" y="1" width="27" height="20" uuid="479d9abe-f3fa-4903-922f-74be005b310c"/>
<textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.qtde}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.qtde}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="27" y="1" width="69" height="20" uuid="2fcabefe-3c9b-46f4-9885-e37a5ffbed9a"/> <reportElement x="27" y="1" width="69" height="20" uuid="2fcabefe-3c9b-46f4-9885-e37a5ffbed9a"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.localizador}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.localizador}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="96" y="1" width="57" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/> <reportElement x="96" y="1" width="57" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="153" y="1" width="78" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/> <reportElement x="153" y="1" width="78" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="231" y="1" width="72" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/> <reportElement x="231" y="1" width="72" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.apanhe}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.apanhe}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="303" y="1" width="54" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/> <reportElement x="303" y="1" width="54" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.dtPacote}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.dtPacote}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="357" y="1" width="54" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/> <reportElement x="357" y="1" width="54" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.dtVenda}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.dtVenda}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="411" y="1" width="44" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/> <reportElement x="411" y="1" width="44" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.subTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.subTotal}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="455" y="1" width="48" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/> <reportElement x="455" y="1" width="48" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.desconto}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.desconto}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="503" y="1" width="52" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/> <reportElement x="503" y="1" width="52" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font size="8"/> <font size="8"/>

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

Binary file not shown.