From 8785fef8933937735fbd53524e9fa32327fca81a Mon Sep 17 00:00:00 2001 From: julio Date: Sun, 20 Aug 2017 16:13:35 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72741 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFolioRmd.java | 124 ++++++++++++++ .../RelatorioFolioRmd_es.properties | 2 + .../RelatorioFolioRmd_pt_BR.properties | 2 + .../templates/RelatorioFolioRmd.jasper | Bin 0 -> 25340 bytes .../templates/RelatorioFolioRmd.jrxml | 157 ++++++++++++++++++ .../templates/RelatorioImpressaoRmd.jasper | Bin 32702 -> 32617 bytes .../templates/RelatorioImpressaoRmd.jrxml | 50 +++--- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 33509 -> 33324 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 50 +++--- .../BusquedaImpressaoRMDController.java | 55 ++++-- web/WEB-INF/i3-label_es_MX.label | 7 +- web/WEB-INF/i3-label_pt_BR.label | 4 +- .../impressaofiscal/busquedaImpressaoRMD.zul | 29 +++- 13 files changed, 408 insertions(+), 72 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java new file mode 100644 index 000000000..673052d1b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -0,0 +1,124 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.FolioRMD; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioFolioRmd extends Relatorio { + + private static Logger log = Logger.getLogger(RelatorioFolioRmd.class); + List listdata = null; + private static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; + + public RelatorioFolioRmd(final Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + @Override + public void initDados() throws Exception { + + try { + Empresa empresa = (Empresa) parametros.get("empresa"); + Estado estado = (Estado) parametros.get("estado"); + Aidf aidf = (Aidf) parametros.get("aidf"); + + NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSqlRMDReporte()); + stmt.setInt("empresaId", empresa.getEmpresaId()); + stmt.setInt("estadoId", estado.getEstadoId()); + stmt.setLong("rmdId", aidf.getAidfId()); + + ResultSet rset = stmt.executeQuery(); + listdata = new ArrayList(); + while (rset.next()) { + FolioRMD item = new FolioRMD(); + + item.setFoliormd(rset.getString("foliormd")); + item.setStatus(rset.getString("status")); + item.setFechorfolio(rset.getString("fechorfolio")); + item.setEmpresa(rset.getString("empresa")); + item.setUf(rset.getString("uf")); + item.setEstado(rset.getString("estado")); + item.setDoc(rset.getString("doc")); + item.setTipo(rset.getString("tipo")); + item.setFechorfolioDate(DateUtil.getDateFromString(item.getFechorfolio(), DATE_FORMAT_FISCAL)); + + listdata.add(item); + } + + if (!getConexao().isClosed()) + getConexao().close(); + + } catch (SQLException e) { + log.error("", e); + } + } + + }); + + this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata)); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSqlRMDReporte() { + StringBuilder sql = new StringBuilder(); + sql.append("select foliormd as foliormd, "); + sql.append(" 'IMPRESSO' as status, "); + sql.append(" coalesce(r4.datamov, to_char(b.fechorventa, 'yyyymmdd')) as fechorfolio, "); + sql.append(" e.nombempresa as empresa, "); + sql.append(" eo.cveestado as uf, "); + sql.append(" eo.nombestado as estado, "); + sql.append(" ai.docfiscal as doc, "); + sql.append(" case when b.tipoventa_id <> 3 then 'ECF' else 'BPR' end as tipo "); + sql.append("from boleto b "); + sql.append(" left join fiscal_r4 r4 on r4.boleto_id = b.boleto_id "); + sql.append(" inner join aidf ai on b.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); + sql.append(" inner join marca m on b.marca_id = m.marca_id and ai.empresa_id = m.empresa_id "); + sql.append(" inner join empresa e on e.empresa_id = m.empresa_id "); + sql.append(" inner join parada po on po.parada_id = b.origen_id "); + sql.append(" inner join ciudad co on co.ciudad_id = po.ciudad_id and co.estado_id = ai.estado_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append("where ai.empresa_id = :empresaId and ai.aidf_id = :rmdId and ai.estado_id = :estadoId "); + sql.append("group by foliormd, "); + sql.append("coalesce( r4.datamov, to_char(b.fechorventa, 'yyyymmdd')), e.nombempresa, eo.cveestado,eo.nombestado, "); + sql.append("ai.docfiscal, case when b.tipoventa_id <> 3 then 'ECF' else 'BPR' end "); + sql.append(" "); + sql.append("union "); + sql.append(" "); + sql.append("select f.folio as foliormd, "); + sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'INATIVO' end as status, "); + sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, "); + sql.append(" e.nombempresa as empresa, "); + sql.append(" eo.cveestado as uf, "); + sql.append(" eo.nombestado as estado, "); + sql.append(" ai.docfiscal as doc, "); + sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo "); + sql.append("from folio_consumo_rmd f "); + sql.append("inner join aidf ai on f.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); + sql.append("inner join empresa e on e.empresa_id = f.empresa_id "); + sql.append("join estado eo on eo.estado_id = f.estado_id "); + sql.append("where f.empresa_id = :empresaId and f.rmd_id = :rmdId and f.estado_id = :estadoId "); + sql.append(" "); + sql.append("order by foliormd "); + + return sql.toString(); + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_es.properties new file mode 100644 index 000000000..57daa3700 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_es.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_pt_BR.properties new file mode 100644 index 000000000..57daa3700 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFolioRmd_pt_BR.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper new file mode 100644 index 0000000000000000000000000000000000000000..589cfc3ddcaad696e6676215bef0a2dc197c8b9b GIT binary patch literal 25340 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 f^cUP + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index b9da9b92dbe24e3ce2337a4c475c39a5954717a2..97c12ca69fef3335912bcfa05185fbe5bfbc2f3f 100644 GIT binary patch delta 7783 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index 0f70b1414..ad0334b28 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -1,7 +1,7 @@ - + @@ -43,49 +43,49 @@ - + - + - + - + - + - + - + @@ -98,72 +98,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -174,35 +174,35 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index 076db7211f4eab035e02582f9cffc5e4d3db999d..15bdd168c202d3d9ba270b5e5864d15edfdc8782 100644 GIT binary patch delta 4783 zcmai&ZERCj7{~AFUSVTw>lkIM?K--_7;G0d2t)>qQrSz_maPm2W20jg3+-CgZa@&G z1Ye?=fG0})0+|Fq_!0??@dFXFs4*Ha7?pq$2r3a1vp^h}7(;xXb57fP*Sk=XC(k|q z|2fa^oO^n9%H5ZAA0E@4PbO7NkZjm0rj(EuU2vC%nSW#rGcg@y+GzQLugzJPz< zkdKZno)e4Azd%3N%vKCi0AhlBzT5r&0v4H&L!z;J=V zh!kOjJq2cbDok9F=l*4TSgDgW*A6#EX5oRD{wDzb{3|Lm_Q2*q`*mkmr}p z*fc(qq4DFP`h6XnY#b&T;&^f|2Afh3L)lM|=a(kfNCbg@&TQlQi?` zhWg@7uxfld&xQj2H~=*ALjB%&@tCgu^9-_w=4V&L{#ac|$S6HorH4(C_tcI~ip$Kx zagBYzRgHb16jb|w3v3?<54`e-avzZ6Y#WFpjjTDC;5ojgn%*+bATw!WY|eB#r200R0WN3s>?{l!Z#XJ zT-Bgb3MwitFe>3mq54Kig>SK9LwADg?G4rRv1K+nOvl$$cHTrf7Ord1aaDs(DX8eU z!03c0h3>k7F7~QzZSw2*%f{}lj7WG=h#o13@QM+ew0}n6 z2)*Sfr$27elNt2hrgC`BX_}WkgOD&BS;h3s&f*-#L5$EnO2_7z=-#H1Qel|Y(%9j) zxA(T&-L7_zFw(K6dKm3mlLbCx>4^UurIZ5~rGtS&U1nr7xD6=#A#N(E6ac1PbT2ltNzBvH#RUG3Tgt_VHFQ~4DV=OFKb6IvLb+zOtoXOQ zeibU+ROj4Py;qXAxj^Ogc>(1=x>hRdx`0F?z&hzKkFPm|94ZY+nT08fsC zPCs?ym=E2qD#W$999!C)+>Md{2^Gwem^=+`US)zQ!zvU+hJwAS`v7iF-7tNj&X||z zhE4C#iOn)pGPjoyCL7dpf;*Q!DA!xk@lqf*J1>=urC95<6~1d4_RT zs^@b5O!V{1MZ#{Nr#iYxCjF_~N)4Wq|{E7SyKdgVVmC&EJ>`m})>s0gJKwcKE zF<$~T|KO15`rU!5r>UwByk5j)wu9IcCzD}-}m-VieS1zkt84LEv LRxN>^Kf2<747nUL delta 5195 zcma)=e{5UT702Im>p0YHn#N8VyH4DsPMS0<3F!|SO4C%_$w^PU0!adhAPo_p@++_xaa9w*C7jwyUe$cDF=-AWbdLlCn;eg zdBNXV{#0rS`gxkX>+f>D3`J(nk@Um~x2{G_wo zPJX_5hxZ($o=S=AP_y*X1@y8t{HL-orWGv4dGgGbX6F?kXXYZ1FXOWXxls_vjeH}S?LCIJV$SL7 z)J*=>v`C?*nnkF;0~9m2*zn;q1{Gc(qaYv}1p$!@Cd6A-h**act!+(H(tm6fNk0Wr zX6`Uje6}Dp3IeH75Jnu7g-a zcOx8k2NGd*%H>vYusU;}wOv~6ZKCUTy_!6xrqww;lt`u3i~<4V7IL-IR|B$hE}1%E zlH4HOqp2pL0)$oR#Ia(SO;A;tRI&?c^$8`KQq#(uq8Ih`ps&tqDMMW))Y&s?T2qUT z8=$f*xsXuP2G?4sUAL&j^>k2AW|dhj&YLJ*n=yr1C8GwF_}oG~-;PQyXjiVpwfO}- zo6nloBaSwg$P~j=fv-c$sL8Bus74@tAxn9R&Nu}6Y`%()B&PEtJ+9>eXeD-ZOv!hi zdvp6A?D7JsEN{x4@2-;NSID&q7hO8nA2<^DCCmyluUf1YRM~3bMOZCZv{)@%Fs+tX zORSbt1(c2l+sJ1VW#p5dt%2VF5;IpUkWghvya-5Gv_Rs53F%4+q-L_O=aB-|Z+klA z*T}~`ErH(y6f}$UmogD0L9Er3n)|>6fXi4 z7A>H-V1l|?66(JF69uSW?9W5NX(2On%K{2j2E~g2g+&V}E|{P!j~;e9Uh17LKy7>o zR@G{L%~&G0dzu4qM99qCvA{!>;qfBiVbKDQ3no0v^Co8x?k&E2hYw6I+wP$-XzXSf zuA*Q(!Ue&2$OwXQAI}RSXf5sBUTSu8kA~in>3;q7U?b`8bIBeu-PcH;m-{?r9$BWh zCi436S_h+})$jB@NL{|_^Ez5+#H`dp?sNFa$9-$j!{#9a{q@vO>-ST?pY_*Of*;Jq zITnIC{I1_GH2$)`in=<(b-cENg&YifeAvIVZY(qs9gEFGqQTxsC{J=a?4!+I3vZ#l z{V^Qa%bhE^b1Xa*nwg3Y=lvON)d^)$XDCZa3!*yF9)I7wa-pYaw(>VE_G(g2>p2FkZ*uzPYPUub9~ z(i;nn^L!YeyT}*R<8gH^tLaIh59c_H#KCYVav-$&WN~QDzeqoy z{x3lGK15Rp1P9|fly(TMlC(vjLmz)2g4wgO}@8kraxMsKiBuydG` zN<2k!dt^6l;~n+M&yn`7y4r$Ho7gTx6X{X2fT}zzf z({c^*O$W$}<1fh{@+(7EOt@_>+hBu6W3k(Fm908S*uk(F3c?O%6oeg&3v~S0upXs_ z)O<7T-0~;@mHl88z91j8_(*8tu|gU*CRU^Y8@Y`ci&FuGPc72GW)^7}1tASCP_`9m zSRNTX34A3mjlUhz3TYgASV*JC_7$YT%w3Fcy!&(2A`RApe15<+A@~U37#e^K;Iy}I z`%E!%YlmkG+@Bm4xR+P0q1)Ts3nGf^iiIf-#G{AZ9^V(JBWHwfQd=R$p92 zUrefnG!j!Q((pnW%xp9dKMG!pG_V;8LK;RvNP`RJG&X*}G;*gOIVEpujYw7OGeOM; z^+ZaGs|V;u1LWFD+((+c$$k6j=0*RbJ6TR`B@`cr$+soR_>p1Hj_%z%@9)~RYy173 q-7`BocXe&=c1W@;-Am@}K2kC3$o=z(BjC1h%aXtBt|v9m)_en)6RDB_ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index 78dce2de6..f7e4a6312 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -43,49 +43,49 @@ - + - + - + - + - + - + - + @@ -98,27 +98,27 @@ - + - + - + - + - + - + @@ -126,49 +126,49 @@ - + - + - + - + - + - + - + @@ -179,35 +179,35 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java index 736f4d821..604569238 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java @@ -28,6 +28,7 @@ import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFolioRmd; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioImpressaoRmd; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioImpressaoRmdBpr; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -75,6 +76,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private MyComboboxEstandar cmbAidf; private Radio radBPR; + private Radio radECF; private Checkbox tipoLayout; @Override @@ -118,9 +120,12 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { } public void onSelect$cmbAidf(Event ev) { + + Empresa empresa = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); + Estado estado = cmbEstado.getSelectedItem() == null ? null : (Estado) cmbEstado.getSelectedItem().getValue(); Aidf aidf = cmbAidf.getSelectedItem() == null ? null : (Aidf) cmbAidf.getSelectedItem().getValue(); if (aidf != null) { - String ultimoRmdUtilizado = aidfService.buscaUltimoAidfRMDUtilizado(aidf.getAidfId()); + String ultimoRmdUtilizado = aidfService.buscaUltimoAidfRMDUtilizado(aidf.getAidfId(), empresa.getEmpresaId(), estado.getEstadoId()); if (StringUtils.isNotBlank(ultimoRmdUtilizado)) { folioInicial.setValue(ultimoRmdUtilizado); } else { @@ -130,7 +135,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { } @SuppressWarnings({ "rawtypes", "unchecked" }) - private void executarImpressao(boolean isView, boolean isExecutarRmd, boolean isCancelarRmd) throws InterruptedException { + private void executarImpressao(boolean isView, boolean isExecutarRmd, boolean isCancelarRmd, boolean isInativarRmd) throws InterruptedException { Empresa empresa = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); Estado estado = cmbEstado.getSelectedItem() == null ? null : (Estado) cmbEstado.getSelectedItem().getValue(); @@ -158,17 +163,20 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { } List list = null; - if (radBPR.isChecked()) { - list = fiscalService.getRegistroImpressaoRMDTipoBPR(datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); - } else { - list = fiscalService.getRegistroImpressaoRMDTipoECF(datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd, folio); + if (!isCancelarRmd && !isInativarRmd && radBPR.isChecked()) { + list = fiscalService.getRegistroImpressaoRMDTipoBPR(datInicial.getValue(), datFinal.getValue(), + empresa, estado, rmd, folio); + } else if (!isCancelarRmd && !isInativarRmd && radECF.isChecked()) { + list = fiscalService.getRegistroImpressaoRMDTipoECF(datInicial.getValue(), datFinal.getValue(), + empresa, estado, rmd, folio); } if (isExecutarRmd) fiscalService.gravarRMDBoleto(list, aidf, folio); - if (isCancelarRmd) { - fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, folio); + if (isCancelarRmd || isInativarRmd) { + fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, folio, + isCancelarRmd, isInativarRmd, radECF.isChecked(), radBPR.isChecked()); Messagebox.show( Labels.getLabel("busquedaImpressaoRMDController.cancel.msg"), @@ -211,16 +219,41 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { } } + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void onClick$btnReporte(Event ev) throws SQLException, Exception { + + Empresa empresa = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); + Estado estado = cmbEstado.getSelectedItem() == null ? null : (Estado) cmbEstado.getSelectedItem().getValue(); + Aidf aidf = cmbAidf.getSelectedItem() == null ? null : (Aidf) cmbAidf.getSelectedItem().getValue(); + + Map parametros = new HashMap(); + parametros.put("empresa", empresa); + parametros.put("estado", estado); + parametros.put("aidf", aidf); + + Relatorio relatorio = new RelatorioFolioRmd(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL); + } + public void onClick$btnView(Event ev) throws InterruptedException { - executarImpressao(true, false, false); + executarImpressao(true, false, false, false); } public void onClick$btnExecutar(Event ev) throws InterruptedException { - executarImpressao(false, true, false); + executarImpressao(false, true, false, false); } public void onClick$btnCancelar(Event ev) throws InterruptedException { - executarImpressao(false, false, true); + executarImpressao(false, false, true, false); + } + + public void onClick$btnInativar(Event ev) throws InterruptedException { + executarImpressao(false, false, false, true); } public List getLsEmpresa() { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 3b49739f5..f55a813bf 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6496,7 +6496,12 @@ busquedaImportacionFiscalController.btnExe.label = Ejecutar Importación #busquedaImportacionFiscalController.btnExeNaoFiscal.label = Importación No Fiscal #busquedaImportacionFiscalController.btnExeImportacionReducaoZ.label = Importación Fiscal Reducción Z -busquedaExportacaoFiscalController.btnExe.label = Executar Exportação +busquedaExportacaoFiscalController.btnView.label = Visualização +busquedaExportacaoFiscalController.btnExe.label = Executar Exportação +busquedaExportacaoFiscalController.btnCancel.label = Cancelar +busquedaExportacaoFiscalController.btnInativar.label = Inativar +busquedaImpressaoRMDController.cancel.msg = O Cancelamento/Inativação do folio foi realizado com sucesso. +busquedaExportacaoFiscalController.btnReporte.label = Relatório de Formulários #corridaServiceImpl corridaServiceImpl.geracaoCorrida.dataMenorQueAtual=El periodo informado es invalido diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 20712c464..9ba55c6ca 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6758,8 +6758,10 @@ busquedaImportacionFiscalController.btnExe.label = Executar Importação busquedaExportacaoFiscalController.btnView.label = Visualização busquedaExportacaoFiscalController.btnExe.label = Executar Exportação -busquedaExportacaoFiscalController.btnCancel.label = Cancelar/Inativar +busquedaExportacaoFiscalController.btnCancel.label = Cancelar +busquedaExportacaoFiscalController.btnInativar.label = Inativar busquedaImpressaoRMDController.cancel.msg = O Cancelamento/Inativação do folio foi realizado com sucesso. +busquedaExportacaoFiscalController.btnReporte.label = Relatório de Formulários editarRelgerencialEmpresaController.MSG.suscribirOK=Relatorio Gerencial gravado com sucesso! editarRelgerencialEmpresaController.window.title=Impressão Fiscal :: Editar Relatorio Gerencial diff --git a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul index 499ef8308..c419b9864 100644 --- a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul +++ b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul @@ -60,20 +60,24 @@ - - + - @@ -82,12 +86,19 @@