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

fixes bug#9023 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68787 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.calixto 2017-05-12 16:14:48 +00:00
parent f23f261b7f
commit ca9d74a4d4
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
View File

@ -182,7 +182,8 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
.addScalar("tipoPago", IntegerType.INSTANCE) .addScalar("tipoPago", IntegerType.INSTANCE)
.addScalar("indEncargoVenta", BooleanType.INSTANCE) .addScalar("indEncargoVenta", BooleanType.INSTANCE)
.addScalar("descconvenio", StringType.INSTANCE) .addScalar("descconvenio", StringType.INSTANCE)
.addScalar("cveconvenio", StringType.INSTANCE); .addScalar("cveconvenio", StringType.INSTANCE)
.addScalar("descsecretaria", StringType.INSTANCE);
sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class));
@ -212,6 +213,7 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
pagamentoVO.setMoeda("R$"); pagamentoVO.setMoeda("R$");
pagamentoVO.setValor(cd.getVlrFormaPago()); pagamentoVO.setValor(cd.getVlrFormaPago());
pagamentoVO.setIdentificacaoEmpresa(cd.getCvesecretaria()); pagamentoVO.setIdentificacaoEmpresa(cd.getCvesecretaria());
pagamentoVO.setRazaoSocial(cd.getDescsecretaria());
if(cd.getNotacreditovendapacoteId() != null) { if(cd.getNotacreditovendapacoteId() != null) {
NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO();

3
src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
View File

@ -951,7 +951,8 @@ public class SQLBuilderOracle implements SQLBuilder {
sb.append(" fp.tipo_pago as \"tipoPago\", "); sb.append(" fp.tipo_pago as \"tipoPago\", ");
sb.append(" NVL(c.INDENCARGOVENTA,0) as \"indEncargoVenta\", "); sb.append(" NVL(c.INDENCARGOVENTA,0) as \"indEncargoVenta\", ");
sb.append(" con.cveconvenio as \"cveconvenio\", "); sb.append(" con.cveconvenio as \"cveconvenio\", ");
sb.append(" con.descconvenio as \"descconvenio\" "); sb.append(" con.descconvenio as \"descconvenio\", ");
sb.append(" sec.descsecretaria as \"descsecretaria\" ");
sb.append(" from "); sb.append(" from ");
sb.append(" caja c "); sb.append(" caja c ");
sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida "); sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida ");

8
src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java
View File

@ -76,6 +76,7 @@ public class CajaDetalleVO {
private String numoperacionOcd; private String numoperacionOcd;
private String operadoracartao; private String operadoracartao;
private String cvesecretaria; private String cvesecretaria;
private String descsecretaria;
private Boolean indEncargoVenta; private Boolean indEncargoVenta;
private String descconvenio; private String descconvenio;
@ -502,5 +503,12 @@ public class CajaDetalleVO {
public void setCveconvenio(String cveconvenio) { public void setCveconvenio(String cveconvenio) {
this.cveconvenio = cveconvenio; this.cveconvenio = cveconvenio;
} }
@XmlTransient
public String getDescsecretaria() {
return descsecretaria;
}
public void setDescsecretaria(String descsecretaria) {
this.descsecretaria = descsecretaria;
}
} }

11
src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java
View File

@ -14,7 +14,7 @@ import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO;
import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO;
@XmlRootElement(name = "pagamento") @XmlRootElement(name = "pagamento")
@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa", "dadosBancarios"}) @XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa", "razaoSocial", "dadosBancarios"})
public class PagamentoVO { public class PagamentoVO {
private String formapagamento; private String formapagamento;
@ -24,6 +24,7 @@ public class PagamentoVO {
private Integer formapagoId; private Integer formapagoId;
private NotaCreditoVendaPacoteVO notacredito; private NotaCreditoVendaPacoteVO notacredito;
private String identificacaoEmpresa; private String identificacaoEmpresa;
private String razaoSocial;
private TipoFormapago tipoFormapago; private TipoFormapago tipoFormapago;
private List<DadosBancarioVO> dadosBancarios; private List<DadosBancarioVO> dadosBancarios;
@ -103,4 +104,12 @@ public class PagamentoVO {
public void setDadosBancarios(List<DadosBancarioVO> dadosBancarios) { public void setDadosBancarios(List<DadosBancarioVO> dadosBancarios) {
this.dadosBancarios = dadosBancarios; this.dadosBancarios = dadosBancarios;
} }
public String getRazaoSocial() {
return razaoSocial;
}
public void setRazaoSocial(String razaoSocial) {
this.razaoSocial = razaoSocial;
}
} }