ALTERAÇÕES E CORREÇÕES NO RELATORIO DE TRECHO VENDIDO

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29139 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2013-07-16 15:18:43 +00:00
parent 9da034a47b
commit 5df73afd67
3 changed files with 28 additions and 29 deletions

View File

@ -113,28 +113,28 @@ ORDER BY
<textFieldExpression><![CDATA[$R{msg.a}]]></textFieldExpression>
</textField>
<line>
<reportElement uuid="2722767b-42a9-43f4-8530-a3843acd50f5" x="0" y="20" width="551" height="1"/>
<reportElement uuid="2722767b-42a9-43f4-8530-a3843acd50f5" x="0" y="20" width="555" height="1"/>
</line>
<line>
<reportElement uuid="86c9cbad-4985-468c-94b3-df769598cbfc" x="0" y="0" width="551" height="1"/>
<reportElement uuid="86c9cbad-4985-468c-94b3-df769598cbfc" x="0" y="0" width="555" height="1"/>
</line>
<textField evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<reportElement uuid="179fee07-d42f-496e-b230-845f93d8c8f0" x="499" y="2" width="52" height="18"/>
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<reportElement uuid="179fee07-d42f-496e-b230-845f93d8c8f0" x="493" y="1" width="62" height="18"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$V{SOMA_TRECHO}]]></textFieldExpression>
</textField>
<textField evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<reportElement uuid="a322f9ad-954c-465c-9b40-ac3cab4dc79b" x="344" y="2" width="18" height="18"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$V{VENDA_1}]]></textFieldExpression>
</textField>
<textField evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<reportElement uuid="5d465455-d176-491c-85d6-32c9253ee154" x="400" y="0" width="15" height="20"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$V{LIVRE_1}]]></textFieldExpression>
</textField>
<textField evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<reportElement uuid="01f963e8-3bec-4337-b9a5-b268e1a542e1" x="454" y="2" width="16" height="18"/>
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
<reportElement uuid="01f963e8-3bec-4337-b9a5-b268e1a542e1" x="450" y="1" width="27" height="18"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$V{LIVRE_1}.add( $V{VENDA_1} )]]></textFieldExpression>
</textField>
@ -195,22 +195,22 @@ ORDER BY
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="55501b9a-fd9a-463d-ae0d-cb8c15a6139f" x="534" y="20" width="17" height="20"/>
<reportElement uuid="55501b9a-fd9a-463d-ae0d-cb8c15a6139f" x="538" y="20" width="17" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="8d99edae-4a10-4091-bb1a-bc5fc4ef1b78" x="495" y="20" width="39" height="20"/>
<reportElement uuid="8d99edae-4a10-4091-bb1a-bc5fc4ef1b78" x="499" y="20" width="39" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="0f57ef57-d7b2-414c-84e5-73b8936474e3" x="411" y="0" width="55" height="20"/>
<reportElement uuid="0f57ef57-d7b2-414c-84e5-73b8936474e3" x="415" y="0" width="55" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement uuid="54dce584-fcac-4ea6-8c53-5fffbd0fc369" x="466" y="0" width="85" height="20"/>
<reportElement uuid="54dce584-fcac-4ea6-8c53-5fffbd0fc369" x="470" y="0" width="85" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{NOW}]]></textFieldExpression>
</textField>
@ -239,7 +239,7 @@ ORDER BY
<textFieldExpression><![CDATA[$R{group.total}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="48b8257c-bf68-4b1e-9b6b-b51fecd0d6d0" x="499" y="0" width="52" height="20"/>
<reportElement uuid="48b8257c-bf68-4b1e-9b6b-b51fecd0d6d0" x="503" y="0" width="52" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{group.valor.total}]]></textFieldExpression>
</textField>
@ -260,23 +260,23 @@ ORDER BY
<textElement/>
<textFieldExpression><![CDATA[$F{FECHORSALIDA}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b27e9c29-cf89-41db-a94b-799c969ef1e1" x="499" y="1" width="52" height="20"/>
<textField isStretchWithOverflow="true">
<reportElement uuid="b27e9c29-cf89-41db-a94b-799c969ef1e1" x="493" y="0" width="62" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{SOMA}]]></textFieldExpression>
</textField>
<textField>
<textField isStretchWithOverflow="true">
<reportElement uuid="2b9b18b3-59d0-443c-9171-b5f43febb878" x="344" y="0" width="18" height="20"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{VENDA}]]></textFieldExpression>
</textField>
<textField>
<textField isStretchWithOverflow="true">
<reportElement uuid="5834225d-51b1-4929-b692-c9b61910587e" x="400" y="1" width="15" height="19"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{LIVRE}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="e9915cd8-dd51-4e7b-8115-200c0222e843" x="454" y="1" width="16" height="19"/>
<textField isStretchWithOverflow="true">
<reportElement uuid="e9915cd8-dd51-4e7b-8115-200c0222e843" x="450" y="1" width="27" height="19"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{VENDA}.add( $F{LIVRE} )]]></textFieldExpression>
</textField>

View File

@ -75,26 +75,25 @@ public class RelatorioTrechoVendidoController extends MyGenericForwardComposer {
try {
puntuVentaId = Integer.parseInt(lsNumPuntoVenta.iterator().next());
} catch (Exception e) {
log.error(e.getStackTrace());
log.error(e.getMessage());
}
parametros.put("PUNTOVENTA_ID", puntuVentaId);
}
String empresa = "";
try {
empresa = cmbEmpresa.getValue();
Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue();
if (!e.equals(null)) {
empresa = e.getNombempresa();
}
} catch (NullPointerException e) {
empresa = "";
} catch (Exception e) {
log.error(e.getStackTrace());
log.error(e.getMessage());
}
parametros.put("NOMBEMPRESA", empresa);
String empresaSearch = "";
if (!empresa.equals(null)) {
empresaSearch = "%" + empresa + "%";
} else {
empresaSearch = "%%";
}
String empresaSearch = "%" + empresa + "%";
parametros.put("NOMBEMPRESA_SEARCH", empresaSearch);
Date now = new Date();