From ae595458558aa2311c0499819a45bcacf32c2bdd Mon Sep 17 00:00:00 2001 From: rrene Date: Fri, 31 May 2024 21:29:32 -0700 Subject: [PATCH] - --- App_Code/ClsPuntoVenta.vb | 19 ------------------- App_Code/ClsVentas.vb | 21 ++++++++++++++++++++- asmx/WS_PuntoVenta.asmx | 24 ++++++++++++------------ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/App_Code/ClsPuntoVenta.vb b/App_Code/ClsPuntoVenta.vb index bb8eae858..7ae142533 100644 --- a/App_Code/ClsPuntoVenta.vb +++ b/App_Code/ClsPuntoVenta.vb @@ -354,25 +354,6 @@ Public Class ClsPuntoVenta Return Retorno End Function - Public Function GetVta_MovimientosCajas(CveCorte As Integer, TipoMovimiento As Integer) As Boolean - Dim Retorno As Boolean = False - DataAdapter("PA_Vta_MovimientosCajasGet") - - With SqlAdapter.SelectCommand.Parameters - .Add("@CveCorte", SqlDbType.Int).Value = CveCorte - .Add("@TipoMovimiento", SqlDbType.Int).Value = TipoMovimiento - End With - - Try - SqlAdapter.Fill(Data) - Retorno = True - Catch ex As Exception - OnError("Ocurrió un error al obtener los Movimientos de Caja del Cortes del Punto de Venta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - - Return Retorno - End Function - Public Function GetVta_VentasPago(CveCorte As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_VentasPagoGet") diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 83c4bfffb..4052b6eae 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -3452,7 +3452,7 @@ Public Class ClsVentas #Region "Punto Venta" Public Function GetVta_ReporteCortes(CveEmpresa As Integer, FechaI As Date, FechaF As Date, Optional CveSubProyecto As Integer = -1, Optional CveCorte As Integer = -1) As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Vta_CortesRep") + DataAdapter("PA_Vta_ReporteCortesGet") With SqlAdapter.SelectCommand.Parameters .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa @@ -3572,6 +3572,25 @@ Public Class ClsVentas ' Return Retorno 'End Function + Public Function GetVta_MovimientosCajas(CveCorte As Integer, TipoMovimiento As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Vta_MovimientosCajasGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveCorte", SqlDbType.Int).Value = CveCorte + .Add("@TipoMovimiento", SqlDbType.Int).Value = TipoMovimiento + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los Movimientos de Caja del Cortes del Punto de Venta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + Public Function GetVta_MovimientosCajasReporte(CveCorte As Integer, TipoMovimiento As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_MovimientosCajasRepGet") diff --git a/asmx/WS_PuntoVenta.asmx b/asmx/WS_PuntoVenta.asmx index 26f317894..1e0d53ca2 100644 --- a/asmx/WS_PuntoVenta.asmx +++ b/asmx/WS_PuntoVenta.asmx @@ -1149,21 +1149,21 @@ Public Class WS_PuntoVenta Return objVtaCortes End Function - - Public Function GetVta_MovimientosCajas(CveCorte As Integer, TipoMovimiento As Integer) As List(Of ClsMovimientosCajaWS) - Dim objPV As New ClsPuntoVenta() - Dim objMovimientosCaja As New List(Of ClsMovimientosCajaWS) + ' + 'Public Function GetVta_MovimientosCajas(CveCorte As Integer, TipoMovimiento As Integer) As List(Of ClsMovimientosCajaWS) + ' Dim objPV As New ClsPuntoVenta() + ' Dim objMovimientosCaja As New List(Of ClsMovimientosCajaWS) - If objPV.GetVta_MovimientosCajas(CveCorte, TipoMovimiento) Then - For Each Row As DataRow In objPV.DtResultados.Rows - objMovimientosCaja.Add(New ClsMovimientosCajaWS(Row("CveMovimiento").ToString.ToEntero, Row("CveCorte").ToString.ToEntero, Row("Importe").ToString.ToEntero, Row("Descripcion").ToString, Row("TipoMovimiento").ToString)) - Next - End If + ' If objPV.GetVta_MovimientosCajas(CveCorte, TipoMovimiento) Then + ' For Each Row As DataRow In objPV.DtResultados.Rows + ' objMovimientosCaja.Add(New ClsMovimientosCajaWS(Row("CveMovimiento").ToString.ToEntero, Row("CveCorte").ToString.ToEntero, Row("Importe").ToString.ToEntero, Row("Descripcion").ToString, Row("TipoMovimiento").ToString)) + ' Next + ' End If - objPV.Dispose() + ' objPV.Dispose() - Return objMovimientosCaja - End Function + ' Return objMovimientosCaja + 'End Function Public Function AddVta_MovimientosCajas(CveCorte As Integer, CveUsuario As Integer, Importe As Double, Descripcion As String, TipoMovimiento As Integer, Fecha As DateTime) As Integer