diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb
index 939808c43..b2cc54484 100644
--- a/App_Code/ClsGenerales.vb
+++ b/App_Code/ClsGenerales.vb
@@ -2955,7 +2955,9 @@ Public Class ClsGenerales
.Add("@FechaIngFin", SqlDbType.VarChar).Value = FechaIngFin
.Add("@Filtro", SqlDbType.Int).Value = Filtro
.Add("@CveUsuarioEntrega", SqlDbType.Int).Value = CveUsuarioEntrega
- .Add("@EsEntregaInterna", SqlDbType.Bit).Value = EsEntregaInterna
+ .Add("@EsEntregaInterna", SqlDbType.Bit).Value = EsEntregaInterna
+
+
End With
Try
SqlAdapter.Fill(Data)
@@ -2964,6 +2966,30 @@ Public Class ClsGenerales
OnError("Ocurrió un error al obtener las Guías de Paquetería.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
End Try
+ Return Retorno
+ End Function
+
+
+ Public Function GetPaqueteriasGuiasRuta(CveSubProyecto As Integer, Estatus As Integer, CveEmpresa As Integer) As Boolean
+
+ Dim Retorno As Boolean = False
+
+ DataAdapter("PA_Gral_PaqueteriasGuiasRutaGet")
+
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@Estatus", SqlDbType.Int).Value = Estatus
+
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al obtener las entregas", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+
Return Retorno
End Function
@@ -3029,7 +3055,8 @@ Public Class ClsGenerales
DataAdapter("PA_Gral_EntregasPorRealizarGet")
With SqlAdapter.SelectCommand.Parameters
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
- .Add("@CveAsignacionEntrega", SqlDbType.BigInt).Value = CveAsignacionEntrega
+ .Add("@CveAsignacionEntrega", SqlDbType.BigInt).Value = CveAsignacionEntrega
+
End With
Try
SqlAdapter.Fill(Data)
@@ -3611,8 +3638,9 @@ Public Class ClsGenerales
#Region "GRAL TIMBRES"
- Public Function AddGralTimbre(TipoDocto As String, Serie As String, Folio As Integer, FolioFiscal As String, Fecha As Date, CvePaqueteriaGuia As Integer, CveMovimientoAlmacen As Integer, CveUsuario As Integer, CveEmpresa As Integer,
- Estatus As Integer, CvePAC As Integer, AplicaCP As Boolean, CveSubProyectoOrigen As Integer, CveDireccionOrigen As Integer, CveDireccionDestino As Integer, CveChofer As Integer, CveCamion As Integer, FechaEntrega As Date) As Integer
+ Public Function AddGralTimbre(TipoDocto As String, Serie As String, Folio As Integer, FolioFiscal As String, Fecha As Date, CveUsuario As Integer, CveEmpresa As Integer,
+ Estatus As Integer, CvePAC As Integer, AplicaCP As Boolean, CveEntregaAlmacen As Integer, CveSubProyectoOrigen As Integer) As Integer
+
Dim Retorno As Integer = -1
DataAdapter("PA_Gral_TimbreAdd")
@@ -3623,19 +3651,13 @@ Public Class ClsGenerales
.Add("@Folio", SqlDbType.Int).Value = Folio
.Add("@FolioFiscal", SqlDbType.VarChar).Value = FolioFiscal
.Add("@Fecha", SqlDbType.Date).Value = Fecha
- .Add("@CvePaqueteriaGuia", SqlDbType.Int).Value = CvePaqueteriaGuia
- .Add("@CveMovimientoAlmacen", SqlDbType.Int).Value = CveMovimientoAlmacen
.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@Estatus", SqlDbType.Int).Value = Estatus
.Add("@CvePAC", SqlDbType.Int).Value = CvePAC
.Add("@AplicaCP", SqlDbType.Bit).Value = AplicaCP
+ .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen
.Add("@CveSubProyectoOrigen", SqlDbType.Int).Value = CveSubProyectoOrigen
- .Add("@CveDireccionOrigen", SqlDbType.Int).Value = CveDireccionOrigen
- .Add("@CveDireccionDestino", SqlDbType.Int).Value = CveDireccionDestino
- .Add("@CveChofer", SqlDbType.Int).Value = CveChofer
- .Add("@CveCamion", SqlDbType.Int).Value = CveCamion
- .Add("@FechaEntrega", SqlDbType.DateTime).Value = FechaEntrega
.Add("@CveTimbre", SqlDbType.Int).Direction = ParameterDirection.Output
.Add("@FolioInsertado", SqlDbType.Int).Direction = ParameterDirection.Output
@@ -3671,10 +3693,7 @@ Public Class ClsGenerales
.Add("@Estatus", SqlDbType.Int).Value = Estatus
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@CveMovimiento", SqlDbType.Int).Value = CveMovimiento
- .Add("@CvePaqueteriaGuia", SqlDbType.Int).Value = CvePaqueteriaGuia
-
-
-
+ .Add("@CvePaqueteriaGuia", SqlDbType.Int).Value = CvePaqueteriaGuia
End With
Try
@@ -3687,9 +3706,9 @@ Public Class ClsGenerales
Return Retorno
End Function
- Public Function UpdateGralTimbre(CveTimbre As Integer, TipoDocto As String, Serie As String, Folio As Integer, FolioFiscal As String, Fecha As Date, CvePaqueteriaGuia As Integer, CveMovimientoAlmacen As Integer, CveUsuario As Integer, CveEmpresa As Integer,
- Estatus As Integer, CvePAC As Integer, CvePACCancelacion As Integer, FechaCancelacion As Date, AplicaCP As Boolean, CveSubProyectoOrigen As Integer, CveDireccionOrigen As Integer, CveDireccionDestino As Integer,
- CveChofer As Integer, CveCamion As Integer) As Boolean
+ Public Function UpdateGralTimbre(CveTimbre As Integer, TipoDocto As String, Serie As String, Folio As Integer, FolioFiscal As String, Fecha As Date, CvePaqueteriaGuia As Integer, CveUsuario As Integer, CveEmpresa As Integer,
+ Estatus As Integer, CvePAC As Integer, CvePACCancelacion As Integer, FechaCancelacion As Date, AplicaCP As Boolean, SelloCancelacion As String
+ ) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Gral_TimbreUpdate")
@@ -3702,20 +3721,16 @@ Public Class ClsGenerales
.Add("@FolioFiscal", SqlDbType.VarChar).Value = FolioFiscal
.Add("@Fecha", SqlDbType.Date).Value = Fecha
.Add("@CvePaqueteriaGuia", SqlDbType.Int).Value = CvePaqueteriaGuia
- .Add("@CveMovimientoAlmacen", SqlDbType.Int).Value = CveMovimientoAlmacen
.Add("@Estatus", SqlDbType.Int).Value = Estatus
.Add("@CvePAC", SqlDbType.Int).Value = CvePAC
.Add("@CvePACCancelacion", SqlDbType.Int).Value = CvePACCancelacion
.Add("@FechaCancelacion", SqlDbType.DateTime).Value = FechaCancelacion
.Add("@AplicaCP", SqlDbType.Bit).Value = AplicaCP
- .Add("@CveSubProyectoOrigen", SqlDbType.Int).Value = CveSubProyectoOrigen
- .Add("@CveDireccionOrigen", SqlDbType.Int).Value = CveDireccionOrigen
- .Add("@CveDireccionDestino", SqlDbType.Int).Value = CveDireccionDestino
.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
- .Add("@CveChofer", SqlDbType.Int).Value = CveChofer
- .Add("@CveCamion", SqlDbType.Int).Value = CveCamion
-
+ .Add("@SelloCancelacion", SqlDbType.VarChar).Value = SelloCancelacion
+
+
End With
Try
@@ -3769,8 +3784,112 @@ Public Class ClsGenerales
End Function
+ Public Function AddInvEntregaAlmacenRuta(CveSubProyectoOrigen As Integer, CveMovimientoAlmacen As Integer, CveDireccionOrigen As Integer, CveDireccionDestino As Integer, CveChofer As Integer, CveCamion As Integer, FechaEntrega As Date, Tipo As String, Orden As Integer) As Integer
+ Dim Retorno As Integer = -1
+ DataAdapter("PA_Inv_EntregaAlmacenRutaAdd")
+
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@CveSubProyectoOrigen", SqlDbType.Int).Value = CveSubProyectoOrigen
+ .Add("@CveMovimientoAlmacen", SqlDbType.Int).Value = CveMovimientoAlmacen
+ .Add("@CveDireccionOrigen", SqlDbType.Int).Value = CveDireccionOrigen
+ .Add("@CveDireccionDestino", SqlDbType.Int).Value = CveDireccionDestino
+ .Add("@CveChofer", SqlDbType.Int).Value = CveChofer
+ .Add("@CveCamion", SqlDbType.Int).Value = CveCamion
+ .Add("@FechaEntrega", SqlDbType.DateTime).Value = FechaEntrega
+ .Add("@Orden", SqlDbType.Int).Value = Orden
+ .Add("@Tipo", SqlDbType.VarChar).Value = Tipo
+ .Add("@CveEntregaAlmacen", SqlDbType.Int).Direction = ParameterDirection.Output
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = SqlAdapter.SelectCommand.Parameters("@CveEntregaAlmacen").Value.ToString.ToEntero
+ Catch ex As Exception
+ OnError("Ocurrió un error al agregar la entrega almacen", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+ End Function
+
+ Public Function UpdateInvEntregaAlmacenRuta(CveEntregaAlmacen As Integer, CveDireccionOrigen As Integer, CveDireccionDestino As Integer, CveChofer As Integer, CveCamion As Integer, FechaEntrega As Date, CveEmpresa As Integer) As Boolean
+ Dim Retorno As Boolean = False
+ DataAdapter("PA_Inv_EntregaAlmacenRutaUpdate")
+
+ With SqlAdapter.SelectCommand.Parameters
+
+
+ .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen
+ .Add("@CveDireccionOrigen", SqlDbType.Int).Value = CveDireccionOrigen
+ .Add("@CveDireccionDestino", SqlDbType.Int).Value = CveDireccionDestino
+ .Add("@CveChofer", SqlDbType.Int).Value = CveChofer
+ .Add("@CveCamion", SqlDbType.Int).Value = CveCamion
+ .Add("@FechaEntrega", SqlDbType.DateTime).Value = FechaEntrega
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error al actualizar la entrega almacen", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+ End Function
+
+ Public Function GetInvEntregaAlmacenRuta(CveSubProyecto As Integer, CveEmpresa As Integer, Opcion As Integer) As Boolean
+
+ Dim Retorno As Boolean = False
+
+ DataAdapter("PA_Inv_EntregaAlmacenRutaGet")
+
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@Opcion", SqlDbType.Int).Value = Opcion
+
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error obtener las entregas", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+ End Function
+
+
+ Public Function GetInvEntregaAlmacenRutaRep(CveSubProyecto As Integer, CveEmpresa As Integer, Estatus As Integer, FechaInicio As Date, FechaFin As Date, CveChofer As Integer) As Boolean
+
+ Dim Retorno As Boolean = False
+
+ DataAdapter("PA_Inv_EntregaAlmacenRutaRepGet")
+
+ With SqlAdapter.SelectCommand.Parameters
+
+ .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@Estatus", SqlDbType.Int).Value = Estatus
+ .Add("@FechaInicio", SqlDbType.Date).Value = FechaInicio
+ .Add("@FechaFin", SqlDbType.Date).Value = FechaFin
+ .Add("@CveChofer", SqlDbType.Int).Value = CveChofer
+
+ End With
+
+ Try
+ SqlAdapter.Fill(Data)
+ Retorno = True
+ Catch ex As Exception
+ OnError("Ocurrió un error obtener las entregas", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
+ End Try
+ Return Retorno
+ End Function
+
#End Region
End Class
+
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 389ad3700..c1c0f5228 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -4870,6 +4870,7 @@ Public Class ClsPaginas
PaginaDict.Add("/Inventarios/AjustesSeccionAlmacen.aspx".ToUpper(), 892)
PaginaDict.Add("/Inventarios/RepTraspasoAlmacen.aspx".ToUpper(), 688)
PaginaDict.Add("/Inventarios/EntregasPorRealizar.aspx".ToUpper(), 728)
+
PaginaDict.Add("/Inventarios/CatAlmacenClasificacionSecciones.aspx".ToUpper(), 764)
PaginaDict.Add("/Inventarios/ReconstruirCostos.aspx".ToUpper(), 764)
PaginaDict.Add("/Inventarios/RecepcionDevolucion.aspx".ToUpper(), 696)
@@ -4879,6 +4880,11 @@ Public Class ClsPaginas
+ PaginaDict.Add("/Inventarios/EntregasPorRealizarRuta.aspx".ToUpper(), -1)
+ PaginaDict.Add("/General/RepPaqueteriasGuiasRuta.aspx".ToUpper(), -1)
+
+
+
#End Region
#Region "MF"
PaginaDict.Add("/MF/BitacoraDiaria.aspx".ToUpper(), 801)
@@ -8492,7 +8498,8 @@ Public Class ClsPaginas
Dim PathXML As String = $"{Ruta}XML\Pag\{Serie}-{Folio}.xml"
Dim PathPDF As String = $"{Ruta}PDF\Pag\{Serie}-{Folio}.pdf"
SerieFolio = $"{Serie}-{Folio}"
- Dim ImagenCBB As String = String.Format("{0}://{1}:{2}/Empresas/{3}/CBB/{4}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa, $"{Serie}-{Folio}.jpg")
+
+ Dim ImagenCBB As String = $"file://{Ruta}CBB\{Serie}-{Folio}.jpg"
If File.Exists(PathXML) Then
Dim XmlDoc As New System.Xml.XmlDocument
diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb
index 9fa47aee1..ec91572d5 100644
--- a/Bancos/IE.aspx.vb
+++ b/Bancos/IE.aspx.vb
@@ -5727,7 +5727,7 @@ Partial Class Bancos_IE
If e.Row.RowType = DataControlRowType.DataRow Then
If e.Row.DataKey("Tipo") = "Ing" Then
- e.Row.Cells(3).Text = String.Format("", Encripta(String.Format("OP=CompP&EXT=xml&SerieFolio={0}&CVECOMPLEMENTOPAGO={1}&CVEIE={2}", e.Row.DBCampo("SerieFolio"), e.Row.DBCampo("CveComplementoPago"), e.Row.DBCampo("CveIE"))))
+ e.Row.Cells(3).Text = String.Format("", Encripta(String.Format("OP=CompP&EXT=xml&SerieFolio={0}&CVECOMPLEMENTOPAGO={1}&CVEIE={2}", e.Row.DBCampo("SerieFolio"), e.Row.DBCampo("CveComplementoPago"), e.Row.DBCampo("CveIE"))))
e.Row.Cells(4).Text = String.Format("", Encripta(String.Format("OP=CompP&EXT=pdf&SerieFolio={0}&CVECOMPLEMENTOPAGO={1}&CVEIE={2}", e.Row.DBCampo("SerieFolio"), e.Row.DBCampo("CveComplementoPago"), e.Row.DBCampo("CveIE"))))
If e.Row.DataKey("Estatus").Contiene("1", "3") Then
@@ -5738,7 +5738,7 @@ Partial Class Bancos_IE
ElseIf e.Row.DataKey("Tipo") = "Egs" Then
- e.Row.Cells(3).Text = String.Format("", Encripta(String.Format("OP=Fact&EXT=xml&CveFactura={0}&RFC={1}", e.Row.DBCampo("CveFactura"), e.Row.DBCampo(("RFCde").ToString.Replace("&", "%26%")))))
+ e.Row.Cells(3).Text = String.Format("", Encripta(String.Format("OP=Fact&EXT=xml&CveFactura={0}&RFC={1}", e.Row.DBCampo("CveFactura"), e.Row.DBCampo(("RFCde").ToString.Replace("&", "%26%")))))
e.Row.Cells(4).Text = String.Format("", Encripta(String.Format("OP=Fact&EXT=pdf&CveFactura={0}&RFC={1}", e.Row.DBCampo("CveFactura"), e.Row.DBCampo("RFCde").ToString.Replace("&", "%26%"))))
GvComplementoPagos.Columns(6).Visible = False
diff --git a/General/RepPaqueteriasGuiasRuta.aspx b/General/RepPaqueteriasGuiasRuta.aspx
new file mode 100644
index 000000000..ee30e8e65
--- /dev/null
+++ b/General/RepPaqueteriasGuiasRuta.aspx
@@ -0,0 +1,338 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeFile="RepPaqueteriasGuiasRuta.aspx.cs" Inherits="General_RepPaqueteriasGuias" %>
+
+
+
+
+
+
+
+ Reporte de Envíos
+
+
+
+
+
+<%--
+
+