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

fixes bug #6443 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45731 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2015-07-06 19:01:37 +00:00
parent 3a98fadbeb
commit 65ad0799f7
10 changed files with 138 additions and 94 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

@ -14,6 +14,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe;
import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesDetalhadoBean;
@ -108,6 +109,7 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
relatorioVendasPacotesDetalhadoItemBean.setSubTotal(rset.getBigDecimal("subtotal"));
relatorioVendasPacotesDetalhadoItemBean.setTotal(rset.getBigDecimal("total"));
relatorioVendasPacotesDetalhadoItemBean.setVendapacoteId(rset.getLong("vendapacote_id"));
relatorioVendasPacotesDetalhadoItemBean.setSituacaoVendaPacote(SituacaoVendaPacote.getSituacaoVendaPacote(rset.getInt("situacao")));
if(relatorioVendasPacotesBean.getRelatorioVendasPacotesDetalhadoItemBeans() == null) {
relatorioVendasPacotesBean.setRelatorioVendasPacotesDetalhadoItemBeans(new ArrayList<RelatorioVendasPacotesDetalhadoBean.RelatorioVendasPacotesDetalhadoItemBean>());
@ -141,7 +143,7 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
protected String getSqlPacotes() {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDETARIFAS ")
sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO, COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDETARIFAS ")
.append("FROM VENDA_PACOTE VP ")
.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 ")
@ -168,7 +170,7 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio {
sQuery.append("AND VP.DATAPACOTE <= :fecFinal ");
}
sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL ")
sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO ")
.append("ORDER BY P.NOMPACOTE, VP.DATAPACOTE, VP.DATAVENDA ");
return sQuery.toString();

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_es.properties
View File

@ -4,8 +4,9 @@ label.localizador=Localizador
label.usuario=Usuário
label.cliente=Cliente
label.apanhe=Apanhe
label.dtPacote=DT Pacote
label.dtVenda=DT Venda
label.dtPacote=Data Pacote
label.dtVenda=Data Venda
label.subTotal=SubTotal
label.desconto=Desconto
label.total=Total
label.situacao=Situação

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhadoItem_pt_BR.properties
View File

@ -4,8 +4,9 @@ label.localizador=Localizador
label.usuario=Usuário
label.cliente=Cliente
label.apanhe=Apanhe
label.dtPacote=DT Pacote
label.dtVenda=DT Venda
label.dtPacote=Data Pacote
label.dtVenda=Data Venda
label.subTotal=SubTotal
label.desconto=Desconto
label.total=Total
label.situacao=Situação

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

Binary file not shown.

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

@ -1,5 +1,5 @@
<?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="RelatorioVendasPacotesDetalhado" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
<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="RelatorioVendasPacotesDetalhado" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
@ -21,35 +21,35 @@
<title>
<band height="84" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="301" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
<reportElement x="0" y="0" width="637" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
<textElement markup="none">
<font size="14" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="391" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/>
<reportElement x="637" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="20" width="301" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/>
<reportElement x="0" y="20" width="637" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/>
<textElement>
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.empresa} + " " + $P{empresa}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="40" width="301" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/>
<reportElement x="0" y="40" width="637" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/>
<textElement>
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="60" width="301" height="20" uuid="66f394e2-0568-447d-9f46-c358a05628c5"/>
<reportElement x="0" y="60" width="637" height="20" uuid="66f394e2-0568-447d-9f46-c358a05628c5"/>
<textElement>
<font isBold="true"/>
</textElement>
@ -60,10 +60,10 @@
<pageHeader>
<band height="21" splitType="Stretch">
<line>
<reportElement x="0" y="19" width="555" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/>
<reportElement x="0" y="19" width="802" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/>
</line>
<textField>
<reportElement x="391" y="0" width="164" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/>
<reportElement x="637" y="0" width="164" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/>
<textElement textAlignment="Right">
<font isBold="true"/>
</textElement>
@ -77,14 +77,14 @@
<detail>
<band height="76" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement positionType="Float" x="0" y="1" width="555" height="20" isPrintWhenDetailOverflows="true" uuid="752263b1-e76b-41c5-a728-c17367094dab"/>
<reportElement positionType="Float" x="0" y="1" width="801" height="20" isPrintWhenDetailOverflows="true" uuid="752263b1-e76b-41c5-a728-c17367094dab"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.pacote} + " " + $F{nompacote}]]></textFieldExpression>
</textField>
<subreport isUsingCache="true">
<reportElement positionType="Float" x="0" y="27" width="555" height="38" uuid="75fad27f-9275-4535-844a-316ac8365073"/>
<reportElement positionType="Float" x="0" y="27" width="801" height="38" uuid="75fad27f-9275-4535-844a-316ac8365073"/>
<subreportParameter name="REPORT_RESOURCE_BUNDLE">
<subreportParameterExpression><![CDATA[$P{SUBREPORT_RESOURCE_BUNDLE}]]></subreportParameterExpression>
</subreportParameter>
@ -92,7 +92,7 @@
<subreportExpression><![CDATA[$P{subreporte}]]></subreportExpression>
</subreport>
<line>
<reportElement positionType="Float" x="0" y="68" width="555" height="1" uuid="29b89cc0-dcf8-4bdd-a667-7341d74330ea"/>
<reportElement positionType="Float" x="0" y="68" width="802" height="1" uuid="29b89cc0-dcf8-4bdd-a667-7341d74330ea"/>
</line>
</band>
</detail>

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

Binary file not shown.

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

@ -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="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="1.0"/>
<property name="ireport.x" value="0"/>
<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="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="95"/>
<property name="ireport.y" value="0"/>
<field name="numoperacion" class="java.lang.String"/>
<field name="nombusuario" class="java.lang.String"/>
@ -13,6 +13,7 @@
<field name="subTotal" class="java.math.BigDecimal"/>
<field name="desconto" class="java.math.BigDecimal"/>
<field name="total" class="java.math.BigDecimal"/>
<field name="descSituacaoVendaPacote" class="java.lang.String"/>
<variable name="vTotalSubTotal" class="java.math.BigDecimal" resetType="Column" calculation="Sum">
<variableExpression><![CDATA[$F{subTotal}]]></variableExpression>
</variable>
@ -39,75 +40,75 @@
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="1" y="4" width="25" height="20" uuid="479d9abe-f3fa-4903-922f-74be005b310c"/>
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.qtde}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="27" y="4" width="68" height="20" uuid="2fcabefe-3c9b-46f4-9885-e37a5ffbed9a"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.localizador}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="96" y="4" width="56" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/>
<reportElement x="96" y="4" width="100" height="20" uuid="333e8016-8fb3-4652-b7f9-1ff10a0b024e"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="153" y="4" width="77" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/>
<reportElement x="199" y="4" width="142" height="20" uuid="eb1aa96a-0759-41b0-bf15-7e4b1b0dc21b"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="231" y="4" width="71" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/>
<reportElement x="342" y="4" width="101" height="20" uuid="0cf46847-6160-450a-ad67-6b33fac921cc"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.apanhe}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="303" y="4" width="53" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/>
<reportElement x="444" y="4" width="54" height="20" uuid="dc54766b-3e8a-4683-84a0-b50cf8275681"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.dtPacote}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="357" y="4" width="53" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/>
<reportElement x="499" y="4" width="54" height="20" uuid="521c1958-56a8-4bc9-b304-5a8e7ad8941c"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.dtVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="411" y="4" width="43" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/>
<reportElement x="555" y="4" width="60" height="20" uuid="eab1b822-2fe4-4d62-87ec-c07e1320950a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.subTotal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="455" y="4" width="47" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/>
<reportElement x="616" y="4" width="60" height="20" uuid="ea742d2b-6cd4-4fd8-aba8-1cd9d23e802a"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.desconto}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="503" y="4" width="51" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/>
<reportElement x="678" y="4" width="60" height="20" uuid="199f8b66-2e55-45ee-95e1-f44d55a7a716"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="Float" x="0" y="27" width="556" height="1" forecolor="#CCCCCC" uuid="d89ccc0c-cffc-4489-b000-9b36ecddea41"/>
<reportElement positionType="Float" x="0" y="27" width="802" height="1" forecolor="#CCCCCC" uuid="d89ccc0c-cffc-4489-b000-9b36ecddea41"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="26" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="26b055fb-fb3d-43b7-af65-71d2b436adb6"/>
@ -116,34 +117,44 @@
<reportElement stretchType="RelativeToTallestObject" x="95" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="8bb893f0-9d4c-4ec6-ae79-1bee3a1ff931"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="152" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="e9a787d5-7227-4c4c-b79c-e9f7bc750384"/>
<reportElement stretchType="RelativeToTallestObject" x="197" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="e9a787d5-7227-4c4c-b79c-e9f7bc750384"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="230" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="fe005b59-9df8-40ca-9ac0-4ea262c3187d"/>
<reportElement stretchType="RelativeToTallestObject" x="341" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="fe005b59-9df8-40ca-9ac0-4ea262c3187d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="302" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="04e8c11f-b6d8-437e-975e-047f43d584db"/>
<reportElement stretchType="RelativeToTallestObject" x="443" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="04e8c11f-b6d8-437e-975e-047f43d584db"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="356" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="93354399-3c94-4a7f-8710-284846ad3630"/>
<reportElement stretchType="RelativeToTallestObject" x="498" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="93354399-3c94-4a7f-8710-284846ad3630"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="410" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="4639047b-3f66-4ce0-8aa1-df467cf58853"/>
<reportElement stretchType="RelativeToTallestObject" x="554" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="4639047b-3f66-4ce0-8aa1-df467cf58853"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="454" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2ea4dfc3-87b0-4a4b-8b3a-f985805cb96a"/>
<reportElement stretchType="RelativeToTallestObject" x="615" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2ea4dfc3-87b0-4a4b-8b3a-f985805cb96a"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="502" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2225826d-acb0-4eb7-99ee-4208efc05b2c"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="555" height="1" forecolor="#CCCCCC" uuid="51960e3f-1a55-458f-9e20-a6623a217fe3"/>
<reportElement stretchType="RelativeToTallestObject" x="677" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="2225826d-acb0-4eb7-99ee-4208efc05b2c"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="890d0f88-7254-46d6-b5c6-e81c835568f8"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="555" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="955f2ac4-afba-49e3-8e10-f53775ee1a26"/>
<reportElement stretchType="RelativeToTallestObject" x="739" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="955f2ac4-afba-49e3-8e10-f53775ee1a26"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="740" y="4" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="f573134c-9443-45b0-8749-ff939fadfd1c"/>
<textElement verticalAlignment="Top" markup="none">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.situacao}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="801" y="3" width="1" height="24" forecolor="#CCCCCC" uuid="978c071d-d369-4184-be2c-a44354215385"/>
</line>
<line>
<reportElement positionType="Float" x="0" y="2" width="802" height="1" forecolor="#CCCCCC" uuid="1361f507-ce8d-4a97-921a-5b5c23b40b24"/>
</line>
</band>
</columnHeader>
@ -152,75 +163,75 @@
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1" y="1" width="25" height="20" isPrintWhenDetailOverflows="true" uuid="d2d86d45-734c-43d7-b85c-fec792408d05"/>
<textElement textAlignment="Center" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{qtdeTarifas}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="27" y="1" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="351af802-2856-4c9e-918f-06bafc5ef390"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="56" height="20" isPrintWhenDetailOverflows="true" uuid="6964a19b-c6bb-48ed-a061-eed217b33b9b"/>
<reportElement stretchType="RelativeToTallestObject" x="96" y="1" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="6964a19b-c6bb-48ed-a061-eed217b33b9b"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombusuario}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="153" y="1" width="77" height="20" isPrintWhenDetailOverflows="true" uuid="c9813245-6a43-4011-bb01-c6e45c0d6d36"/>
<reportElement stretchType="RelativeToTallestObject" x="199" y="1" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="c9813245-6a43-4011-bb01-c6e45c0d6d36"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{razaoSocialCliente}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="231" y="1" width="71" height="20" isPrintWhenDetailOverflows="true" uuid="f5632358-41df-437d-821f-fa878a857d5c"/>
<reportElement stretchType="RelativeToTallestObject" x="342" y="1" width="101" height="20" isPrintWhenDetailOverflows="true" uuid="f5632358-41df-437d-821f-fa878a857d5c"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{descLocalEnderecoApanhe}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="303" y="1" width="53" height="20" isPrintWhenDetailOverflows="true" uuid="ecb1f133-dfd6-46a1-9d3d-3dc84b199c39"/>
<reportElement stretchType="RelativeToTallestObject" x="444" y="1" width="54" height="20" isPrintWhenDetailOverflows="true" uuid="ecb1f133-dfd6-46a1-9d3d-3dc84b199c39"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{datapacote}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="357" y="1" width="53" height="20" isPrintWhenDetailOverflows="true" uuid="78842239-ee2e-45ac-aaa2-ec561feea088"/>
<reportElement stretchType="RelativeToTallestObject" x="499" y="1" width="54" height="20" isPrintWhenDetailOverflows="true" uuid="78842239-ee2e-45ac-aaa2-ec561feea088"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{datavenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="411" y="1" width="43" height="20" isPrintWhenDetailOverflows="true" uuid="0be25395-a20f-4e4f-95da-163c13698708"/>
<reportElement stretchType="RelativeToTallestObject" x="555" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="0be25395-a20f-4e4f-95da-163c13698708"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{subTotal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="455" y="1" width="47" height="20" isPrintWhenDetailOverflows="true" uuid="43d71d65-26a3-49dc-b94e-30525147a1d0"/>
<reportElement stretchType="RelativeToTallestObject" x="616" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="43d71d65-26a3-49dc-b94e-30525147a1d0"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{desconto}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="503" y="1" width="51" height="20" isPrintWhenDetailOverflows="true" uuid="55433141-fa8f-42b5-b4f7-2a504bec5ceb"/>
<reportElement stretchType="RelativeToTallestObject" x="678" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="55433141-fa8f-42b5-b4f7-2a504bec5ceb"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="Float" x="0" y="23" width="555" height="1" forecolor="#CCCCCC" uuid="d5ce962b-9449-4a10-b4aa-20745c16689b"/>
<reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="d5ce962b-9449-4a10-b4aa-20745c16689b"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="26" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="aff678ee-a68b-41c6-b11b-1c3820e380dd"/>
@ -229,31 +240,41 @@
<reportElement stretchType="RelativeToTallestObject" x="95" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="eeba804b-44db-4524-92c1-fda9cd003469"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="152" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a02ac9fd-63e6-47f5-8d17-95edd06c8037"/>
<reportElement stretchType="RelativeToTallestObject" x="197" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a02ac9fd-63e6-47f5-8d17-95edd06c8037"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="230" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="3d6f981e-6f53-4945-bbff-f31f7b580507"/>
<reportElement stretchType="RelativeToTallestObject" x="341" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="3d6f981e-6f53-4945-bbff-f31f7b580507"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="302" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="6a406064-40dd-45b2-9d84-f0efda11bcf5"/>
<reportElement stretchType="RelativeToTallestObject" x="443" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="6a406064-40dd-45b2-9d84-f0efda11bcf5"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="356" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="e9d0ffbf-807b-4fd1-8368-831d35f1d67d"/>
<reportElement stretchType="RelativeToTallestObject" x="498" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="e9d0ffbf-807b-4fd1-8368-831d35f1d67d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="410" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a7929915-7c3f-4a5d-b148-0d24c69f6914"/>
<reportElement stretchType="RelativeToTallestObject" x="554" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a7929915-7c3f-4a5d-b148-0d24c69f6914"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="454" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="9bfbdfb0-892a-464c-bf6c-a1566fab0b1e"/>
<reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="9bfbdfb0-892a-464c-bf6c-a1566fab0b1e"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="502" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0aaf6982-7014-447b-bb4f-51aa08f0e11e"/>
<reportElement stretchType="RelativeToTallestObject" x="677" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0aaf6982-7014-447b-bb4f-51aa08f0e11e"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="110f4b1c-f29c-4a96-890a-2776ed939d53"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="555" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="f8d781df-2513-4c15-a7ea-49043bef03d0"/>
<reportElement stretchType="RelativeToTallestObject" x="739" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="f8d781df-2513-4c15-a7ea-49043bef03d0"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="740" y="1" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="9fbcbcf4-72a6-4248-9fc6-f5b746775193"/>
<textElement verticalAlignment="Top">
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{descSituacaoVendaPacote}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="16e1bf28-b7fc-4709-b985-4f72e0d5548d"/>
</line>
</band>
</detail>
@ -263,30 +284,30 @@
<pageFooter>
<band height="24" splitType="Stretch">
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="411" y="2" width="42" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/>
<reportElement x="555" y="2" width="60" height="20" uuid="c143a4c0-043f-4742-911d-b543c971e26d"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalSubTotal}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="455" y="2" width="46" height="20" uuid="533968db-d01a-48e9-a273-f4388c10bc0c"/>
<reportElement x="616" y="2" width="60" height="20" uuid="533968db-d01a-48e9-a273-f4388c10bc0c"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalDesconto}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="503" y="2" width="51" height="20" uuid="7d9be2b0-855e-442e-b96c-24d0b8ab47dd"/>
<reportElement x="678" y="2" width="60" height="20" uuid="7d9be2b0-855e-442e-b96c-24d0b8ab47dd"/>
<textElement textAlignment="Right" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalTotal}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="1" y="2" width="25" height="20" uuid="c44ae1ed-6f37-4a3c-aaad-19b89fc86abb"/>
<textElement textAlignment="Center" verticalAlignment="Top">
<font fontName="SansSerif" size="6"/>
<font fontName="SansSerif" size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalQtdeTarifa}]]></textFieldExpression>
</textField>
@ -294,22 +315,25 @@
<reportElement stretchType="RelativeToTallestObject" x="26" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="0fc29162-092d-4b9a-b386-97f77097b2f2"/>
</line>
<line>
<reportElement positionType="Float" x="0" y="23" width="555" height="1" forecolor="#CCCCCC" uuid="bc27bd15-2e9c-4fd5-b207-4abb5b0a5b5f"/>
<reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="bc27bd15-2e9c-4fd5-b207-4abb5b0a5b5f"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="502" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a6ff630b-8eae-4312-9b46-0048fcfe1d4d"/>
<reportElement stretchType="RelativeToTallestObject" x="677" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="a6ff630b-8eae-4312-9b46-0048fcfe1d4d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="454" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="c1817cb0-8447-461e-8982-571c2ed5330b"/>
<reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="c1817cb0-8447-461e-8982-571c2ed5330b"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="410" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="265e716b-196b-4a4e-a6b1-1b8ee2094e77"/>
<reportElement stretchType="RelativeToTallestObject" x="554" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="265e716b-196b-4a4e-a6b1-1b8ee2094e77"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="13158cfa-c640-4827-93c4-622f008576a5"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="555" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="8a596ce5-8b1d-4d7b-836e-05343728e5d6"/>
<reportElement stretchType="RelativeToTallestObject" x="739" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="8a596ce5-8b1d-4d7b-836e-05343728e5d6"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="801" y="0" width="1" height="24" forecolor="#CCCCCC" uuid="ef5e295d-c708-4979-a8ef-d6f57e394f47"/>
</line>
</band>
</pageFooter>

16
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java
View File

@ -4,9 +4,12 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import oracle.net.aso.s;
import org.apache.commons.lang.StringUtils;
import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe;
import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote;
public class RelatorioVendasPacotesDetalhadoBean {
@ -77,6 +80,7 @@ public class RelatorioVendasPacotesDetalhadoBean {
private BigDecimal total;
private String nombusuario;
private String razaoSocialCliente;
private SituacaoVendaPacote situacaoVendaPacote;
public Long getVendapacoteId() {
return vendapacoteId;
@ -178,6 +182,10 @@ public class RelatorioVendasPacotesDetalhadoBean {
return StringUtils.isNotBlank(deschotel) ? deschotel : localEnderecoApanhe != null ? localEnderecoApanhe.toString() : "";
}
public String getDescSituacaoVendaPacote() {
return situacaoVendaPacote != null ? situacaoVendaPacote.toString() : "";
}
@Override
public int hashCode() {
final int prime = 31;
@ -203,6 +211,14 @@ public class RelatorioVendasPacotesDetalhadoBean {
return true;
}
public SituacaoVendaPacote getSituacaoVendaPacote() {
return situacaoVendaPacote;
}
public void setSituacaoVendaPacote(SituacaoVendaPacote situacaoVendaPacote) {
this.situacaoVendaPacote = situacaoVendaPacote;
}
}
}

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
View File

@ -82,7 +82,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
rd3.setChecked(true);
}
if (formaPago.getFormapagoId() <= 11 || (formaPago.getFormapagoId() >= 96 && formaPago.getFormapagoId() <= 99)) {
if (formaPago.getFormapagoId() <= 11 || (formaPago.getFormapagoId() >= 94 && formaPago.getFormapagoId() <= 99)) {
btnApagar.setVisible(Boolean.FALSE);
btnSalvar.setVisible(Boolean.FALSE);
txtNome.setDisabled(Boolean.TRUE);

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

@ -249,8 +249,8 @@ indexController.mniRelatorioDemandas.label = Relatório de Demandas
indexController.mniRelatorioReceitaServico.label = Relatório de Receita por Serviço
indexController.mniPrecoApanhe.label = Preço Apanhe
indexController.mniRelatorioVendasPacotesResumido.label = Vendas de Pacotes - Resumido
indexController.mniRelatorioVendasPacotesDetalhado.label = Ventas de Pacotes - Detalhado
indexController.mniRelatorioVendasPacotesBoletos.label = Ventas de Pacotes - Boletos
indexController.mniRelatorioVendasPacotesDetalhado.label = Vendas de Pacotes - Detalhado
indexController.mniRelatorioVendasPacotesBoletos.label = Vendas de Pacotes - Boletos
indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal
indexController.mnSubMenuRelatorioImpressaoFiscal.label=Relatório Impressão Fiscal