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

fixes bug #7375 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55176 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-04-21 16:16:40 +00:00
parent dacd208263
commit d78c81ef86
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
View File

@ -148,11 +148,13 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} }
try { try {
File arquivo = fiscalService.importacionFiscalECFManual(datInicial.getValue(), datFinal.getValue(), empresa); File arquivoTxt = fiscalService.importacionFiscalECFManual(datInicial.getValue(), datFinal.getValue(), empresa);
InputStream is = new FileInputStream(arquivo); File arquivoXls = null;
Filedownload.save(is, "application/notepad", "fiscal_manual_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmm") + ".txt"); if(chkArquivoXls.isChecked()) {
arquivo.delete(); arquivoXls = fiscalService.importacionFiscalECFManualXls(empresa, arquivoTxt);
} catch (FileNotFoundException e) { }
downloadArquivo(arquivoTxt, arquivoXls);
} catch (Exception e) {
log.error("", e); log.error("", e);
} }
} }
@ -171,13 +173,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
if(chkArquivoXls.isChecked()) { if(chkArquivoXls.isChecked()) {
arquivoXls = fiscalService.importacionFiscalECFCanceladosXls(empresa, arquivoTxt); arquivoXls = fiscalService.importacionFiscalECFCanceladosXls(empresa, arquivoTxt);
} }
downloadArquivo(arquivoTxt, arquivoXls); downloadArquivo(arquivoTxt, arquivoXls);
/*File arquivo = fiscalService.importacionFiscalECFCancelados(datInicial.getValue(), datFinal.getValue(), empresa);
InputStream is = new FileInputStream(arquivo);
Filedownload.save(is, "application/notepad", "fiscal_cancel_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmm") + ".txt");
arquivo.delete();*/
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
} }
@ -197,7 +193,6 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
if(chkArquivoXls.isChecked()) { if(chkArquivoXls.isChecked()) {
arquivoXls = fiscalService.importacionFiscalECFXls(empresa, arquivoTxt); arquivoXls = fiscalService.importacionFiscalECFXls(empresa, arquivoTxt);
} }
downloadArquivo(arquivoTxt, arquivoXls); downloadArquivo(arquivoTxt, arquivoXls);
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
@ -253,11 +248,17 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} }
try { try {
File arquivo = fiscalService.importacionFiscalReducaoZ(datInicial.getValue(), datFinal.getValue(), empresa); File arquivoTxt = fiscalService.importacionFiscalReducaoZ(datInicial.getValue(), datFinal.getValue(), empresa);
File arquivoXls = null;
if(chkArquivoXls.isChecked()) {
arquivoXls = fiscalService.importacionFiscalReducaoZXls(empresa, arquivoTxt);
}
downloadArquivo(arquivoTxt, arquivoXls);
/*File arquivo = fiscalService.importacionFiscalReducaoZ(datInicial.getValue(), datFinal.getValue(), empresa);
InputStream is = new FileInputStream(arquivo); InputStream is = new FileInputStream(arquivo);
Filedownload.save(is, "application/notepad", "fiscal_reducao_z" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmm") + ".txt"); Filedownload.save(is, "application/notepad", "fiscal_reducao_z" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmm") + ".txt");
arquivo.delete(); arquivo.delete();*/
} catch (FileNotFoundException e) { } catch (Exception e) {
log.error("", e); log.error("", e);
} }

1
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalManual.java
View File

@ -24,6 +24,7 @@ public class ItemMenuImportacionFiscalManual extends DefaultItemMenuSistema {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
HashMap<String, Boolean> map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.MANUAL, (HashMap<String, Boolean>) getArgs()); HashMap<String, Boolean> map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.MANUAL, (HashMap<String, Boolean>) getArgs());
map.put("ExibirTipoGeracaoArquivo", true);
PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul",
Labels.getLabel("busquedaImportacionFiscalManualController.window.title"), map, desktop); Labels.getLabel("busquedaImportacionFiscalManualController.window.title"), map, desktop);

1
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImportacionFiscalReducaoZ.java
View File

@ -24,6 +24,7 @@ public class ItemMenuImportacionFiscalReducaoZ extends DefaultItemMenuSistema {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
HashMap<String, Boolean> map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.REDUCAO_Z, (HashMap<String, Boolean>) getArgs()); HashMap<String, Boolean> map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.REDUCAO_Z, (HashMap<String, Boolean>) getArgs());
map.put("ExibirTipoGeracaoArquivo", true);
PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul", PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul",
Labels.getLabel("busquedaImportacionFiscalReducaoZController.window.title"), map, desktop); Labels.getLabel("busquedaImportacionFiscalReducaoZController.window.title"), map, desktop);