bug #8977
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68912 d1611594-4594-4d17-8e1d-87c2c4800839master
julio
parent
509b51f956
commit
f9feeab65c
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
|||
<?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="RelatorioImpressaoRMD" pageWidth="816" pageHeight="816" orientation="Landscape" columnWidth="776" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d3d490c9-33e7-4eeb-97cc-1fa9be0f10d4">
|
||||
<property name="ireport.zoom" value="1.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="RelatorioImpressaoRMD" printOrder="Horizontal" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d3d490c9-33e7-4eeb-97cc-1fa9be0f10d4">
|
||||
<property name="ireport.zoom" value="1.6105100000000008"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<field name="empresa" class="java.lang.String"/>
|
||||
|
|
@ -19,6 +19,7 @@
|
|||
<field name="isentos" class="java.math.BigDecimal"/>
|
||||
<field name="outros" class="java.math.BigDecimal"/>
|
||||
<field name="obs" class="java.lang.String"/>
|
||||
<field name="folio" class="java.lang.String"/>
|
||||
<variable name="sum_valorContabil" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{valorContabil}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -75,14 +76,14 @@
|
|||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="676" y="21" width="100" height="20" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/>
|
||||
<reportElement x="676" y="21" width="126" height="20" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{rmd}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{rmd} ]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="621" y="81" width="155" height="20" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/>
|
||||
<reportElement x="621" y="81" width="181" height="20" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
|
|
@ -91,80 +92,80 @@
|
|||
</band>
|
||||
</title>
|
||||
<pageHeader>
|
||||
<band height="26" splitType="Stretch"/>
|
||||
<band height="13" splitType="Stretch"/>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
<band splitType="Stretch"/>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
<band height="22" splitType="Stretch">
|
||||
<band height="16" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement x="0" y="0" width="41" height="20" uuid="d9a99502-1f1e-4f22-930f-66bd8be3c7f0"/>
|
||||
<reportElement x="0" y="0" width="41" height="15" uuid="d9a99502-1f1e-4f22-930f-66bd8be3c7f0"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="41" y="0" width="140" height="20" uuid="b8964ae5-2660-4461-926e-8b7734cbe07f"/>
|
||||
<reportElement x="41" y="0" width="150" height="15" uuid="b8964ae5-2660-4461-926e-8b7734cbe07f"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="181" y="0" width="57" height="20" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/>
|
||||
<reportElement x="191" y="0" width="70" height="15" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{folio} != null ? Integer.parseInt($F{folio}) + ($V{PAGE_NUMBER} - 1) : $F{numero}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="238" y="0" width="70" height="20" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/>
|
||||
<reportElement x="261" y="0" width="70" height="15" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="308" y="0" width="75" height="20" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/>
|
||||
<reportElement x="331" y="0" width="75" height="15" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="383" y="0" width="38" height="20" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/>
|
||||
<reportElement x="406" y="0" width="38" height="15" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="421" y="0" width="76" height="20" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/>
|
||||
<reportElement x="444" y="0" width="76" height="15" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="565" y="1" width="69" height="20" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/>
|
||||
<reportElement x="588" y="1" width="69" height="15" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="634" y="1" width="142" height="20" uuid="7c171d60-9889-4845-89d5-f656e34b1c37"/>
|
||||
<reportElement x="657" y="1" width="145" height="15" uuid="7c171d60-9889-4845-89d5-f656e34b1c37"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="497" y="0" width="68" height="20" uuid="60865331-9449-4435-8b4a-664b747a90b3"/>
|
||||
<reportElement x="520" y="0" width="68" height="15" uuid="60865331-9449-4435-8b4a-664b747a90b3"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -174,39 +175,39 @@
|
|||
<band splitType="Stretch"/>
|
||||
</columnFooter>
|
||||
<pageFooter>
|
||||
<band height="94" splitType="Stretch">
|
||||
<band height="17" splitType="Stretch">
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="238" y="0" width="70" height="20" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/>
|
||||
<reportElement x="261" y="0" width="70" height="15" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="308" y="0" width="75" height="20" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/>
|
||||
<reportElement x="331" y="0" width="75" height="15" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="421" y="0" width="76" height="20" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/>
|
||||
<reportElement x="444" y="0" width="76" height="15" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="497" y="0" width="68" height="20" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/>
|
||||
<reportElement x="520" y="0" width="68" height="15" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="565" y="0" width="69" height="20" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/>
|
||||
<reportElement x="588" y="0" width="69" height="15" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{sum_outros}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import com.rjconsultores.ventaboletos.service.FiscalService;
|
|||
import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
|
||||
|
||||
@Controller("busquedaImpressaoRMDController")
|
||||
@Scope("prototype")
|
||||
|
|
@ -65,6 +66,8 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
|
|||
private Datebox datInicial;
|
||||
private Datebox datFinal;
|
||||
|
||||
private MyTextbox folioInicial;
|
||||
|
||||
private MyComboboxEstandar cmbEmpresa;
|
||||
private MyComboboxEstandar cmbEstado;
|
||||
private MyComboboxEstandar cmbAidf;
|
||||
|
|
@ -100,10 +103,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
|
|||
public void render(Comboitem item, Object data) {
|
||||
if (data instanceof Aidf) {
|
||||
Aidf aidf = (Aidf) data;
|
||||
String label = (aidf.getAidfId() == null ? "" : aidf.getAidfId().toString() + " - ") +
|
||||
aidf.getSerie() +
|
||||
(aidf.getSubserie() == null ? "" : "-" + aidf.getSubserie());
|
||||
item.setLabel(label);
|
||||
item.setLabel(aidf.getDocfiscal());
|
||||
} else {
|
||||
item.setLabel(Objects.toString(data));
|
||||
}
|
||||
|
|
@ -128,12 +128,11 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
|
|||
String rmd = null;
|
||||
if (aidf != null) {
|
||||
|
||||
rmd = aidf.getSerie() + (aidf.getSubserie() == null ? "" : "-" + aidf.getSubserie());
|
||||
rmd = aidf.getDocfiscal();
|
||||
respAidf = Messagebox.show(
|
||||
Labels.getLabel("busquedaImpressaoRMDController.MSG.gravarRMDPergunta"),
|
||||
Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),
|
||||
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
|
||||
|
||||
// closeWindow();
|
||||
|
||||
} else {
|
||||
|
|
@ -142,15 +141,25 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
|
|||
Messagebox.OK, Messagebox.INFORMATION);
|
||||
}
|
||||
|
||||
|
||||
String folio = folioInicial.getValue();
|
||||
if (folio == null) {
|
||||
respAidf = Messagebox.show(
|
||||
Labels.getLabel("busquedaImpressaoRMDController.select.RMD"),
|
||||
Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),
|
||||
Messagebox.OK, Messagebox.INFORMATION);
|
||||
return;
|
||||
}
|
||||
|
||||
List<ImpressaoRMD> list = null;
|
||||
if (radBPR.isChecked()) {
|
||||
|
||||
list = fiscalService.getRegistroImpressaoRMDTipoDVB(dataSourceRead.getConnection(),
|
||||
datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd);
|
||||
datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio);
|
||||
} else {
|
||||
|
||||
list = fiscalService.getRegistroImpressaoRMDTipoECF(dataSourceRead.getConnection(),
|
||||
datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd);
|
||||
datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio);
|
||||
}
|
||||
|
||||
if (respAidf == Messagebox.YES) {
|
||||
|
|
|
|||
|
|
@ -530,6 +530,8 @@ busquedaImpressaoRMDController.labelRadio.radBPR = BPR
|
|||
busquedaImpressaoRMDController.labelRadio.radECF = ECF
|
||||
busquedaImpressaoRMDController.select.RMD = É necessario selecionar um RMD
|
||||
busquedaImpressaoRMDController.MSG.gravarRMDPergunta = Deseja gravar nos registros de vendas, o vínculo com o numero de RMD selecionado?
|
||||
busquedaImpressaoRMDController.labelfolio.RMD = Nº Controle de Formulário:
|
||||
busquedaImpressaoRMDController.labelfolio.RMD.fim = Até
|
||||
|
||||
#Devolução de Bilhetes
|
||||
relatorioDevolucaoBilhetesAgenciaController.window.title = Relatório de Devolução de Bilhetes
|
||||
|
|
|
|||
|
|
@ -70,6 +70,17 @@
|
|||
label="${c:l('busquedaImpressaoRMDController.labelRadio.radECF')}" />
|
||||
</radiogroup>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<label
|
||||
value="${c:l('busquedaImpressaoRMDController.labelfolio.RMD.fim')}" />
|
||||
<textbox id="folioInicial" width="90%"
|
||||
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
|
||||
<label value="${c:l('busquedaImpressaoRMDController.labelfolio.RMD')}" />
|
||||
<textbox id="folioFinal" width="90%"
|
||||
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
|
||||
</row>
|
||||
|
||||
</rows>
|
||||
</grid>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue