17544: Retorno Icms preço Linha

fixes bug#17544
dev: 
qua:marcelo

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@99363 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2019-12-13 17:55:10 +00:00
parent 177a115f13
commit 9701637777
2 changed files with 43 additions and 3 deletions

View File

@ -36,7 +36,7 @@ public class OperadorEmbarcadaLinhaHibernateDAO extends GenericHibernateDAO<Ope
public List<RutaVO> getListaRutaVO(Integer operador) {
StringBuilder sb = new StringBuilder();
sb.append(" SELECT ");
sb.append(" new com.rjconsultores.ventaboletos.vo.ruta.RutaVO(RT.rutaId, RT.numRuta, RT.prefixo, RT.descruta, ORC.orgaoConcedenteId, ORC.descOrgao, ORC.indValDocObligatorioEmbarcada, RT.indSentidoIda, CLA.claseservicioId, CLA.descclase) ");
sb.append(" new com.rjconsultores.ventaboletos.vo.ruta.RutaVO(RT.rutaId, RT.numRuta, RT.prefixo, RT.descruta, ORC.orgaoConcedenteId, ORC.descOrgao, ORC.indValDocObligatorioEmbarcada, RT.indSentidoIda, CLA.claseservicioId, CLA.descclase, RT.indTribTarifa, RT.indTribTaxaEmbarque, RT.indTribPedagio) ");
sb.append(" FROM OperadorEmbarcadaLinha OPL ");
sb.append(" INNER JOIN OPL.ruta RT ");
sb.append(" INNER JOIN OPL.operadorEmbarcada OPE ");

View File

@ -15,6 +15,9 @@ public class RutaVO {
private String orgaoConcedente;
private Boolean sentido;
private ClaseVO claseVO;
private Boolean indTribTarifa;
private Boolean indTribTaxaEmbarque;
private Boolean indTribPedagio;
private OrgaoConcedenteVO orgaoConcedenteVO;
@ -54,6 +57,21 @@ public class RutaVO {
this.claseVO = new ClaseVO(claseId, descClase);
}
public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada, Boolean sentido, Integer claseId, String descClase, Boolean indTribTarifa, Boolean indTribTaxaEmbarque, Boolean indTribPedagio){
super();
this.rutaId = rutaId.longValue();
this.numRuta = numRuta;
this.prefixo = prefixo;
this.descruta = descruta;
this.orgaoConcedente = descOrgao;
this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao, indValDocObligatorioEmbarcada);
this.sentido = sentido;
this.claseVO = new ClaseVO(claseId, descClase);
this.indTribTarifa = indTribTarifa;
this.indTribTaxaEmbarque = indTribTaxaEmbarque;
this.indTribPedagio = indTribPedagio;
}
public Long getRutaId() {
return rutaId;
}
@ -117,7 +135,29 @@ public class RutaVO {
public void setOrgaoConcedenteVO(OrgaoConcedenteVO orgaoConcedenteVO) {
this.orgaoConcedenteVO = orgaoConcedenteVO;
}
public Boolean getIndTribTarifa() {
return indTribTarifa;
}
public void setIndTribTarifa(Boolean indTribTarifa) {
this.indTribTarifa = indTribTarifa;
}
public Boolean getIndTribTaxaEmbarque() {
return indTribTaxaEmbarque;
}
public void setIndTribTaxaEmbarque(Boolean indTribTaxaEmbarque) {
this.indTribTaxaEmbarque = indTribTaxaEmbarque;
}
public Boolean getIndTribPedagio() {
return indTribPedagio;
}
public void setIndTribPedagio(Boolean indTribPedagio) {
this.indTribPedagio = indTribPedagio;
}
}