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

fixes bug#13207 

dev:julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@88833 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-01-14 17:35:48 +00:00
parent 98d2a5c9f5
commit 94066ca934
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
View File

@ -64,7 +64,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" bpe.chbpe, "); sql.append(" bpe.chbpe, ");
sql.append(" coalesce(chbpe_substituicao, ' ') as chbpe_sub, "); sql.append(" coalesce(chbpe_substituicao, ' ') as chbpe_sub, ");
sql.append(" to_char(c.feccreacion, 'yyyymmdd') as dhrecbto, "); sql.append(" to_char(c.feccreacion, 'yyyymmdd') as dhrecbto, ");
sql.append(" coalesce(to_char(c.fechorventa, 'yyyymmdd'), to_char(to_timestamp_tz(bpe.dhvalidade, 'YYYY-MM-DD" + "\"T\"" + "HH24:MI:SSTZH:TZM'), 'yyyymmdd')) as dh_emisao, "); sql.append(" to_char(c.feccreacion, 'yyyymmdd') as dh_emisao, ");
sql.append(" coalesce(bpe.tiposubstituicao, '0') as tp_bpe, "); sql.append(" coalesce(bpe.tiposubstituicao, '0') as tp_bpe, ");
sql.append(" bpe.retorno_id as retorno, "); sql.append(" bpe.retorno_id as retorno, ");
sql.append(" bpe.nprot, "); sql.append(" bpe.nprot, ");

2
src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java
View File

@ -24,6 +24,8 @@ public final class DateUtil {
public static String ddMMaaHHmm = "dd/MM/yyyy hh:mm"; public static String ddMMaaHHmm = "dd/MM/yyyy hh:mm";
public static String ddMMaa = "dd/MM/yyyy"; public static String ddMMaa = "dd/MM/yyyy";
public static String formatGMT = "yyyy-MM-dd'T'HH:mm:ss";
public static String formatExp = "yyyymmdd";
/** /**
* No need for an instance * No need for an instance

31
src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil; import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil;
@ -59,9 +60,7 @@ public class ExportacaoBPEVo {
} }
public boolean isBpeCancelado(ExportacaoBPEBase registro) { public boolean isBpeCancelado(ExportacaoBPEBase registro) {
return (registro.getCodstatus() == null ? false : (registro.getCodstatus().equals(StatusBpe.EVENTOS))) return (registro.getCodstatus() == null ? false : (registro.getCodstatus().equals(StatusBpe.EVENTOS)));
// && (registro.getTipoevento() == null ? true : (registro.getTipoevento().equals(EventosBpe.CANCELAMENTO)))
;
} }
public void gerarListas(ExportacaoBPEBase registro) { public void gerarListas(ExportacaoBPEBase registro) {
@ -86,6 +85,8 @@ public class ExportacaoBPEVo {
String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0"); String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0");
String numBpe = StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getNBP() : registro.getNumBpe(); String numBpe = StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getNBP() : registro.getNumBpe();
String dhEmisao = StringUtils.isBlank(xml) ? registro.getDhEmisao()
: DateUtil.changeFormatStringDate(tbpe.getInfBPe().getIde().getDhEmi(), DateUtil.formatGMT, DateUtil.formatExp);
if (isCancelamento) { if (isCancelamento) {
@ -148,7 +149,7 @@ public class ExportacaoBPEVo {
String tpBpe = StringUtils.isBlank(xml) ? "" : (StringUtils.isBlank(tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()) ? "1" : "2"); String tpBpe = StringUtils.isBlank(xml) ? "" : (StringUtils.isBlank(tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()) ? "1" : "2");
ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(),
numBpe, registro.getDhrecbto(), tpDoc, registro.getDhEmisao(), valorBruto, numBpe, registro.getDhrecbto(), tpDoc, dhEmisao, valorBruto,
desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino, desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino,
cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil, cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil,
indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis); indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis);
@ -157,10 +158,6 @@ public class ExportacaoBPEVo {
String cfop = isInterMunicipal ? "5357" : "6357"; String cfop = isInterMunicipal ? "5357" : "6357";
// String cstb = StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getImp().getICMS().getICMS45().getCST() :
// isInterMunicipal ? (registro.getRedBaseCalcEstadual() == null || registro.getRedBaseCalcEstadual().equals(ZERO)) ? "00" : "20"
// : (registro.getRedBaseCalcMunicipal() == null || registro.getRedBaseCalcMunicipal().equals(ZERO)) ? "00" : "20";
String csosnb = ""; String csosnb = "";
if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL)) { if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL)) {
csosnb = CrtBpe.SIMPLES_NACIONAL.toString(); csosnb = CrtBpe.SIMPLES_NACIONAL.toString();
@ -181,24 +178,6 @@ public class ExportacaoBPEVo {
baseCalculoICMS, aliquotaICMS, icms, isentas, outras); baseCalculoICMS, aliquotaICMS, icms, isentas, outras);
registro.getListaRegistroDPE().add(tipoDPE); registro.getListaRegistroDPE().add(tipoDPE);
// BpeBuscaCamposXml buscaCamposXml = BpeBuscaCamposXml.getInstance(registro.getXml());
// String[] atpComp = buscaCamposXml.buscaCamposXmlArray("tpComp");
// String[] avComp = buscaCamposXml.buscaCamposXmlArray("vComp");
//
// for (int i = 0; i < avComp.length; i++) {
// String tpComp = atpComp[i];
// String vComp = avComp[i];
// BigDecimal valor = new BigDecimal(vComp == null ? "0.0" : vComp);
//
// ExportacaoBPETipoOBE tipoOBE = new ExportacaoBPETipoOBE(tpComp, valor);
// registro.getListaRegistroOBE().add(tipoOBE);
// }
// BigDecimal valorBP = new BigDecimal(vBP == null ? "0.0" : vBP);
// ExportacaoBPETipoPRC tipoPRC = new ExportacaoBPETipoPRC(registro.getEstadoOrigem(), registro.getMunicipioOrigem(), valorBP, baseCalculoICMS, icms);
// registro.getListaRegistroPRC().add(tipoPRC);
} }
this.getListaRegistroBaseBPE().add(registro); this.getListaRegistroBaseBPE().add(registro);