diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb index 6b6d7482e..cc989e5e4 100644 --- a/App_Code/ClsBancos.vb +++ b/App_Code/ClsBancos.vb @@ -4308,13 +4308,14 @@ Public Class ClsBancos Return Retorno End Function - Public Function DesconciliarIE(CveIE As Integer, FechaDesconciliado As Date, CveUsuario As Integer) As Boolean + Public Function DesconciliarIE(CveIE As Integer, FechaDesconciliado As Date, CveUsuario As Integer, Optional DejarConciliado As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Banc_IEDesconciliar") With SqlAdapter.SelectCommand.Parameters .Add("@CveIE", SqlDbType.Int).Value = CveIE .Add("@FechaDesconciliado", SqlDbType.Date).Value = FechaDesconciliado .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@DejarConciliado", SqlDbType.Int).Value = If(DejarConciliado, 1, 0) End With Try SqlAdapter.Fill(Data) diff --git a/App_Code/ClsCGame.vb b/App_Code/ClsCGame.vb index 58274dcbc..fa1ae71b7 100644 --- a/App_Code/ClsCGame.vb +++ b/App_Code/ClsCGame.vb @@ -790,7 +790,8 @@ Public Class ClsCGame Return Retorno End Function - Public Function AddHuerta(Huerta As String, CveProveedor As Integer, CveUsuario As Integer, CveEmpresa As Integer, TipoCobro As Integer, Importe As Double, CostoXTonelada As Double) As Boolean + Public Function AddHuerta(Huerta As String, CveProveedor As Integer, CveUsuario As Integer, CveEmpresa As Integer, TipoCobro As Integer, Importe As Double, CostoXTonelada As Double, + NombreRegistro As String, NumeroRegistro As String, CveOrigen As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_CGame_HuertaAdd") With SqlAdapter.SelectCommand.Parameters @@ -801,6 +802,9 @@ Public Class ClsCGame .Add("@TipoCobro", SqlDbType.Int).Value = TipoCobro .Add("@Importe", SqlDbType.Float).Value = Importe .Add("@CostoXTonelada", SqlDbType.Float).Value = CostoXTonelada + .Add("@NombreRegistro", SqlDbType.VarChar).Value = NombreRegistro + .Add("@NumeroRegistro", SqlDbType.VarChar).Value = NumeroRegistro + .Add("@CveOrigen", SqlDbType.Int).Value = CveOrigen End With Try SqlAdapter.Fill(Data) @@ -811,7 +815,8 @@ Public Class ClsCGame Return Retorno End Function - Public Function UpdateHuerta(CveHuerta As Integer, Huerta As String, CveProveedor As Integer, Estatus As Boolean, CveUsuario As Integer, CveEmpresa As Integer, TipoCobro As Integer, Importe As Double, CostoXTonelada As Double) As Boolean + Public Function UpdateHuerta(CveHuerta As Integer, Huerta As String, CveProveedor As Integer, Estatus As Boolean, CveUsuario As Integer, CveEmpresa As Integer, TipoCobro As Integer, Importe As Double, CostoXTonelada As Double, + NombreRegistro As String, NumeroRegistro As String, CveOrigen As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_CGame_HuertaUpdate") With SqlAdapter.SelectCommand.Parameters @@ -824,6 +829,9 @@ Public Class ClsCGame .Add("@TipoCobro", SqlDbType.Int).Value = TipoCobro .Add("@Importe", SqlDbType.Float).Value = Importe .Add("@CostoXTonelada", SqlDbType.Float).Value = CostoXTonelada + .Add("@NombreRegistro", SqlDbType.VarChar).Value = NombreRegistro + .Add("@NumeroRegistro", SqlDbType.VarChar).Value = NumeroRegistro + .Add("@CveOrigen", SqlDbType.Int).Value = CveOrigen End With Try SqlAdapter.Fill(Data) diff --git a/App_Code/ClsContPAQi.vb b/App_Code/ClsContPAQi.vb index b7d21d2e4..4b81efaff 100644 --- a/App_Code/ClsContPAQi.vb +++ b/App_Code/ClsContPAQi.vb @@ -2234,7 +2234,8 @@ Public Class ClsContPAQi ''' ''' Public Function AddMovimiento(IdPoliza As Integer, IdCuenta As Integer, TipoMovto As Boolean, Importe As Double, Referencia As String, - Concepto As String, IdSegNeg As Integer, FechaMovto As Date, SIGReferencia As String, Optional ImporteMonedaExtranjera As Double = 0, Optional GUID As String = "-1") As Boolean + Concepto As String, IdSegNeg As Integer, FechaMovto As Date, SIGReferencia As String, Optional ImporteMonedaExtranjera As Double = 0, Optional GUID As String = "-1", + Optional CvePrePolizaDetalle As Integer = -1) As Boolean Dim Retorno As Boolean = False If IdPoliza <= 0 Or IdCuenta <= 0 Then @@ -2307,8 +2308,8 @@ Public Class ClsContPAQi 'StrSQL.AppendLine("") 'StrSQL.AppendLine("END") - StrSQL.AppendLine(" INSERT INTO MovimientosPoliza (Id, RowVersion, IdPoliza, Ejercicio, Periodo, TipoPol, Folio, NumMovto, IdCuenta, TipoMovto, Importe, ImporteME, Referencia, Concepto, IdDiario, Fecha, IdSegNeg, SIGReferencia, TimeStamp, Guid)") - StrSQL.AppendLine(" VALUES (@Id, @RowVersion, @IdPoliza, @Ejercicio, @Periodo, @TipoPol, @Folio, @NumMovto, @IdCuenta, @TipoMovto, @Importe, @ImporteME, @Referencia, @Concepto, @IdDiario, @Fecha, IIF(@SegNegMovtos = 1,@IdSegNeg,0), @SIGReferencia, @TimeStamp, @GUID);") + StrSQL.AppendLine(" INSERT INTO MovimientosPoliza (Id, RowVersion, IdPoliza, Ejercicio, Periodo, TipoPol, Folio, NumMovto, IdCuenta, TipoMovto, Importe, ImporteME, Referencia, Concepto, IdDiario, Fecha, IdSegNeg, SIGReferencia, TimeStamp, Guid, CvePrePolizaDetalle)") + StrSQL.AppendLine(" VALUES (@Id, @RowVersion, @IdPoliza, @Ejercicio, @Periodo, @TipoPol, @Folio, @NumMovto, @IdCuenta, @TipoMovto, @Importe, @ImporteME, @Referencia, @Concepto, @IdDiario, @Fecha, IIF(@SegNegMovtos = 1,@IdSegNeg,0), @SIGReferencia, @TimeStamp, @GUID, IIF(@CvePrePolizaDetalle=-1,NULL,@CvePrePolizaDetalle));") StrSQL.AppendLine(" ") ''DESCOMENTAR PARA CIERRE PERIODO @@ -2344,156 +2345,6 @@ Public Class ClsContPAQi - SqlDataAdapter(StrSQL.ToString, CommandType.Text) - - With SqlAdapter.SelectCommand.Parameters - .Add("@RowVersion", SqlDbType.Int).Value = GlobalRowVersion - .Add("@IdPoliza", SqlDbType.Int).Value = IdPoliza - .Add("@IdCuenta", SqlDbType.Int).Value = IdCuenta - .Add("@TipoMovto", SqlDbType.Int).Value = TipoMovto - .Add("@Importe", SqlDbType.Money).Value = Math.Round(Importe, 2) - .Add("@Referencia", SqlDbType.VarChar, 30).Value = If(Referencia.Length > 30, Referencia.Substring(1, 30), Referencia) - .Add("@Concepto", SqlDbType.VarChar, 100).Value = If(Concepto.Length > 100, Concepto.Substring(1, 100), Concepto) - .Add("@IdSegNeg", SqlDbType.Int).Value = IdSegNeg - .Add("@FechaMov", SqlDbType.DateTime).Value = FechaMovto - .Add("@SIGReferencia", SqlDbType.VarChar).Value = SIGReferencia - .Add("@ImporteME", SqlDbType.Money).Value = ImporteMonedaExtranjera - .Add("@GUID", SqlDbType.VarChar).Value = GUID - End With - - Try - SqlAdapter.Fill(Data) - GUIDMovimiento = GUID - Retorno = True - Catch ex As Exception - OnError("Ocurrió un error al agregar el movimiento en la póliza.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - End Try - - Return Retorno - End Function - - ''' - ''' Agrega un movimiento a una póliza - ''' - ''' Es el ID que generó la póliza - ''' Es el ID de la cuenta del movimiento a agregar - ''' Cargo = False; Abono = True - ''' Es el Importe del movimiento a agregar - ''' Es la referencia del movimiento, hasta 30 dígitos - ''' Es el concepto del movimiento, hasta 100 dígitos - ''' Es el ID del Segmento de Negocio - ''' Es la fecha del movimiento - ''' - ''' - Public Function AddMovimiento(IdPoliza As Integer, IdCuenta As Integer, TipoMovto As Boolean, Importe As Double, Referencia As String, - Concepto As String, IdSegNeg As Integer, FechaMovto As Date, SIGReferencia As String, CvePrePolizaDetalle As Integer, Optional ImporteMonedaExtranjera As Double = 0, Optional GUID As String = "-1") As Boolean - Dim Retorno As Boolean = False - - If IdPoliza <= 0 Or IdCuenta <= 0 Then - Return False - End If - - If Not FNC_GetCounter() Then - Return Retorno - End If - - If Not FNC_GetNumMovto() Then - Return Retorno - End If - - 'SqlDataAdapter("PA_AddMovimiento - If GUID = "-1" Then GUID = System.Guid.NewGuid().ToString() - - StrSQL.Clear() - StrSQL.AppendLine("BEGIN") - StrSQL.AppendLine("") - StrSQL.AppendLine(" DECLARE ") - StrSQL.AppendLine(" @Error NVARCHAR(300),") - StrSQL.AppendLine(" @Id INT,") - StrSQL.AppendLine(" @Ejercicio INT,") - StrSQL.AppendLine(" @Periodo INT,") - StrSQL.AppendLine(" @TipoPol INT,") - StrSQL.AppendLine(" @Folio INT,") - StrSQL.AppendLine(" @NumMovto INT,") - StrSQL.AppendLine(" @IdDiario INT,") - StrSQL.AppendLine(" @Fecha DATETIME,") - StrSQL.AppendLine(" @IDEjercicio INT,") - StrSQL.AppendLine(" @TimeStamp NVARCHAR (200);") - StrSQL.AppendLine(" SET NOCOUNT ON;") - StrSQL.AppendLine(" ") - StrSQL.AppendLine(" SET @Id = dbo.FNC_GetCounter ('Id_MovimientoPoliza');") - StrSQL.AppendLine(" SET @NumMovto = dbo.FNC_GetNumMovto (@IdPoliza);") - StrSQL.AppendLine(" SET @Fecha = @FechaMov;") - StrSQL.AppendLine(" SET @IdDiario = 0;") - StrSQL.AppendLine(" SELECT @Ejercicio = P.Ejercicio, @Periodo = P.Periodo, @TipoPol = TipoPol, @Folio = P.Folio FROM Polizas P WHERE Id = @IdPoliza;") - StrSQL.AppendLine("") - StrSQL.AppendLine(" BEGIN TRY") - StrSQL.AppendLine(" ") - - ''DESCOMENTAR PARA CIERRE PERIODO - 'StrSQL.AppendLine("DECLARE") - 'StrSQL.AppendLine(" @IdCtaCierre INT,") - 'StrSQL.AppendLine(" @IdPolCierre INT,") - 'StrSQL.AppendLine(" @NumMovtoCierre INT;") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine("SET @NumMovtoCierre = 0;") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine("-- SI ES CUENTA DE RESULTADOS") - 'StrSQL.AppendLine("IF (SELECT Tipo FROM Cuentas WHERE Id = @IdCuenta) IN ('G','H')") - 'StrSQL.AppendLine("BEGIN ") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine(" SELECT @IdCtaCierre = IdCtaCierre, @IdPolCierre = IdPolCierre FROM Ejercicios WHERE Ejercicio = @Ejercicio") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine(" -- SI ESTA CERRADO EL EJERCICIO") - 'StrSQL.AppendLine(" IF (@IdCtaCierre > 0 AND @IdPolCierre > 0)") - 'StrSQL.AppendLine(" BEGIN") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine(" -- PARA QUE EL MOVIMIENTO SE AGREGUE DIRECTO EN LA POLIZA DE CIERRE") - 'StrSQL.AppendLine(" SET @IdPoliza = @IdPolCierre;") - 'StrSQL.AppendLine(" SET @NumMovto = dbo.FNC_GetNumMovto (@IdPolCierre);") - 'StrSQL.AppendLine(" SET @NumMovtoCierre = @NumMovto + 1") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine(" END") - 'StrSQL.AppendLine("") - 'StrSQL.AppendLine("END") - - StrSQL.AppendLine(" INSERT INTO MovimientosPoliza (Id, RowVersion, IdPoliza, Ejercicio, Periodo, TipoPol, Folio, NumMovto, IdCuenta, TipoMovto, Importe, ImporteME, Referencia, Concepto, IdDiario, Fecha, IdSegNeg, SIGReferencia, TimeStamp, Guid, CvePrePolizaDetalle)") - StrSQL.AppendLine(" VALUES (@Id, @RowVersion, @IdPoliza, @Ejercicio, @Periodo, @TipoPol, @Folio, @NumMovto, @IdCuenta, @TipoMovto, @Importe, @ImporteME, @Referencia, @Concepto, @IdDiario, @Fecha, @IdSegNeg, @SIGReferencia, @TimeStamp, @GUID, @CvePrePolizaDetalle);") - StrSQL.AppendLine(" ") - - ''DESCOMENTAR PARA CIERRE PERIODO - 'StrSQL.AppendLine(" IF @NumMovtoCierre > 0 ") - 'StrSQL.AppendLine(" BEGIN ") - 'StrSQL.AppendLine(" IF @TipoMovto = 0 BEGIN ") - 'StrSQL.AppendLine(" SET @TipoMovto = 1 ") - 'StrSQL.AppendLine(" END ") - 'StrSQL.AppendLine(" ELSE BEGIN ") - 'StrSQL.AppendLine(" SET @TipoMovto = 0 ") - 'StrSQL.AppendLine(" END ") - 'StrSQL.AppendLine(" INSERT INTO MovimientosPoliza (Id, RowVersion, IdPoliza, Ejercicio, Periodo, TipoPol, Folio, NumMovto, IdCuenta, TipoMovto, Importe, ImporteME, Referencia, Concepto, IdDiario, Fecha, IdSegNeg, SIGReferencia, TimeStamp, Guid) ") - 'StrSQL.AppendLine(" VALUES (@Id + 1, @RowVersion, @IdPoliza, @Ejercicio, @Periodo, @TipoPol, @Folio, @NumMovtoCierre, @IdCtaCierre, @TipoMovto, @Importe, @ImporteME, @Referencia, @Concepto, @IdDiario, @Fecha, @IdSegNeg, @SIGReferencia, @TimeStamp,''); ") - 'StrSQL.AppendLine(" EXEC PA_UpdateId 'Id_MovimientoPoliza';") - 'StrSQL.AppendLine(" END ") - - StrSQL.AppendLine(" EXEC PA_UpdateId 'Id_MovimientoPoliza';") - StrSQL.AppendLine(" ") - StrSQL.AppendLine(" SELECT @IDEjercicio = ID FROM Ejercicios WHERE Ejercicio = @Ejercicio;") - StrSQL.AppendLine(" ") - StrSQL.AppendLine(" EXEC PA_UpdateSaldos @IdCuenta, @TipoMovto, @Importe, @IDEjercicio, @Periodo, @Id, @IdPoliza;") - StrSQL.AppendLine(" ") - StrSQL.AppendLine(" SELECT @Id AS IdMovto, @NumMovto AS NumMovto, @GUID AS GUID ;") - StrSQL.AppendLine(" ") - StrSQL.AppendLine(" END TRY") - StrSQL.AppendLine(" ") - StrSQL.AppendLine(" BEGIN CATCH") - StrSQL.AppendLine(" SET @Error = CONCAT('Número: ' , ERROR_NUMBER(), '; Procedimiento: ' , ERROR_PROCEDURE(), '; Linea: ' ,ERROR_LINE(), '; Detalle: ' , ERROR_MESSAGE());") - StrSQL.AppendLine(" RAISERROR(@Error, 16, 1);") - StrSQL.AppendLine(" END CATCH") - StrSQL.AppendLine(" ") - StrSQL.AppendLine("END;") - - - SqlDataAdapter(StrSQL.ToString, CommandType.Text) With SqlAdapter.SelectCommand.Parameters @@ -2523,6 +2374,159 @@ Public Class ClsContPAQi Return Retorno End Function + '''' + '''' Agrega un movimiento a una póliza + '''' + '''' Es el ID que generó la póliza + '''' Es el ID de la cuenta del movimiento a agregar + '''' Cargo = False; Abono = True + '''' Es el Importe del movimiento a agregar + '''' Es la referencia del movimiento, hasta 30 dígitos + '''' Es el concepto del movimiento, hasta 100 dígitos + '''' Es el ID del Segmento de Negocio + '''' Es la fecha del movimiento + '''' + '''' + 'Public Function AddMovimiento(IdPoliza As Integer, IdCuenta As Integer, TipoMovto As Boolean, Importe As Double, Referencia As String, + ' Concepto As String, IdSegNeg As Integer, FechaMovto As Date, SIGReferencia As String, CvePrePolizaDetalle As Integer, Optional ImporteMonedaExtranjera As Double = 0, Optional GUID As String = "-1") As Boolean + ' Dim Retorno As Boolean = False + + ' If IdPoliza <= 0 Or IdCuenta <= 0 Then + ' Return False + ' End If + + ' If Not FNC_GetCounter() Then + ' Return Retorno + ' End If + + ' If Not FNC_GetNumMovto() Then + ' Return Retorno + ' End If + + ' 'SqlDataAdapter("PA_AddMovimiento + ' If GUID = "-1" Then GUID = System.Guid.NewGuid().ToString() + + ' StrSQL.Clear() + ' StrSQL.AppendLine("BEGIN") + ' StrSQL.AppendLine("") + ' StrSQL.AppendLine(" DECLARE ") + ' StrSQL.AppendLine(" @Error NVARCHAR(300),") + ' StrSQL.AppendLine(" @Id INT,") + ' StrSQL.AppendLine(" @Ejercicio INT,") + ' StrSQL.AppendLine(" @Periodo INT,") + ' StrSQL.AppendLine(" @TipoPol INT,") + ' StrSQL.AppendLine(" @Folio INT,") + ' StrSQL.AppendLine(" @NumMovto INT,") + ' StrSQL.AppendLine(" @IdDiario INT,") + ' StrSQL.AppendLine(" @SegNegMovtos INT,") + ' StrSQL.AppendLine(" @Fecha DATETIME,") + ' StrSQL.AppendLine(" @IDEjercicio INT,") + ' StrSQL.AppendLine(" @TimeStamp NVARCHAR (200);") + ' StrSQL.AppendLine(" SET NOCOUNT ON;") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine(" SET @Id = dbo.FNC_GetCounter ('Id_MovimientoPoliza');") + ' StrSQL.AppendLine(" SET @NumMovto = dbo.FNC_GetNumMovto (@IdPoliza);") + ' StrSQL.AppendLine(" SET @Fecha = @FechaMov;") + ' StrSQL.AppendLine(" SET @IdDiario = 0;") + ' StrSQL.AppendLine(" SELECT @Ejercicio = P.Ejercicio, @Periodo = P.Periodo, @TipoPol = TipoPol, @Folio = P.Folio FROM Polizas P WHERE Id = @IdPoliza;") + ' StrSQL.AppendLine(" SELECT @SegNegMovtos = SegNegMovtos FROM Cuentas C WHERE Id = @IdCuenta;") + ' StrSQL.AppendLine("") + ' StrSQL.AppendLine(" BEGIN TRY") + ' StrSQL.AppendLine(" ") + + ' ''DESCOMENTAR PARA CIERRE PERIODO + ' 'StrSQL.AppendLine("DECLARE") + ' 'StrSQL.AppendLine(" @IdCtaCierre INT,") + ' 'StrSQL.AppendLine(" @IdPolCierre INT,") + ' 'StrSQL.AppendLine(" @NumMovtoCierre INT;") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine("SET @NumMovtoCierre = 0;") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine("-- SI ES CUENTA DE RESULTADOS") + ' 'StrSQL.AppendLine("IF (SELECT Tipo FROM Cuentas WHERE Id = @IdCuenta) IN ('G','H')") + ' 'StrSQL.AppendLine("BEGIN ") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine(" SELECT @IdCtaCierre = IdCtaCierre, @IdPolCierre = IdPolCierre FROM Ejercicios WHERE Ejercicio = @Ejercicio") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine(" -- SI ESTA CERRADO EL EJERCICIO") + ' 'StrSQL.AppendLine(" IF (@IdCtaCierre > 0 AND @IdPolCierre > 0)") + ' 'StrSQL.AppendLine(" BEGIN") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine(" -- PARA QUE EL MOVIMIENTO SE AGREGUE DIRECTO EN LA POLIZA DE CIERRE") + ' 'StrSQL.AppendLine(" SET @IdPoliza = @IdPolCierre;") + ' 'StrSQL.AppendLine(" SET @NumMovto = dbo.FNC_GetNumMovto (@IdPolCierre);") + ' 'StrSQL.AppendLine(" SET @NumMovtoCierre = @NumMovto + 1") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine(" END") + ' 'StrSQL.AppendLine("") + ' 'StrSQL.AppendLine("END") + + ' StrSQL.AppendLine(" INSERT INTO MovimientosPoliza (Id, RowVersion, IdPoliza, Ejercicio, Periodo, TipoPol, Folio, NumMovto, IdCuenta, TipoMovto, Importe, ImporteME, Referencia, Concepto, IdDiario, Fecha, IdSegNeg, SIGReferencia, TimeStamp, Guid, CvePrePolizaDetalle)") + ' StrSQL.AppendLine(" VALUES (@Id, @RowVersion, @IdPoliza, @Ejercicio, @Periodo, @TipoPol, @Folio, @NumMovto, @IdCuenta, @TipoMovto, @Importe, @ImporteME, @Referencia, @Concepto, @IdDiario, @Fecha, IIF(@SegNegMovtos = 1,@IdSegNeg,0), @SIGReferencia, @TimeStamp, @GUID, @CvePrePolizaDetalle);") + ' StrSQL.AppendLine(" ") + + ' ''DESCOMENTAR PARA CIERRE PERIODO + ' 'StrSQL.AppendLine(" IF @NumMovtoCierre > 0 ") + ' 'StrSQL.AppendLine(" BEGIN ") + ' 'StrSQL.AppendLine(" IF @TipoMovto = 0 BEGIN ") + ' 'StrSQL.AppendLine(" SET @TipoMovto = 1 ") + ' 'StrSQL.AppendLine(" END ") + ' 'StrSQL.AppendLine(" ELSE BEGIN ") + ' 'StrSQL.AppendLine(" SET @TipoMovto = 0 ") + ' 'StrSQL.AppendLine(" END ") + ' 'StrSQL.AppendLine(" INSERT INTO MovimientosPoliza (Id, RowVersion, IdPoliza, Ejercicio, Periodo, TipoPol, Folio, NumMovto, IdCuenta, TipoMovto, Importe, ImporteME, Referencia, Concepto, IdDiario, Fecha, IdSegNeg, SIGReferencia, TimeStamp, Guid) ") + ' 'StrSQL.AppendLine(" VALUES (@Id + 1, @RowVersion, @IdPoliza, @Ejercicio, @Periodo, @TipoPol, @Folio, @NumMovtoCierre, @IdCtaCierre, @TipoMovto, @Importe, @ImporteME, @Referencia, @Concepto, @IdDiario, @Fecha, @IdSegNeg, @SIGReferencia, @TimeStamp,''); ") + ' 'StrSQL.AppendLine(" EXEC PA_UpdateId 'Id_MovimientoPoliza';") + ' 'StrSQL.AppendLine(" END ") + + ' StrSQL.AppendLine(" EXEC PA_UpdateId 'Id_MovimientoPoliza';") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine(" SELECT @IDEjercicio = ID FROM Ejercicios WHERE Ejercicio = @Ejercicio;") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine(" EXEC PA_UpdateSaldos @IdCuenta, @TipoMovto, @Importe, @IDEjercicio, @Periodo, @Id, @IdPoliza;") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine(" SELECT @Id AS IdMovto, @NumMovto AS NumMovto, @GUID AS GUID ;") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine(" END TRY") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine(" BEGIN CATCH") + ' StrSQL.AppendLine(" SET @Error = CONCAT('Número: ' , ERROR_NUMBER(), '; Procedimiento: ' , ERROR_PROCEDURE(), '; Linea: ' ,ERROR_LINE(), '; Detalle: ' , ERROR_MESSAGE());") + ' StrSQL.AppendLine(" RAISERROR(@Error, 16, 1);") + ' StrSQL.AppendLine(" END CATCH") + ' StrSQL.AppendLine(" ") + ' StrSQL.AppendLine("END;") + + + + ' SqlDataAdapter(StrSQL.ToString, CommandType.Text) + + ' With SqlAdapter.SelectCommand.Parameters + ' .Add("@RowVersion", SqlDbType.Int).Value = GlobalRowVersion + ' .Add("@IdPoliza", SqlDbType.Int).Value = IdPoliza + ' .Add("@IdCuenta", SqlDbType.Int).Value = IdCuenta + ' .Add("@TipoMovto", SqlDbType.Int).Value = TipoMovto + ' .Add("@Importe", SqlDbType.Money).Value = Math.Round(Importe, 2) + ' .Add("@Referencia", SqlDbType.VarChar, 30).Value = If(Referencia.Length > 30, Referencia.Substring(1, 30), Referencia) + ' .Add("@Concepto", SqlDbType.VarChar, 100).Value = If(Concepto.Length > 100, Concepto.Substring(1, 100), Concepto) + ' .Add("@IdSegNeg", SqlDbType.Int).Value = IdSegNeg + ' .Add("@FechaMov", SqlDbType.DateTime).Value = FechaMovto + ' .Add("@SIGReferencia", SqlDbType.VarChar).Value = SIGReferencia + ' .Add("@ImporteME", SqlDbType.Money).Value = ImporteMonedaExtranjera + ' .Add("@GUID", SqlDbType.VarChar).Value = GUID + ' .Add("@CvePrePolizaDetalle", SqlDbType.Int).Value = CvePrePolizaDetalle + ' End With + + ' Try + ' SqlAdapter.Fill(Data) + ' GUIDMovimiento = GUID + ' Retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al agregar el movimiento en la póliza.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + + ' Return Retorno + 'End Function + Public Function UpdatePoliza(Concepto As String, Cargos As Double, Abonos As Double, IdUsuario As Integer, FechaPoliza As Date, Folio As String, TipoPoliza As Integer, IdPoliza As Integer) As Boolean Dim Retorno As Boolean = False diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index 92b5aa4d1..a10b756f0 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -1406,7 +1406,7 @@ Public Class ClsContabilidad If dr("ImporteMN").ToString.ToDecimal <> 0 Then If Not ObjConta.AddMovimiento(tIdPoliza, dr("IdCtaContable").ToString.ToEntero, tipoMovimiento, - dr("ImporteMN").ToString.ToDecimal, dr("Referencia").ToString, dr("Concepto").ToString, dr("IdSegmentoNegocio").ToString.ToEntero, Fecha, SigReferencia, dr("CvePrePolizaDetalle").ToString.ToEntero, ImporteMonedaExtranjera:=dr("ImporteME").ToString.ToDecimal) Then + dr("ImporteMN").ToString.ToDecimal, dr("Referencia").ToString, dr("Concepto").ToString, dr("IdSegmentoNegocio").ToString.ToEntero, Fecha, SigReferencia, CvePrePolizaDetalle:=dr("CvePrePolizaDetalle").ToString.ToEntero, ImporteMonedaExtranjera:=dr("ImporteME").ToString.ToDecimal) Then OcurrioError = True StrLog.AppendFormat(" Error 1.1 - ") Exit For @@ -1415,7 +1415,7 @@ Public Class ClsContabilidad Else If Not ObjConta.AddMovimiento(tIdPoliza, dr("IdCtaContable").ToString.ToEntero, tipoMovimiento, - dr("Importe").ToString.ToDecimal, dr("Referencia").ToString, dr("Concepto").ToString, dr("IdSegmentoNegocio").ToString.ToEntero, Fecha, SigReferencia, dr("CvePrePolizaDetalle").ToString.ToEntero, ImporteMonedaExtranjera:=dr("ImporteME").ToString.ToDecimal) Then + dr("Importe").ToString.ToDecimal, dr("Referencia").ToString, dr("Concepto").ToString, dr("IdSegmentoNegocio").ToString.ToEntero, Fecha, SigReferencia, CvePrePolizaDetalle:=dr("CvePrePolizaDetalle").ToString.ToEntero, ImporteMonedaExtranjera:=dr("ImporteME").ToString.ToDecimal) Then OcurrioError = True StrLog.AppendFormat(" Error 1.2 - ") Exit For @@ -1456,7 +1456,7 @@ Public Class ClsContabilidad Dim RFC As String = "" Dim RazonSocial As String = "" If Not OcurrioError AndAlso ContabilizarDIOT Then - If GetDIOTValores(CvePrePoliza) AndAlso Data.Rows.Count > 0 Then + If GetDIOTValores(CvePrePoliza, Empresa.CveEmpresa) AndAlso Data.Rows.Count > 0 Then Dim IdProveedor As Integer For Each dr As DataRow In Data.Rows @@ -1685,7 +1685,7 @@ Public Class ClsContabilidad Return Retorno End Function - Public Function GetDIOTValores(CvePrePoliza As Integer) As Boolean 'Editado por charlie + Public Function GetDIOTValores(CvePrePoliza As Integer, CveEmpresa As Integer) As Boolean 'Editado por charlie Dim Retorno As Boolean = False @@ -1693,6 +1693,7 @@ Public Class ClsContabilidad With SqlAdapter.SelectCommand.Parameters .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index fa1c9f6d7..31fe1900e 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -3,11 +3,11 @@ Option Explicit On Imports System.Data Imports System.Data.SqlClient Imports Extensiones -Imports Stimulsoft.Base.Analysis - +Imports Stimulsoft.Base.Analysis + Public Class ClsGenerales - Implements IDisposable - + Implements IDisposable + #Region "Campos" Private _CveColectiva As Integer @@ -19,11 +19,11 @@ Public Class ClsGenerales Private DSet As New DataSet Private disposedValue As Boolean = False 'REGISTRAR CONEXIONES ABIERTAS - Private CveConexion As Integer = 0 - Private EsTransaccionCompartida As Boolean = False - + Private CveConexion As Integer = 0 + Private EsTransaccionCompartida As Boolean = False + #End Region - + #Region "Propiedades" Public Property Colectiva As String Public Property Codigo As String @@ -50,19 +50,19 @@ Public Class ClsGenerales Get DtResultados = Data End Get - End Property - - Public ReadOnly Property DSResultados() As DataSet - Get - DSResultados = DSet - End Get - End Property - - Public Property FolioInsertado As Integer - - Public Property SerieInsertada As String + End Property + + Public ReadOnly Property DSResultados() As DataSet + Get + DSResultados = DSet + End Get + End Property + + Public Property FolioInsertado As Integer + + Public Property SerieInsertada As String #End Region - + Public Function IniciaTransacSQL() As SqlTransaction If SqlTransacc Is Nothing Then SqlTransacc = SqlConexion.BeginTransaction() Return SqlTransacc @@ -86,7 +86,7 @@ Public Class ClsGenerales End Try Else SqlConexion = TransaccionCompartida.Connection - SqlTransacc = TransaccionCompartida + SqlTransacc = TransaccionCompartida EsTransaccionCompartida = True End If @@ -101,9 +101,9 @@ Public Class ClsGenerales End With Data = New DataTable If SqlTransacc IsNot Nothing Then SqlAdapter.SelectCommand.Transaction = SqlTransacc - End Sub + End Sub #Region "Conexiones" - + Private Sub ConexionAdd() If Not EsTransaccionCompartida AndAlso ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then Try @@ -136,9 +136,9 @@ Public Class ClsGenerales CveConexion = 0 End If - End Sub + End Sub #End Region - + Private Sub DataCommand(ByVal pStrSQL As String, Optional ByVal TipoComando As CommandType = CommandType.StoredProcedure) With SqlCommand .Parameters.Clear() @@ -221,13 +221,13 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los registros de solicitudes CFDI SAT.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function - + End Function + Public Function SAT_DescargaSolicitudeUUIDSGET(CveSolicitudSat As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("[PA_Gral_DescargaSolicitudesUUIDSGET]", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters - .Add("@CveSolicitudSat", SqlDbType.Int).Value = CveSolicitudSat + .Add("@CveSolicitudSat", SqlDbType.Int).Value = CveSolicitudSat End With Try SqlAdapter.Fill(Data) @@ -236,15 +236,15 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los registros de solicitudes CFDI SAT.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function - - + End Function + + Public Function SAT_DescargaSolicitudesAddNotificaciones(CveEmpresa As Int32, CveSolicitudSat As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("[PA_Gral_SAT_DescargaSolicitudesAddNotificaciones]", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveSolicitudSat", SqlDbType.Int).Value = CveSolicitudSat + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveSolicitudSat", SqlDbType.Int).Value = CveSolicitudSat End With Try SqlAdapter.Fill(Data) @@ -253,12 +253,12 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los registros de solicitudes CFDI SAT.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function + End Function Public Function SAT_DescargaSolicitudesAddNotificacionesCOUNT(CveEmpresa As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("[PA_Gral_SAT_DescargaSolicitudesAddNotificacionesCOUNT]", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try SqlAdapter.Fill(Data) @@ -267,8 +267,8 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los registros de solicitudes CFDI SAT.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function - + End Function + Public Function GetMotivosCancelacionSAT() As Boolean Dim retorno As Boolean = False DataAdapter("PA_Gral_SAT_MotivosCancelacionGet") @@ -279,15 +279,15 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los motivos de cancelación.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function - + End Function + Public Function GetMotivosCancelacionEmpresa(CveEmpresa As Integer, Optional CveMotivoCancelacion As Integer = -1, Optional CveSATMotivoCancelacion As Integer = -1) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Gral_MotivosCancelacionGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveMotivoCancelacion", SqlDbType.Int).Value = CveMotivoCancelacion - .Add("@CveSATMotivoCancelacion", SqlDbType.Int).Value = CveSATMotivoCancelacion + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveMotivoCancelacion", SqlDbType.Int).Value = CveMotivoCancelacion + .Add("@CveSATMotivoCancelacion", SqlDbType.Int).Value = CveSATMotivoCancelacion End With Try SqlAdapter.Fill(Data) @@ -296,13 +296,13 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los motivos de cancelación.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function - + End Function + Public Function GenerarMotivosCancelacionEmpresaDefault(CveEmpresa As Integer) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Gral_MotivosCancelacionDefaultAdd") With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try SqlAdapter.Fill(Data) @@ -311,8 +311,8 @@ Public Class ClsGenerales OnError("Ocurrió un error al agregar los motivos de cancelacion.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return retorno - End Function - + End Function + #Region " I N D I C A D O R E S Y G R A F I C A S" Public Function GetIndicadores(CveEmpresa As Integer) As DataSet 'Dim Retorno As Boolean = False @@ -334,10 +334,10 @@ Public Class ClsGenerales End Try Return ds - End Function - + End Function + #End Region - + #Region " D I A S I N H A B I L E S " Public Function DiasInhabiles_Add(CveEmpresa As Integer, CveUsuario As Integer, DiaInhabil As String, Descripcion As String, Estatus As Integer, FechaInhabil As Date) As Boolean Dim Retorno As Boolean = False @@ -420,15 +420,15 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region " P A Q U E T E R I A S" Public Function GetGralPaqueterias(Optional CveEmpresa As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_PaqueteriasGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try SqlAdapter.Fill(Data) @@ -559,11 +559,11 @@ Public Class ClsGenerales OnError("Ocurrió un error al actualizar en el Catálogo de Paqueterias Guias Tipos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function + End Function #End Region - + #Region "P L A N T I L L A S C O N T R A T O S" - + Public Function ContratoPlantillaAdd(CveEmpresa As Integer, CveUsuario As Integer, NombrePlantilla As String, URL As String, Tipo As String) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_ContratoPlantillaAdd") @@ -640,55 +640,55 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + #End Region - - '#Region " E S T A D O S" - ' Public Function GetGralEstados() As Boolean - ' Dim Retorno As Boolean = False - ' DataAdapter("PA_Gral_EstadoGet") - ' Try - ' SqlAdapter.Fill(Data) - ' Retorno = True - ' Catch ex As Exception - ' OnError("Ocurrió un error al obtener el Catálogo de Estados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - ' End Try - - ' Return Retorno - ' End Function - '#End Region - - '#Region " M U N I C I P I O S" - ' Public Function GetGralMunicipios() As Boolean - ' Dim Retorno As Boolean = False - ' DataAdapter("PA_Gral_MunicipioGet") - ' Try - ' SqlAdapter.Fill(Data) - ' Retorno = True - ' Catch ex As Exception - ' OnError("Ocurrió un error al obtener el Catálogo de Municipios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - ' End Try - - ' Return Retorno - ' End Function - '#End Region - - '#Region " P A I S E S" - ' Public Function GetGralPaises() As Boolean - ' Dim Retorno As Boolean = False - ' DataAdapter("PA_Gral_PaisGet") - ' Try - ' SqlAdapter.Fill(Data) - ' Retorno = True - ' Catch ex As Exception - ' OnError("Ocurrió un error al obtener el Catálogo de Paises.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - ' End Try - - ' Return Retorno - ' End Function - '#End Region - + + '#Region " E S T A D O S" + ' Public Function GetGralEstados() As Boolean + ' Dim Retorno As Boolean = False + ' DataAdapter("PA_Gral_EstadoGet") + ' Try + ' SqlAdapter.Fill(Data) + ' Retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al obtener el Catálogo de Estados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + + ' Return Retorno + ' End Function + '#End Region + + '#Region " M U N I C I P I O S" + ' Public Function GetGralMunicipios() As Boolean + ' Dim Retorno As Boolean = False + ' DataAdapter("PA_Gral_MunicipioGet") + ' Try + ' SqlAdapter.Fill(Data) + ' Retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al obtener el Catálogo de Municipios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + + ' Return Retorno + ' End Function + '#End Region + + '#Region " P A I S E S" + ' Public Function GetGralPaises() As Boolean + ' Dim Retorno As Boolean = False + ' DataAdapter("PA_Gral_PaisGet") + ' Try + ' SqlAdapter.Fill(Data) + ' Retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al obtener el Catálogo de Paises.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + + ' Return Retorno + ' End Function + '#End Region + #Region " P O B L A C I O N E S" Public Function GetGralPoblaciones() As Boolean Dim Retorno As Boolean = False @@ -701,9 +701,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "E S C O L A R I D A D" Public Function GetEscolaridades() As Boolean Dim Retorno As Boolean = False @@ -793,9 +793,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "C A T E G O R I A S" Public Function GetCategorias(Optional CveEmpresa As Integer = -1, Optional Tipo As Integer = 1) As Boolean Dim Retorno As Boolean = False @@ -892,9 +892,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "M O D E L O S" Public Function GetModelos(CveEmpresa As Integer, Optional CveModelo As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -988,9 +988,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "R I M T A M A N I O S" Public Function GetRimTamanios(CveEmpresa As Integer, Optional CveRinTamaño As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1082,9 +1082,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "M E D I D A S" Public Function GetMedidas(CveEmpresa As Integer, Optional CveMedida As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1164,7 +1164,7 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function Public Function GetMedidasEquivalentes(CveEmpresa As Integer, Optional CveMedida As Integer = -1, Optional CveRin As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1184,7 +1184,7 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function Public Function AddMedidasEquivalentes(CveMedida As Integer, CveRin As Integer, CveMedidaEquivalente As Integer, CveRinEquivalente As Integer) As Boolean Dim Retorno As Boolean = False @@ -1205,14 +1205,14 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function Public Function UpdateMedidasEquivalentes(CveMedidaEquivalencia As Integer, CveMedida As Integer, CveRin As Integer, CveMedidaEquivalente As Integer, CveRinEquivalente As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_MedidasEquivalenciasUpdate") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveMedidaEquivalencia", SqlDbType.Int).Value = CveMedidaEquivalencia + With SqlAdapter.SelectCommand.Parameters + .Add("@CveMedidaEquivalencia", SqlDbType.Int).Value = CveMedidaEquivalencia .Add("@CveMedida", SqlDbType.Int).Value = CveMedida .Add("@CveRin", SqlDbType.Int).Value = CveRin .Add("@CveMedidaEquivalente", SqlDbType.Int).Value = CveMedidaEquivalente @@ -1227,7 +1227,7 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function Public Function RemoveMedidasEquivalentes(CveMedidaEquivalencia As Integer) As Boolean Dim Retorno As Boolean = False @@ -1245,9 +1245,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "C O L E C T I V A S" Public Function GetColectivas(Optional CveColectiva As Integer = -1, Optional Colectiva As String = "-1", Optional Codigo As String = "-1", Optional Tipo As String = "-1", Optional CveEmpresa As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1403,10 +1403,10 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + #End Region - + #Region "C O L E C T I V A S - D E T A L L E S" Public Function GetColectivasDetalles(CveColectiva As Integer, Tipo As String, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False @@ -1524,9 +1524,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "S u b i r I m a g e n e s" Public Function ImagenUpload(pCveOpcion As Integer, pCveClave As Integer, pCveUsuario As Integer, IMEI As String, pCveEmpresa As Integer) As Integer Dim Retorno As Integer = -1 @@ -1550,10 +1550,10 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - ' IDisposable - + ' IDisposable + #Region "G E N E R A L E S - C U E N T A S B A N C A R I A S " Public Function GetCuentasDepositos(Optional CveProveedor As Integer = -1, Optional CveCliente As Integer = -1, Optional CvePersonal As Integer = -1, Optional CveColectiva As Integer = -1, Optional CveCuentaDeposito As Integer = -1, Optional CveEmpresa As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1564,7 +1564,7 @@ Public Class ClsGenerales .Add("@CveCliente", SqlDbType.Int).Value = CveCliente .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@CveColectiva", SqlDbType.Int).Value = CveColectiva - .Add("@CveCuentaDeposito", SqlDbType.Int).Value = CveCuentaDeposito + .Add("@CveCuentaDeposito", SqlDbType.Int).Value = CveCuentaDeposito .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With @@ -1603,7 +1603,7 @@ Public Class ClsGenerales .Add("@CveMoneda", SqlDbType.Int).Value = CveMoneda .Add("@RefCrediProveedor", SqlDbType.VarChar).Value = RefCrediProveedor .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico - .Add("@Correo", SqlDbType.VarChar).Value = Correo + .Add("@Correo", SqlDbType.VarChar).Value = Correo .Add("@BBVAAlias", SqlDbType.VarChar).Value = BBVAAlias .Add("@EstatusPagoElectronico", SqlDbType.Bit).Value = EstatusPagoElectronico .Add("@EstatusPagoElectronicoGrupos", SqlDbType.Bit).Value = EstatusPagoElectronicoGrupos @@ -1623,13 +1623,13 @@ Public Class ClsGenerales ' End If Catch ex As Exception - If ex.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then - OnError($"Ocurrió un error al Guardar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - Else - OnError("Ocurrió un error al Guardar la cuenta", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End If - - + If ex.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then + OnError($"Ocurrió un error al Guardar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + Else + OnError("Ocurrió un error al Guardar la cuenta", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End If + + End Try Return Retorno @@ -1638,13 +1638,13 @@ Public Class ClsGenerales Public Function RemoveCuentasDepositos(CveCuentaDeposito As Integer, CveEmpresa As Integer, CveUsuarioModifico As Integer) As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Gral_CuentasDepositosRemove") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveCuentaDeposito", SqlDbType.Int).Value = CveCuentaDeposito - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico - End With - + DataAdapter("PA_Gral_CuentasDepositosRemove") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveCuentaDeposito", SqlDbType.Int).Value = CveCuentaDeposito + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModifico + End With + Try SqlAdapter.Fill(Data) Retorno = True @@ -1659,15 +1659,15 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + Public Function UpdateCuentasDepositosPersonal(CveCuentaDeposito As Integer, BancoNombre As String, Cuenta As String, CLABE As String, CveMoneda As Integer, CveUsuarioModifico As Integer, EstatusPagoElectronico As Boolean, Estatus As Boolean, CveSATBanco As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_CuentasDepositosPersonalUpdate") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveCuentaDeposito", SqlDbType.Int).Value = CveCuentaDeposito + With SqlAdapter.SelectCommand.Parameters + .Add("@CveCuentaDeposito", SqlDbType.Int).Value = CveCuentaDeposito .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@BancoNombre", SqlDbType.VarChar).Value = BancoNombre .Add("@Cuenta", SqlDbType.VarChar).Value = Cuenta @@ -1686,35 +1686,35 @@ Public Class ClsGenerales Catch Ex1 As SqlException If Ex1.Message.Contains("Número: 2627;") Then Alert("Ya existe un registro con el mismo nombre", TipoMensaje.MsgAdvertencia) - ElseIf Ex1.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then - OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + ElseIf Ex1.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then + OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) Else Me.OnError("Ocurrió un error al guardar los cambios", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End If Catch ex As Exception - If ex.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then - OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - Else - OnError("Ocurrió un error al guardar los cambios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End If - - + If ex.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then + OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + Else + OnError("Ocurrió un error al guardar los cambios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End If + + End Try Return Retorno - End Function + End Function - Public Function UpdateCuentasDepositos(CveCuentaDeposito As Integer, BancoNombre As String, Plaza As String, Sucursal As String, Cuenta As String, CLABE As String, CIE As String, SWIFT As String, Referencia As String, - RefCrediProveedor As String, Predeterminada As Boolean, Estatus As Boolean, CveMoneda As Integer, CveEmpresa As Integer, Optional CveUsuarioModifico As Integer = -1, Optional Correo As String = "", + Public Function UpdateCuentasDepositos(CveCuentaDeposito As Integer, BancoNombre As String, Plaza As String, Sucursal As String, Cuenta As String, CLABE As String, CIE As String, SWIFT As String, Referencia As String, + RefCrediProveedor As String, Predeterminada As Boolean, Estatus As Boolean, CveMoneda As Integer, CveEmpresa As Integer, Optional CveUsuarioModifico As Integer = -1, Optional Correo As String = "", Optional BBVAAlias As String = "-1", Optional EstatusPagoElectronico As Boolean = False, Optional EstatusPagoElectronicoGrupos As Boolean = False, Optional CveSATBanco As Integer = -1, Optional ConceptoCIE As String = "-1") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_CuentasDepositosUpdate") - With SqlAdapter.SelectCommand.Parameters + With SqlAdapter.SelectCommand.Parameters .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@BancoNombre", SqlDbType.VarChar).Value = BancoNombre .Add("@Plaza", SqlDbType.VarChar).Value = Plaza @@ -1745,52 +1745,52 @@ Public Class ClsGenerales Retorno = True Catch Ex1 As SqlException If Ex1.Message.Contains("Número: 2627;") Then - Alert("Ya existe un registro con el mismo nombre", TipoMensaje.MsgAdvertencia) - ElseIf Ex1.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then + Alert("Ya existe un registro con el mismo nombre", TipoMensaje.MsgAdvertencia) + ElseIf Ex1.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) Else Me.OnError("Ocurrió un error al guardar los cambios", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End If - Catch ex As Exception - - If ex.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then - OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - Else - OnError("Ocurrió un error al guardar los cambios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End If + Catch ex As Exception + + If ex.Message.Contains("IX_Gral_CuentasDepositos_CLABE") Then + OnError($"Ocurrió un error al actualizar la cuenta, la CLABE {CLABE} ya esta registrada en otra cuenta.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + Else + OnError("Ocurrió un error al guardar los cambios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End If End Try Return Retorno - End Function - - Public Function UpdateCuentasDepositosEstatusPagoElectronicoGrupos(CveCuentaDeposito As Integer, EstatusPagoElectronicoGrupos As Integer, CveSATBanco As Integer, BBVAAlias As String, Referencia As String, ConceptoCIE As String) As Boolean - + End Function + + Public Function UpdateCuentasDepositosEstatusPagoElectronicoGrupos(CveCuentaDeposito As Integer, EstatusPagoElectronicoGrupos As Integer, CveSATBanco As Integer, BBVAAlias As String, Referencia As String, ConceptoCIE As String) As Boolean + Dim Retorno As Boolean = False DataAdapter("PA_Gral_CuentasDepositosUpdateEstatusPagoElectronicoGrupos") With SqlAdapter.SelectCommand.Parameters .Add("@CveCuentaDeposito", SqlDbType.VarChar).Value = CveCuentaDeposito - .Add("@EstatusPagoElectronicoGrupos", SqlDbType.Int).Value = EstatusPagoElectronicoGrupos - .Add("@CveSATBanco", SqlDbType.Int).Value = CveSATBanco - .Add("@BBVAAlias", SqlDbType.VarChar).Value = BBVAAlias - .Add("@Referencia", SqlDbType.VarChar).Value = Referencia - .Add("@ConceptoCIE", SqlDbType.VarChar).Value = ConceptoCIE - End With - - + .Add("@EstatusPagoElectronicoGrupos", SqlDbType.Int).Value = EstatusPagoElectronicoGrupos + .Add("@CveSATBanco", SqlDbType.Int).Value = CveSATBanco + .Add("@BBVAAlias", SqlDbType.VarChar).Value = BBVAAlias + .Add("@Referencia", SqlDbType.VarChar).Value = Referencia + .Add("@ConceptoCIE", SqlDbType.VarChar).Value = ConceptoCIE + End With + + Try SqlAdapter.Fill(Data) - Retorno = True + Retorno = True Catch ex As Exception OnError("Ocurrió un error al guardar los cambios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - + End Function + #End Region - + #Region "T I P O - C A M B I O" Public Function AddTipoCambio(TipoCambio As Double, Fecha As Date, Optional TipoCambioEuro As Double = 0, Optional TipoCambioFIX As Double = 0) As Boolean Dim Retorno As Boolean = False @@ -1815,7 +1815,7 @@ Public Class ClsGenerales Return Retorno - End Function + End Function Public Function GetTipoCambio(CveTipoCambio As Integer, Fecha As Date) As Boolean Dim Retorno = False @@ -1911,11 +1911,11 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "C l a s i f i c a c i o n e s C a r a c t e r i s t i c a s" - + Public Function AddClasificacionesCaracteristicas(CaracteristicaClasificacion As String, Orden As Integer, CveUsuario As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_CaracteristicasClasificacionesAdd") @@ -1996,12 +1996,12 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + #End Region - + #Region "C a r a c t e r í s t i c a s" - + Public Function GetCaracteristicasModulos() As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_CaracteristicasModuloGet") @@ -2255,9 +2255,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "O p c i o n e s" Public Function AddCaracteristicasOpciones(CaracteristicaOpcion As String, CveCaracteristica As Integer, Orden As Integer, Estatus As Boolean, CveUsuario As Integer) As Boolean Dim Retorno As Boolean = False @@ -2358,9 +2358,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "T I P O C U E N T A S E Q U I P O S" Public Function AddTipoCuentaEquipo(TipoCuentaEquipo As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False @@ -2447,9 +2447,9 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "C U E N T A S E Q U I P O S" Public Function AddCuentaEquipo(CveCliente As Integer, CveTipoCuentaEquipo As Integer, CuentaEquipo As String, NoSerie As String, CveClienteSucursal As Integer, CveUsuario As Integer, CveEmpresa As Integer, Optional CveCuentaEquipo As Integer = -1, Optional CveCuentaEquipoRelacionado As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -2622,17 +2622,17 @@ Public Class ClsGenerales End Try Return Retorno - End Function - - + End Function + + #End Region - + #Region "Bitacora" Public Function GetHistorialBitacora(CveAcarreo As Integer, CveOrdenCompra As Integer, CveActivoFijo As Integer, CveOS As Integer, CvePS As Integer, CveCompra As Integer, CveIE As Integer, CveEmpresa As Integer, Optional CveUsuario As Integer = -1, Optional CvePersonal As Integer = -1, Optional IdPoliza As Integer = -1, Optional CvePrePoliza As Integer = -1, Optional CvePeriodo As Integer = -1, Optional CveConceptoNomina As Integer = -1, Optional CvePromocion As Integer = -1, - Optional CveAsistencia As Integer = -1, Optional CveAsistenciaDetalle As Integer = -1, Optional CveTipoBitacora As Integer = -1, + Optional CveAsistencia As Integer = -1, Optional CveAsistenciaDetalle As Integer = -1, Optional CveTipoBitacora As Integer = -1, Optional FechaInicio As String = "", Optional FechaFin As String = "", Optional Fecha As Date = MinFecha) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_HistorialBitacoraGet") @@ -2651,18 +2651,18 @@ Public Class ClsGenerales .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@IdPoliza", SqlDbType.Int).Value = IdPoliza .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo - .Add("@CveConceptoNomina", SqlDbType.Int).Value = CveConceptoNomina - .Add("@CvePromocion", SqlDbType.Int).Value = CvePromocion - - - .Add("@CveAsistencia", SqlDbType.Int).Value = CveAsistencia - .Add("@CveAsistenciaDetalle", SqlDbType.Int).Value = CveAsistenciaDetalle - .Add("@CveTipoBitacora", SqlDbType.Int).Value = CveTipoBitacora - .Add("@FechaInicio", SqlDbType.VarChar).Value = FechaInicio - .Add("@FechaFin", SqlDbType.VarChar).Value = FechaFin - .Add("@Fecha", SqlDbType.Date).Value = Fecha - - + .Add("@CveConceptoNomina", SqlDbType.Int).Value = CveConceptoNomina + .Add("@CvePromocion", SqlDbType.Int).Value = CvePromocion + + + .Add("@CveAsistencia", SqlDbType.Int).Value = CveAsistencia + .Add("@CveAsistenciaDetalle", SqlDbType.Int).Value = CveAsistenciaDetalle + .Add("@CveTipoBitacora", SqlDbType.Int).Value = CveTipoBitacora + .Add("@FechaInicio", SqlDbType.VarChar).Value = FechaInicio + .Add("@FechaFin", SqlDbType.VarChar).Value = FechaFin + .Add("@Fecha", SqlDbType.Date).Value = Fecha + + End With 'SqlTypes.SqlDateTime.Null Try @@ -2702,7 +2702,8 @@ Public Class ClsGenerales CveActivoFijo As Integer, CveOS As Integer, CvePS As Integer, CveCompra As Integer, CveIE As Integer, Actual As String, Anterior As String, CveUsuario As Integer, CveEmpresa As Integer, SeElimino As Integer, Descripcion As String, Tipo As String, - Id_Clave As String, Optional IdPoliza As Integer = -1, Optional CvePromocion As Integer = -1, Optional CveUsuarioTabla As Integer = -1) As Boolean + Id_Clave As String, Optional IdPoliza As Integer = -1, Optional CvePromocion As Integer = -1, Optional CveUsuarioTabla As Integer = -1, + Optional CvePersonal As Integer = -1, Optional Motivo As String = "", Optional Fecha As String = "1900/01/01") As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_HistorialBitacoraAdd") @@ -2725,9 +2726,12 @@ Public Class ClsGenerales .Add("@Id_Clave", SqlDbType.VarChar, 100).Value = Id_Clave .Add("@IdPoliza", SqlDbType.Int).Value = IdPoliza .Add("@CvePromocion", SqlDbType.Int).Value = CvePromocion - .Add("@CveUsuarioTabla", SqlDbType.Int).Value = CveUsuarioTabla - - + .Add("@CveUsuarioTabla", SqlDbType.Int).Value = CveUsuarioTabla + .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal + .Add("@Motivo", SqlDbType.VarChar).Value = Motivo + .Add("@Fecha", SqlDbType.DateTime).Value = Fecha + + End With 'SqlTypes.SqlDateTime.Null Try @@ -2747,7 +2751,7 @@ Public Class ClsGenerales DataAdapter("PA_Gral_SAT_ProductosServiciosGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CodigoSAT", SqlDbType.VarChar).Value = CodigoSAT + .Add("@CodigoSAT", SqlDbType.VarChar).Value = CodigoSAT .Add("@SATClaveProductoServicio", SqlDbType.VarChar).Value = SATClaveProductoServicio .Add("@CveSATPS", SqlDbType.Int).Value = CveSATPS @@ -2798,10 +2802,10 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + #End Region - + #Region "SAT CFDI COMERCIO EXTERIOR" Public Function GetSATClavePedimento() As Boolean Dim Retorno As Boolean = False @@ -2928,9 +2932,9 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los municipios del SAT", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - - + End Function + + Public Function GetSATLocalidad(Optional CveEstado As Integer = -1, Optional CveMunicipio As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_SAT_LocalidadGet") @@ -2962,10 +2966,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener las colonias del SAT", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - + End Function + #End Region - + Public Function JAMComparativo(Opcion As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_JAM_Comparativo") @@ -2983,13 +2987,13 @@ Public Class ClsGenerales End Try Return Retorno - End Function - - + End Function + + Public Function GetSATObjetoImpuesto() As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Gral_SAT_ObjetosImpuestos") - + DataAdapter("PA_Gral_SAT_ObjetosImpuestos") + Try SqlAdapter.Fill(Data) If Data.Rows.Count > 0 Then @@ -3001,8 +3005,8 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + #Region "P A Q U E T E R I A S G U I A S" Public Function AddPaqueteriasGuias(CvePaqueteria As Integer, CvePaqueteriaGuiaTipo As Integer, CveEstatus As Integer, CveSubProyecto As Integer, Fecha As String, Rastreo As String, Guia As String, NumCajas As Integer, Peso As Double, Dimensiones As String, FechaEstimada As String, Observaciones As String, CveUsuario As Integer, CveEmpresa As Integer, Optional ImplicaCosto As Boolean = True, @@ -3055,8 +3059,8 @@ Public Class ClsGenerales Return Retorno End Function - Public Function GetPaqueteriasGuias(CvePaqueteriaGuia As Integer, CvePaqueteriaGuiaTipo As Integer, CvePaqueteria As Integer, CveEstatus As Integer, CveSubProyecto As Integer, - CveEmpresa As Integer, Guia As String, FechaInicio As String, FechaFin As String, Optional FechaIngInicio As String = "-1", + Public Function GetPaqueteriasGuias(CvePaqueteriaGuia As Integer, CvePaqueteriaGuiaTipo As Integer, CvePaqueteria As Integer, CveEstatus As Integer, CveSubProyecto As Integer, + CveEmpresa As Integer, Guia As String, FechaInicio As String, FechaFin As String, Optional FechaIngInicio As String = "-1", Optional FechaIngFin As String = "-1", Optional Filtro As Integer = -1, Optional CveUsuarioEntrega As Integer = -1, Optional EsEntregaInterna As Boolean = False) As Boolean @@ -3078,9 +3082,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) @@ -3090,8 +3094,8 @@ Public Class ClsGenerales End Try Return Retorno - End Function - + End Function + Public Function UpdatePaqueteriasGuias(CvePaqueteriaGuia As Integer, CvePaqueteriaGuiaTipo As Integer, CveSubProyecto As Integer, CvePaqueteria As Integer, CveEstatus As Integer, Fecha As String, Rastreo As String, Guia As String, NumCajas As Integer, Peso As Double, Dimensiones As String, FechaEstimada As String, Observaciones As String, Optional ImplicaCosto As Boolean = True) As Boolean Dim Retorno As Boolean = False @@ -3147,15 +3151,15 @@ Public Class ClsGenerales End Try Return Retorno - End Function - - Public Function GetEntregasPorRealizar(CveEmpresa As Integer, Optional CveAsignacionEntrega As Long = -1) As Boolean + End Function + + Public Function GetEntregasPorRealizar(CveEmpresa As Integer, Optional CveAsignacionEntrega As Long = -1) As Boolean Dim Retorno As Boolean = False 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) @@ -3164,17 +3168,17 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener entregas por realizar.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - - Public Function AsignarEntregasPorRealizar(CvePaqueteriaGuia As Integer, CvePersonal As Integer, Optional CveAsignacionEntrega As Long = -1, Optional CveMotivoRechazoPaqueteria As Integer = -1) As Boolean + Return Retorno + End Function + + Public Function AsignarEntregasPorRealizar(CvePaqueteriaGuia As Integer, CvePersonal As Integer, Optional CveAsignacionEntrega As Long = -1, Optional CveMotivoRechazoPaqueteria As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_AsignarEntregasPorRealizar") With SqlAdapter.SelectCommand.Parameters .Add("@CvePaqueteriaGuia", SqlDbType.Int).Value = CvePaqueteriaGuia .Add("@CveUsuarioAsignado", SqlDbType.Int).Value = CvePersonal .Add("@CveAsignacionEntrega", SqlDbType.BigInt).Value = CveAsignacionEntrega - .Add("@CveMotivoRechazoPaqueteria", SqlDbType.Int).Value = CveMotivoRechazoPaqueteria + .Add("@CveMotivoRechazoPaqueteria", SqlDbType.Int).Value = CveMotivoRechazoPaqueteria End With Try SqlAdapter.Fill(Data) @@ -3183,10 +3187,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al asignar entregas por realizar.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - - Public Function GetMotivoRechazoPaqueteria(CveMotivoRechazoPaqueteria As Integer, CveEmpresa As Integer) As Boolean + Return Retorno + End Function + + Public Function GetMotivoRechazoPaqueteria(CveMotivoRechazoPaqueteria As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("Gral_MotivoRechazoPaqueteriaGet") With SqlAdapter.SelectCommand.Parameters @@ -3200,10 +3204,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los motivos de rechazo de entrega", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - - Public Function AddMotivoRechazoPaqueteria(Descripcion As String, CveEmpresa As Integer) As Boolean + Return Retorno + End Function + + Public Function AddMotivoRechazoPaqueteria(Descripcion As String, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("Gral_MotivoRechazoPaqueteriaAdd") With SqlAdapter.SelectCommand.Parameters @@ -3217,10 +3221,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al agregar el motivos de rechazo de entrega", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - - Public Function RemoveMotivoRechazoPaqueteria(CveMotivoRechazoPaqueteria As Integer) As Boolean + Return Retorno + End Function + + Public Function RemoveMotivoRechazoPaqueteria(CveMotivoRechazoPaqueteria As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("Gral_MotivoRechazoPaqueteriaDelete") With SqlAdapter.SelectCommand.Parameters @@ -3233,10 +3237,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al eliminar el motivos de rechazo de entrega", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - - Public Function UpdateMotivoRechazoPaqueteria(CveMotivoRechazoPaqueteria As Integer, Optional Descripcion As String = "-1") As Boolean + Return Retorno + End Function + + Public Function UpdateMotivoRechazoPaqueteria(CveMotivoRechazoPaqueteria As Integer, Optional Descripcion As String = "-1") As Boolean Dim Retorno As Boolean = False DataAdapter("Gral_MotivoRechazoPaqueteriaUpdate") With SqlAdapter.SelectCommand.Parameters @@ -3250,10 +3254,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al modificar el motivos de rechazo de entrega", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function + Return Retorno + End Function #End Region - + #Region "P A Q U E T E R I A S G U I A S D E T A L L E S" Public Function AddPaqueteriasGuiasDetalles(CvePaqueteriaGuia As Integer, CveVenta As Integer, CveOC As Integer, CveMovimiento As Integer, Optional CveCompra As Integer = -1) As Boolean @@ -3340,11 +3344,11 @@ Public Class ClsGenerales End Try Return Retorno - End Function + End Function #End Region - + #Region "CLASIFICACIONES PORCENTAJE" - + Public Function GetClasificacionPorcentaje(CveEmpresa As Integer, Optional CveClasificacionPorcentaje As Integer = -1, Optional CveClasificacion As Integer = -1, Optional PorcentajeIVA As Double = -1, Optional Opcion As Integer = 1) As Boolean @@ -3420,13 +3424,13 @@ Public Class ClsGenerales OnError("Ocurrió un error al eliminar la clasificacion del porcentaje.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function - + End Function + #End Region - - + + #Region "C A R T A P O R T E" - + Public Function GetMaterialPeligroso() As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_CP_MaterialPeligrosoGet") @@ -3447,8 +3451,8 @@ Public Class ClsGenerales End Function Public Function GetEmbalajes() As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Gral_CP_EmbalajesGet") - + DataAdapter("PA_Gral_CP_EmbalajesGet") + Try SqlAdapter.Fill(Data) Retorno = True @@ -3456,11 +3460,11 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener embalajes.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function - + End Function + Public Function GetCartaPorteTipoPermisoSCT() As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Gral_CP_TipoPermisoSCTGet") + DataAdapter("PA_Gral_CP_TipoPermisoSCTGet") Try SqlAdapter.Fill(Data) Retorno = True @@ -3468,11 +3472,11 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los permisos de carta porte.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function - + End Function + Public Function GetCartaPorteConfigAutoTransportes() As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Gral_CP_ConfigAutoTransportesGet") + DataAdapter("PA_Gral_CP_ConfigAutoTransportesGet") Try SqlAdapter.Fill(Data) Retorno = True @@ -3480,12 +3484,12 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los configuración de autotransporte de carta porte.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function - - + End Function + + Public Function GetCartaPorteTiposRemolques() As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Gral_CP_TiposRemolqueGet") + DataAdapter("PA_Gral_CP_TiposRemolqueGet") Try SqlAdapter.Fill(Data) Retorno = True @@ -3493,13 +3497,13 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los tipos de remolque de carta porte.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function - + End Function + #End Region - - - - + + + + #Region "CRUD_Edoc_DocumentacionTipo" Public Function GetEdoc_DocumentacionTipo(CveDocumentacionTipo As Integer, CveEmpresa As Integer, Optional Estatus As Integer = -1, Optional EsCatalogo As Integer = 0, Optional Modulo As Integer = 1) As Boolean @@ -3580,23 +3584,23 @@ Public Class ClsGenerales Return retorno - End Function - + End Function + #End Region - - - - -#Region "" - - + + + + +#Region "" + + Public Function GetJAMCorveta(Opcion As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_JAM_Corteva") With SqlAdapter.SelectCommand.Parameters - .Add("@Opcion", SqlDbType.Int).Value = Opcion - + .Add("@Opcion", SqlDbType.Int).Value = Opcion + End With Try @@ -3608,23 +3612,23 @@ Public Class ClsGenerales Return Retorno - End Function - -#End Region - - - - - -#Region "CULTIVOS" - - + End Function + +#End Region + + + + + +#Region "CULTIVOS" + + Public Function GetCultivosCuadro(CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Agro_CultivosCuadroGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3636,18 +3640,18 @@ Public Class ClsGenerales Return Retorno - End Function - - - - + End Function + + + + Public Function GetTempordas(CveTemporada As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_AgroTemporadaGet") With SqlAdapter.SelectCommand.Parameters .Add("@cveTemporada", SqlDbType.Int).Value = CveTemporada - .Add("@cveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@cveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3659,9 +3663,9 @@ Public Class ClsGenerales Return Retorno - End Function - - + End Function + + Public Function UpdateCierreCultivos(CveCultivoCuadro As Integer, CvePrePoliza As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False @@ -3669,7 +3673,7 @@ Public Class ClsGenerales With SqlAdapter.SelectCommand.Parameters .Add("@CveCultivoCuadro", SqlDbType.Int).Value = CveCultivoCuadro .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3681,8 +3685,8 @@ Public Class ClsGenerales Return Retorno - End Function - + End Function + Public Function GetCierreCultivos(CveTemporada As Integer, CveSubProyecto As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False @@ -3690,7 +3694,7 @@ Public Class ClsGenerales With SqlAdapter.SelectCommand.Parameters .Add("@CveTemporada", SqlDbType.Int).Value = CveTemporada .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3702,21 +3706,21 @@ Public Class ClsGenerales Return Retorno - End Function - - -#End Region - - - - - - + End Function + + +#End Region + + + + + + #Region " P O L I Z A V I R T U A L " Public Function ModelosAutosGet(Estatus As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_ModelosAutosGet") - With SqlAdapter.SelectCommand.Parameters + With SqlAdapter.SelectCommand.Parameters .Add("@Estatus", SqlDbType.Int).Value = Estatus .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa @@ -3773,50 +3777,50 @@ Public Class ClsGenerales OnError("Ocurrió un error al obtener los BCI de Usados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function + End Function #End Region - - - - -#Region "GRAL TIMBRES" - - - Public Function AddGralTimbre(TipoDocto As String, CveSubProyecto As Integer, Fecha As DateTime, CveUsuario As Integer, CveEmpresa As Integer, + + + + +#Region "GRAL TIMBRES" + + + Public Function AddGralTimbre(TipoDocto As String, CveSubProyecto As Integer, Fecha As DateTime, CveUsuario As Integer, CveEmpresa As Integer, Optional Serie As String = "-1", Optional Folio As Integer = -1, Optional Estatus As Integer = 0, Optional CveEntregaAlmacen As Integer = -1, Optional AplicaCP As Boolean = False, Optional CveVenta As Integer = -1) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Gral_TimbreAdd") - With SqlAdapter.SelectCommand.Parameters - - .Add("@TipoDocto", SqlDbType.VarChar).Value = TipoDocto - .Add("@Serie", SqlDbType.VarChar).Value = Serie - .Add("@Folio", SqlDbType.Int).Value = Folio - .Add("@Fecha", SqlDbType.DateTime).Value = Fecha - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@Estatus", SqlDbType.Int).Value = Estatus - .Add("@AplicaCP", SqlDbType.Bit).Value = AplicaCP - .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen - .Add("@CveSubProyectoOrigen", SqlDbType.Int).Value = CveSubProyecto - .Add("@CveVenta", SqlDbType.Int).Value = CveVenta - - .Add("@CveTimbre", SqlDbType.Int).Direction = ParameterDirection.Output + With SqlAdapter.SelectCommand.Parameters + + .Add("@TipoDocto", SqlDbType.VarChar).Value = TipoDocto + .Add("@Serie", SqlDbType.VarChar).Value = Serie + .Add("@Folio", SqlDbType.Int).Value = Folio + .Add("@Fecha", SqlDbType.DateTime).Value = Fecha + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@Estatus", SqlDbType.Int).Value = Estatus + .Add("@AplicaCP", SqlDbType.Bit).Value = AplicaCP + .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen + .Add("@CveSubProyectoOrigen", SqlDbType.Int).Value = CveSubProyecto + .Add("@CveVenta", SqlDbType.Int).Value = CveVenta + + .Add("@CveTimbre", SqlDbType.Int).Direction = ParameterDirection.Output .Add("@FolioInsertado", SqlDbType.Int).Direction = ParameterDirection.Output .Add("@SerieInsertada", SqlDbType.VarChar, 5).Direction = ParameterDirection.Output End With Try - SqlAdapter.Fill(Data) - - FolioInsertado = SqlAdapter.SelectCommand.Parameters("@FolioInsertado").Value.ToString.ToEntero - SerieInsertada = SqlAdapter.SelectCommand.Parameters("@SerieInsertada").Value.ToString - - Retorno = SqlAdapter.SelectCommand.Parameters("@CveTimbre").Value.ToString.ToEntero - + SqlAdapter.Fill(Data) + + FolioInsertado = SqlAdapter.SelectCommand.Parameters("@FolioInsertado").Value.ToString.ToEntero + SerieInsertada = SqlAdapter.SelectCommand.Parameters("@SerieInsertada").Value.ToString + + Retorno = SqlAdapter.SelectCommand.Parameters("@CveTimbre").Value.ToString.ToEntero + Catch ex As Exception OnError("Ocurrió un error al agregar el timbre", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try @@ -3830,12 +3834,12 @@ Public Class ClsGenerales With SqlAdapter.SelectCommand.Parameters .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre .Add("@TipoDocto", SqlDbType.VarChar).Value = TipoDocto - .Add("@FechaI", SqlDbType.Date).Value = FechaI + .Add("@FechaI", SqlDbType.Date).Value = FechaI .Add("@FechaF", SqlDbType.Date).Value = FechaF .Add("@Estatus", SqlDbType.Int).Value = Estatus - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveMovimiento", SqlDbType.Int).Value = CveMovimiento - .Add("@CveVenta", SqlDbType.Int).Value = CveVenta + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveMovimiento", SqlDbType.Int).Value = CveMovimiento + .Add("@CveVenta", SqlDbType.Int).Value = CveVenta End With Try @@ -3856,12 +3860,12 @@ Public Class ClsGenerales With SqlAdapter.SelectCommand.Parameters .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre - .Add("@FolioFiscal", SqlDbType.VarChar).Value = FolioFiscal - .Add("@Fecha", SqlDbType.DateTime).Value = Fecha - .Add("@CvePAC", SqlDbType.Int).Value = CvePAC - .Add("@CDFIVersion", SqlDbType.VarChar).Value = CFDIVersion - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@FolioFiscal", SqlDbType.VarChar).Value = FolioFiscal + .Add("@Fecha", SqlDbType.DateTime).Value = Fecha + .Add("@CvePAC", SqlDbType.Int).Value = CvePAC + .Add("@CDFIVersion", SqlDbType.VarChar).Value = CFDIVersion + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3871,8 +3875,8 @@ Public Class ClsGenerales OnError("Ocurrió un error al actualizar el timbrado", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - + End Function + Public Function CancelarTimbreTimbrado(CveTimbre As Integer, FechaCancelacion As DateTime, CvePACCancelacion As Integer, SelloCancelacion As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_TimbreTimbradoCancelar") @@ -3880,11 +3884,11 @@ Public Class ClsGenerales With SqlAdapter.SelectCommand.Parameters .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre - .Add("@FechaCancelacion", SqlDbType.DateTime).Value = FechaCancelacion - .Add("@CvePACCancelacion", SqlDbType.Int).Value = CvePACCancelacion - .Add("@SelloCancelacion", SqlDbType.VarChar).Value = SelloCancelacion - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@FechaCancelacion", SqlDbType.DateTime).Value = FechaCancelacion + .Add("@CvePACCancelacion", SqlDbType.Int).Value = CvePACCancelacion + .Add("@SelloCancelacion", SqlDbType.VarChar).Value = SelloCancelacion + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3894,10 +3898,10 @@ Public Class ClsGenerales OnError("Ocurrió un error al actualizar el timbrado", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - - - + End Function + + + Public Function RemoveGralTimbre(CveTimbre As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_TimbreRemove") @@ -3914,11 +3918,11 @@ Public Class ClsGenerales OnError("Ocurrió un error al eliminar Timbre", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - - Public Function GetGralMovimientosDetalleTimbre(CveTimbre As Integer, CveEmpresa As Integer) As Boolean - - + End Function + + Public Function GetGralMovimientosDetalleTimbre(CveTimbre As Integer, CveEmpresa As Integer) As Boolean + + Dim Retorno As Boolean = False DataAdapter("PA_Gral_MovimientosDetalleTimbreGet") @@ -3932,277 +3936,277 @@ Public Class ClsGenerales Retorno = True Catch ex As Exception OnError("Ocurrió un error al obtener los movimientos del timbre", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - - Return Retorno - - End Function - - Public Function AddInvEntregaAlmacenRuta(CveSubProyecto As Integer, CveDireccionOrigen As Integer, CveDireccionDestino As Integer, CveMovimientoAlmacen As Integer, CveChofer As Integer, CveCamion As Integer, FechaEntrega As Date, FechaLlegada As DateTime, Tipo As String, - FolioReferencia As String, Referencia As String, FechaLimite As Date, Orden As Integer, Estatus As Integer, Distancia As Integer, Optional CveConfigAutoTransporte As Integer = -1, + End Try + + Return Retorno + + End Function + + Public Function AddInvEntregaAlmacenRuta(CveSubProyecto As Integer, CveDireccionOrigen As Integer, CveDireccionDestino As Integer, CveMovimientoAlmacen As Integer, CveChofer As Integer, CveCamion As Integer, FechaEntrega As Date, FechaLlegada As DateTime, Tipo As String, + FolioReferencia As String, Referencia As String, FechaLimite As Date, Orden As Integer, Estatus As Integer, Distancia As Integer, Optional CveConfigAutoTransporte As Integer = -1, Optional CveCamionRemolque1 As Integer = -1, Optional CveCamionRemolque2 As Integer = -1, Optional CveCliente As Integer = -1) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Inv_EntregaAlmacenRutaAdd") - With SqlAdapter.SelectCommand.Parameters - - .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - .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("@FechaLlegada", SqlDbType.DateTime).Value = FechaLlegada - .Add("@Tipo", SqlDbType.VarChar).Value = Tipo - .Add("@Orden", SqlDbType.Int).Value = Orden - .Add("@FolioReferencia", SqlDbType.VarChar).Value = FolioReferencia - .Add("@Referencia", SqlDbType.VarChar).Value = Referencia - .Add("@Estatus", SqlDbType.VarChar).Value = Estatus - .Add("@Distancia", SqlDbType.Int).Value = Distancia - - .Add("@FechaLimite", SqlDbType.DateTime).Value = FechaLimite - - .Add("@CveCamionRemolque1", SqlDbType.Int).Value = CveCamionRemolque1 - .Add("@CveCamionRemolque2", SqlDbType.Int).Value = CveCamionRemolque2 - .Add("@CveConfigAutoTransporte", SqlDbType.Int).Value = CveConfigAutoTransporte - .Add("@CveCliente", SqlDbType.Int).Value = CveCliente - - .Add("@CveEntregaAlmacen", SqlDbType.Int).Direction = ParameterDirection.Output + With SqlAdapter.SelectCommand.Parameters + + .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto + .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("@FechaLlegada", SqlDbType.DateTime).Value = FechaLlegada + .Add("@Tipo", SqlDbType.VarChar).Value = Tipo + .Add("@Orden", SqlDbType.Int).Value = Orden + .Add("@FolioReferencia", SqlDbType.VarChar).Value = FolioReferencia + .Add("@Referencia", SqlDbType.VarChar).Value = Referencia + .Add("@Estatus", SqlDbType.VarChar).Value = Estatus + .Add("@Distancia", SqlDbType.Int).Value = Distancia + + .Add("@FechaLimite", SqlDbType.DateTime).Value = FechaLimite + + .Add("@CveCamionRemolque1", SqlDbType.Int).Value = CveCamionRemolque1 + .Add("@CveCamionRemolque2", SqlDbType.Int).Value = CveCamionRemolque2 + .Add("@CveConfigAutoTransporte", SqlDbType.Int).Value = CveConfigAutoTransporte + .Add("@CveCliente", SqlDbType.Int).Value = CveCliente + + .Add("@CveEntregaAlmacen", SqlDbType.Int).Direction = ParameterDirection.Output End With Try - SqlAdapter.Fill(Data) - Retorno = SqlAdapter.SelectCommand.Parameters("@CveEntregaAlmacen").Value.ToString.ToEntero + 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 - + 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, - Optional FechaLlegada As DateTime = MinFecha, Optional CveCamionRemolque1 As Integer = -1, Optional CveCamionRemolque2 As Integer = -1, Optional Distancia As Integer = -1, + Optional FechaLlegada As DateTime = MinFecha, Optional CveCamionRemolque1 As Integer = -1, Optional CveCamionRemolque2 As Integer = -1, Optional Distancia As Integer = -1, Optional CveConfigAutoTransporte As Integer = -1, Optional FolioReferencia As String = "-1", Optional Referencia As String = "-1", Optional CveSubProyecto As Integer = -1) As Boolean - Dim Retorno As Boolean = False + 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 - - .Add("@FechaLlegada", SqlDbType.DateTime).Value = FechaLlegada - .Add("@CveCamionRemolque1", SqlDbType.Int).Value = CveCamionRemolque1 - .Add("@CveCamionRemolque2", SqlDbType.Int).Value = CveCamionRemolque2 - .Add("@Distancia", SqlDbType.Int).Value = Distancia - .Add("@CveConfigAutoTransporte", SqlDbType.Int).Value = CveConfigAutoTransporte - .Add("@FolioReferencia", SqlDbType.VarChar).Value = FolioReferencia - .Add("@Referencia", SqlDbType.VarChar).Value = Referencia - .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - + 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 + + .Add("@FechaLlegada", SqlDbType.DateTime).Value = FechaLlegada + .Add("@CveCamionRemolque1", SqlDbType.Int).Value = CveCamionRemolque1 + .Add("@CveCamionRemolque2", SqlDbType.Int).Value = CveCamionRemolque2 + .Add("@Distancia", SqlDbType.Int).Value = Distancia + .Add("@CveConfigAutoTransporte", SqlDbType.Int).Value = CveConfigAutoTransporte + .Add("@FolioReferencia", SqlDbType.VarChar).Value = FolioReferencia + .Add("@Referencia", SqlDbType.VarChar).Value = Referencia + .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto + End With Try - SqlAdapter.Fill(Data) - Retorno = True + 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 - + End Function + Public Function AsignaEntregaAlmacenRuta(CveCamion As Integer, CveChofer As Integer, FechaEntrega As Date, FechaLlegada As DateTime, CveEntregaAlmacen As Integer, CveEmpresa As Integer) As Boolean - Dim Retorno As Boolean = False + Dim Retorno As Boolean = False DataAdapter("PA_Inv_EntregaAlmacenRutaAsignar") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveCamion", SqlDbType.Int).Value = CveCamion - .Add("@CveChofer", SqlDbType.Int).Value = CveChofer - .Add("@FechaEntrega", SqlDbType.DateTime).Value = FechaEntrega - .Add("@FechaLlegada", SqlDbType.DateTime).Value = FechaLlegada - .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - + With SqlAdapter.SelectCommand.Parameters + .Add("@CveCamion", SqlDbType.Int).Value = CveCamion + .Add("@CveChofer", SqlDbType.Int).Value = CveChofer + .Add("@FechaEntrega", SqlDbType.DateTime).Value = FechaEntrega + .Add("@FechaLlegada", SqlDbType.DateTime).Value = FechaLlegada + .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With Try - SqlAdapter.Fill(Data) - Retorno = True + 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, FechaInicio As Date, FechaFin As Date, CveEmpresa As Integer, Opcion As Integer, Optional Estatus As Integer = -1) As Boolean - - Dim Retorno As Boolean = False - + End Function + + Public Function GetInvEntregaAlmacenRuta(CveSubProyecto As Integer, FechaInicio As Date, FechaFin As Date, CveEmpresa As Integer, Opcion As Integer, Optional Estatus As Integer = -1) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_EntregaAlmacenRutaGet") - With SqlAdapter.SelectCommand.Parameters - - .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - .Add("@FechaInicio", SqlDbType.Date).Value = FechaInicio - .Add("@FechaFin", SqlDbType.Date).Value = FechaFin - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@Opcion", SqlDbType.Int).Value = Opcion - .Add("@Estatus", SqlDbType.Int).Value = Estatus - + With SqlAdapter.SelectCommand.Parameters + + .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto + .Add("@FechaInicio", SqlDbType.Date).Value = FechaInicio + .Add("@FechaFin", SqlDbType.Date).Value = FechaFin + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@Opcion", SqlDbType.Int).Value = Opcion + .Add("@Estatus", SqlDbType.Int).Value = Estatus + End With Try - SqlAdapter.Fill(Data) - Retorno = True + 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 - - - - Public Function RemoveInvEntregaAlmacenRuta(CveEntregaAlmacen As Integer, CveEmpresa As Integer) As Boolean - - Dim Retorno As Boolean = False - + End Function + + + + Public Function RemoveInvEntregaAlmacenRuta(CveEntregaAlmacen As Integer, CveEmpresa As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_EntregaAlmacenRutaRemove") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try - SqlAdapter.Fill(Data) - Retorno = True + SqlAdapter.Fill(Data) + Retorno = True Catch ex As Exception OnError("Ocurrió un error al eliminar la entregas o Recolección", 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, CveUsuario As Integer, Optional CveTimbre As Integer = -1) As Boolean - - Dim Retorno As Boolean = False - + End Function + + + Public Function GetInvEntregaAlmacenRutaRep(CveSubProyecto As Integer, CveEmpresa As Integer, Estatus As Integer, FechaInicio As Date, FechaFin As Date, CveChofer As Integer, CveUsuario As Integer, Optional CveTimbre As Integer = -1) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_EntregaAlmacenRutaRepGet2") - 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 - .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + 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 + .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario End With Try - SqlAdapter.Fill(Data) - Retorno = True + 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 - - - - Public Function AddEntregaAlmacenRutaDetalle(CveEntregaAlmacen As Integer, CvePS As Integer, Cantidad As Decimal, CveUnidadMedida As Integer, CveUsuario As Integer, Optional PesoKg As Decimal = -1D) As Boolean - - - Dim Retorno As Boolean = False - + End Function + + + + Public Function AddEntregaAlmacenRutaDetalle(CveEntregaAlmacen As Integer, CvePS As Integer, Cantidad As Decimal, CveUnidadMedida As Integer, CveUsuario As Integer, Optional PesoKg As Decimal = -1D) As Boolean + + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_EntregaAlmacenRutaDetalleAdd") - With SqlAdapter.SelectCommand.Parameters - - .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen - .Add("@CvePS", SqlDbType.Int).Value = CvePS - .Add("@Cantidad", SqlDbType.Float).Value = Cantidad - .Add("@CveUnidadMedida", SqlDbType.Int).Value = CveUnidadMedida - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario - .Add("@PesoKg", SqlDbType.SmallMoney).Value = PesoKg - + With SqlAdapter.SelectCommand.Parameters + + .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen + .Add("@CvePS", SqlDbType.Int).Value = CvePS + .Add("@Cantidad", SqlDbType.Float).Value = Cantidad + .Add("@CveUnidadMedida", SqlDbType.Int).Value = CveUnidadMedida + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@PesoKg", SqlDbType.SmallMoney).Value = PesoKg + End With Try - SqlAdapter.Fill(Data) - Retorno = True + SqlAdapter.Fill(Data) + Retorno = True Catch ex As Exception OnError("Ocurrió un error al agregar el detalle de recolección", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - - - - Public Function RemoveEntregaAlmacenRutaDetalle(CveEntregaAlmacenDetalle As Integer) As Boolean - - - Dim Retorno As Boolean = False - + End Function + + + + Public Function RemoveEntregaAlmacenRutaDetalle(CveEntregaAlmacenDetalle As Integer) As Boolean + + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_EntregaAlmacenRutaDetalleRemove") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveEntregaAlmacenDetalle", SqlDbType.Int).Value = CveEntregaAlmacenDetalle + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEntregaAlmacenDetalle", SqlDbType.Int).Value = CveEntregaAlmacenDetalle End With Try - SqlAdapter.Fill(Data) - Retorno = True + SqlAdapter.Fill(Data) + Retorno = True Catch ex As Exception OnError("Ocurrió un error al eliminar el detalle de recolección", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - - - Public Function GetEntregaAlmacenRutaDetalle(CveEntregaAlmacen As Integer) As Boolean - - Dim Retorno As Boolean = False - + End Function + + + Public Function GetEntregaAlmacenRutaDetalle(CveEntregaAlmacen As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_EntregaAlmacenRutaDetalleGet") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen End With Try - SqlAdapter.Fill(Data) - Retorno = True + SqlAdapter.Fill(Data) + Retorno = True Catch ex As Exception OnError("Ocurrió un error al obtener el detalle de recolección", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno - End Function - - -#End Region - - + End Function + + +#End Region + + Public Function GetMediosTransporte(CveOrigen As Integer, Estatus As Boolean, CveEmpresa As Integer, CveTipoNomina As Integer, CveSubProyecto As Integer, Tipo As Integer, GPO As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Agro_OrigenGet") With SqlAdapter.SelectCommand.Parameters - .Add("@CveOrigen", SqlDbType.Int).Value = CveOrigen - .Add("@Estatus", SqlDbType.Bit).Value = Estatus - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@CveTipoNomina", SqlDbType.Int).Value = CveTipoNomina - .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - .Add("@Tipo", SqlDbType.Int).Value = Tipo - .Add("@GPO", SqlDbType.Int).Value = GPO + .Add("@CveOrigen", SqlDbType.Int).Value = CveOrigen + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveTipoNomina", SqlDbType.Int).Value = CveTipoNomina + .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto + .Add("@Tipo", SqlDbType.Int).Value = Tipo + .Add("@GPO", SqlDbType.Int).Value = GPO End With Try @@ -4212,16 +4216,16 @@ Public Class ClsGenerales OnError($"Ocurrió un error al obtener los medios de transporte.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - + Return Retorno + End Function + Public Function GetFolioFechaCancelacion(CveEmpresa As Integer, Tipo As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_FolioFechaCancelacionGet") - With SqlAdapter.SelectCommand.Parameters - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@Tipo", SqlDbType.Int).Value = Tipo + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@Tipo", SqlDbType.Int).Value = Tipo End With Try @@ -4231,10 +4235,10 @@ Public Class ClsGenerales OnError($"Ocurrió un error al obtener los datos de fechas de cancelación.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try - Return Retorno - End Function - - + Return Retorno + End Function + + #Region "C I T R I C O S" Public Function GetTipoOrganicos(Optional CveEmpresa As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -4260,10 +4264,10 @@ Public Class ClsGenerales DataAdapter("PA_Gral_TipoOrganicosAdd") With SqlAdapter.SelectCommand.Parameters - .Add("@TipoOrganico", SqlDbType.VarChar).Value = TipoOrganico - .Add("@Estatus", SqlDbType.Bit).Value = Estatus - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@TipoOrganico", SqlDbType.VarChar).Value = TipoOrganico + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -4355,10 +4359,10 @@ Public Class ClsGenerales DataAdapter("PA_Gral_EmpacadosAdd") With SqlAdapter.SelectCommand.Parameters - .Add("@TipoEmpacado", SqlDbType.VarChar).Value = TipoEmpacado - .Add("@Estatus", SqlDbType.Bit).Value = Estatus - .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@TipoEmpacado", SqlDbType.VarChar).Value = TipoEmpacado + .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -4425,22 +4429,22 @@ Public Class ClsGenerales End Try Return Retorno - End Function -#End Region - + End Function +#End Region + #Region "IDisposable Support" - - - ' IDisposable + + + ' IDisposable Protected Overridable Sub Dispose(disposing As Boolean) If Not Me.disposedValue Then - If disposing Then - ' TODO: dispose managed state (managed objects). - If Not Data Is Nothing Then Data.Dispose() : Data = Nothing - If Not SqlAdapter Is Nothing Then SqlAdapter.Dispose() : SqlAdapter = Nothing - If Not SqlCommand Is Nothing Then SqlCommand.Dispose() : SqlCommand = Nothing - If Not SqlTransacc Is Nothing Then SqlTransacc.Dispose() : SqlTransacc = Nothing - If SqlConexion.State <> ConnectionState.Closed Then SqlConexion.Close() + If disposing Then + ' TODO: dispose managed state (managed objects). + If Not Data Is Nothing Then Data.Dispose() : Data = Nothing + If Not SqlAdapter Is Nothing Then SqlAdapter.Dispose() : SqlAdapter = Nothing + If Not SqlCommand Is Nothing Then SqlCommand.Dispose() : SqlCommand = Nothing + If Not SqlTransacc Is Nothing Then SqlTransacc.Dispose() : SqlTransacc = Nothing + If SqlConexion.State <> ConnectionState.Closed Then SqlConexion.Close() If Not SqlConexion Is Nothing Then SqlConexion.Dispose() : SqlConexion = Nothing End If @@ -4449,20 +4453,20 @@ Public Class ClsGenerales ' TODO: set large fields to null. End If Me.disposedValue = True - End Sub - - - - ' This code added by Visual Basic to correctly implement the disposable pattern. + End Sub + + + + ' This code added by Visual Basic to correctly implement the disposable pattern. Public Sub Dispose() Implements IDisposable.Dispose ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. ConexionClose() Dispose(True) GC.SuppressFinalize(Me) - End Sub -#End Region - - + End Sub +#End Region + + End Class diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index a86c1393f..87bb5d529 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -5629,7 +5629,7 @@ Public Class ClsInventarios Public Function AddCamiones(Placa As String, Especificacion As String, CveEmpresa As Integer, CveConfigAutoTransporte As Integer, Anio As Integer, CveTipoPermisoSCT As Integer, NumPermisoSCT As String, NombreAseguradora As String, NumPolizaSeguro As String, CveUsuario As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = 1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", - Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False) As Boolean + Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesAdd") @@ -5656,6 +5656,7 @@ Public Class ClsInventarios .Add("@CAAT", SqlDbType.VarChar).Value = CAAT .Add("@NumeroTrailer", SqlDbType.VarChar).Value = NumeroTrailer .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor End With Try SqlAdapter.Fill(Data) @@ -5689,7 +5690,7 @@ Public Class ClsInventarios Public Function UpdateCamiones(CveCamion As Integer, Placa As String, Especificacion As String, CveConfigAutoTransporte As Integer, Anio As Integer, CveTipoPermisoSCT As Integer, NumPermisoSCT As String, NombreAseguradora As String, NumPolizaSeguro As String, CveUsuario As Integer, CveEmpresa As Integer, NombreAseguradoraMedioAmbiente As String, NumPolizaSeguroMedioAmbiente As String, NombreAseguradoraCarga As String, NumPolizaSeguroCarga As String, Optional CveTipoCamion As Integer = -1, Optional LongitudCaja As String = "", Optional LineaTransportacion As String = "", Optional SCAC As String = "", Optional CAAT As String = "", - Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False) As Boolean + Optional CveTipoRemolque As Integer = -1, Optional NumeroTrailer As String = "", Optional Estatus As Boolean = False, Optional CveProveedor As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_CamionesUpdate") With SqlAdapter.SelectCommand.Parameters @@ -5716,6 +5717,7 @@ Public Class ClsInventarios .Add("@CAAT", SqlDbType.VarChar).Value = CAAT .Add("@NumeroTrailer", SqlDbType.VarChar).Value = NumeroTrailer .Add("@Estatus", SqlDbType.Bit).Value = Estatus + .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor End With Try SqlAdapter.Fill(Data) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index d1728e4ba..d0cf74241 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -609,6 +609,24 @@ Public Class ClsNominas End Try Return retorno End Function + Public Function CalculosISRAguinaldo(fraccionII_1 As Decimal, salariomensual As Decimal, diasmes As Int32, ejercicio As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Nom_CalculosISRAguinaldo", CommandType.StoredProcedure) + addParameters("@FraccionII_1", SqlDbType.Money, fraccionII_1) + addParameters("@salariomensual", SqlDbType.Money, salariomensual) + addParameters("@Diasmes", SqlDbType.Money, diasmes) + addParameters("@Ejercicio", SqlDbType.Int, ejercicio) + retorno = RunQuery("Ocurrió un error al obtener el Calculo ISR Aguinaldo.") + Return retorno + End Function + Public Function UMAFechaGet(cveempresa As Integer, fecha As String) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Nom_UMAFechaGet", CommandType.StoredProcedure) + addParameters("@cveempresa", SqlDbType.Int, cveempresa) + addParameters("@Fecha", SqlDbType.VarChar, fecha) + retorno = RunQuery("Ocurrió un error al obtener el valor de la UMA.") + Return retorno + End Function Public Function GetDispersionnomina(CvePeriodo As Int32, CveEmpresa As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Nom_Dispersionnomina", CommandType.StoredProcedure) @@ -2294,7 +2312,26 @@ Public Class ClsNominas End Function #End Region - Public Function ValidaFechaFinPersonal(CvePersonal As Integer, CveEmpresa As Integer, FechaFin As String) + Public Function AgroValidacionNomGet(cveValidacionNomina As Int32, cveEmpresa As Int32, CveUsuario As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Agro_ValidacionNomGet", CommandType.StoredProcedure) + addParameters("@CveValidacionNomina", SqlDbType.Int, cveValidacionNomina) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@CveUsuario", SqlDbType.Int, CveUsuario) + retorno = RunQuery("Ocurrió un error al obtener el PA_Agro_ValidacionNomGet.") + Return retorno + End Function + Public Function ConceptosCveSistemaUp(cveConcepto As Int32, cveSistema As Int32, cveUsuario As Int32, cveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Nom_ConceptosCveSistemaUp", CommandType.StoredProcedure) + addParameters("@CveConcepto", SqlDbType.Int, cveConcepto) + addParameters("@CveSistema", SqlDbType.Int, cveSistema) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al obtener el PA_Nom_ConceptosCveSistemaUp.") + Return retorno + End Function + Public Function ValidaFechaFinPersonal(CvePersonal As Integer, CveEmpresa As Integer, FechaFin As String) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Nom_ValidaFechaFinPersonal") With SqlAdapter.SelectCommand.Parameters diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 7cd0e04ae..d1ba33607 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -542,10 +542,17 @@ Public Class ClsPaginas End Property Property GlobalDTNomConceptosFunciones() As DataTable Get - GlobalDTNomConceptosFunciones = DirectCast(Application("GlobalDTNomConceptosFunciones"), DataTable) + Dim AppNombre As String = "GlobalDTNomConceptosFunciones" + If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetConceptosFunciones() Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + GlobalDTNomConceptosFunciones = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTNomConceptosFunciones") = value + Dim AppNombre As String = "GlobalDTNomConceptosFunciones" + HttpContext.Current.Application(AppNombre) = value End Set End Property Property GlobalDTUsuarioResponsable(CveEmpresa As Integer) As DataTable @@ -697,18 +704,32 @@ Public Class ClsPaginas End Property Property GlobalDTNomSatBancos() As DataTable Get - GlobalDTNomSatBancos = DirectCast(Application("GlobalDTNomSatBancos"), DataTable) + Dim AppNombre As String = "GlobalDTNomSatBancos" + If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetBancos() Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + GlobalDTNomSatBancos = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) End Get - Set(ByVal value As DataTable) - Application("GlobalDTNomSatBancos") = value + Set(value As DataTable) + Dim AppNombre As String = "GlobalDTNomSatBancos" + HttpContext.Current.Application(AppNombre) = value End Set End Property Property GlobalDTNomSatConceptos() As DataTable Get - GlobalDTNomSatConceptos = DirectCast(Application("GlobalDTNomSatConceptos"), DataTable) + Dim AppNombre As String = "GlobalDTNomSatConceptos" + If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetConceptos() Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + GlobalDTNomSatConceptos = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) End Get - Set(ByVal value As DataTable) - Application("GlobalDTNomSatConceptos") = value + Set(value As DataTable) + Dim AppNombre As String = "GlobalDTNomSatConceptos" + HttpContext.Current.Application(AppNombre) = value End Set End Property Property GlobalDTNomSatRegimenContratacion() As DataTable @@ -753,18 +774,32 @@ Public Class ClsPaginas End Property Property GlobalDTNomSatRiesgoPuesto() As DataTable Get - GlobalDTNomSatRiesgoPuesto = DirectCast(Application("GlobalDTNomSatRiesgoPuesto"), DataTable) + Dim AppNombre As String = "GlobalDTNomSatRiesgoPuesto" + If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetRiesgoPuesto() Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + GlobalDTNomSatRiesgoPuesto = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) End Get - Set(ByVal value As DataTable) - Application("GlobalDTNomSatRiesgoPuesto") = value + Set(value As DataTable) + Dim AppNombre As String = "GlobalDTNomSatRiesgoPuesto" + HttpContext.Current.Application(AppNombre) = value End Set End Property Property GlobalDTNomSatTipoIncapacidad() As DataTable Get - GlobalDTNomSatTipoIncapacidad = DirectCast(Application("GlobalDTNomSatTipoIncapacidad"), DataTable) + Dim AppNombre As String = "GlobalDTNomSatTipoIncapacidad" + If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetTipoIncapacidad() Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + GlobalDTNomSatTipoIncapacidad = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) End Get - Set(ByVal value As DataTable) - Application("GlobalDTNomSatTipoIncapacidad") = value + Set(value As DataTable) + Dim AppNombre As String = "GlobalDTNomSatTipoIncapacidad" + HttpContext.Current.Application(AppNombre) = value End Set End Property 'Este GlobalDT no debe segmentarse por empresas, puesto que es para todas las empresas @@ -1904,7 +1939,7 @@ Public Class ClsPaginas Public Shared Property GlobalDTTipoCuenta() As DataTable Get Dim AppNombre As String = "GlobalDTTipoCuenta" - If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then + If HttpContext.Current.Application(AppNombre) Is Nothing Then Dim ObjBancos As New ClsBancos If ObjBancos.GetBancos_TiposCuenta() Then HttpContext.Current.Application(AppNombre) = ObjBancos.DtResultados ObjBancos.Dispose() @@ -1921,30 +1956,45 @@ Public Class ClsPaginas 'TipoPerioso Property GlobalDTTipoPeriodo() As DataTable Get - GlobalDTTipoPeriodo = DirectCast(Application("GlobalDTTipoPeriodo"), DataTable) + Dim AppNombre As String = "GlobalDTTipoPeriodo" + If HttpContext.Current.Application(AppNombre) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetTiposPeriodos() Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + GlobalDTTipoPeriodo = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) + End Get Set(value As DataTable) - Application("GlobalDTTipoPeriodo") = value + Dim AppNombre As String = "GlobalDTTipoPeriodo" + HttpContext.Current.Application(AppNombre) = value + End Set End Property 'Fin TipoPeriodo 'Periodos Property GlobalDTNominasPeriodos(CveTipoPeriodo As Integer, CvePeriodo As Integer, CveEmpresa As Integer) As DataTable Get - Dim Str As New StringBuilder - If CveEmpresa <> -1 Then Str.AppendFormat("CveEmpresa = {0}", CveEmpresa) - If CveTipoPeriodo <> -1 Then Str.AppendFormat(" {0} CveTipoPeriodo = {1}", If(Str.Length > 0, "AND", ""), CveTipoPeriodo) - If CvePeriodo <> -1 Then Str.AppendFormat(" {0} CvePeriodo = {1}", If(Str.Length > 0, "AND", ""), CvePeriodo) - If Str.Length > 0 Then - Dim Dv As New DataView(DirectCast(Application("GlobalDTNominasPeriodos"), DataTable), Str.ToString, "", DataViewRowState.CurrentRows) + Dim AppNombre As String = $"GlobalDTNominasPeriodos-{CveEmpresa}" + If HttpContext.Current.Application(AppNombre) Is Nothing Then + Using ObjNom As New ClsNominas() + If ObjNom.GetPeriodos(-1, CveEmpresa, -1, -1, -1, -1) Then Application(AppNombre) = ObjNom.DtResultados + End Using + End If + Dim filtros As New List(Of String) + If CveTipoPeriodo >= 0 Then filtros.Add($"CveTipoPeriodo = {CveTipoPeriodo}") + If CvePeriodo >= 0 Then filtros.Add($"CvePeriodo = {CvePeriodo}") + If filtros.Count > 0 Then + Dim Dv As New DataView(DirectCast(HttpContext.Current.Application(AppNombre), DataTable), String.Join(" AND ", filtros), "", DataViewRowState.CurrentRows) GlobalDTNominasPeriodos = Dv.ToTable Dv.Dispose() Else - GlobalDTNominasPeriodos = DirectCast(Application("GlobalDTNominasPeriodos"), DataTable) + GlobalDTNominasPeriodos = DirectCast(HttpContext.Current.Application(AppNombre), DataTable) End If End Get Set(value As DataTable) - Application("GlobalDTNominasPeriodos") = value + Dim AppNombre As String = $"GlobalDTNominasPeriodos-{CveEmpresa}" + HttpContext.Current.Application(AppNombre) = value End Set End Property 'Fin Periodos @@ -2274,14 +2324,7 @@ Public Class ClsPaginas Application(AppNombre) = value End Set End Property - Property GlobalDTNom_Periodos() As DataTable - Get - GlobalDTNom_Periodos = DirectCast(Application("GlobalDTNom_Periodos"), DataTable) - End Get - Set(value As DataTable) - Application("GlobalDTNom_Periodos") = value - End Set - End Property + Public Shared Property GlobalDTVtaFormaPago() As DataTable Get Dim AppNombre As String = "GlobalDTVtaFormaPago" @@ -3753,7 +3796,7 @@ Public Class ClsPaginas End Property #End Region #Region "*********** D T - C O M B U S T I B L E S ***********" - Public Shared Property GlobalDTCombustibles(CveEmpresa As Integer) As DataTable + Public Shared Property GlobalDTCombustibles(CveEmpresa As Integer) As DataTable Get Dim AppNombre As String = $"GlobalDTCombustibles-{CveEmpresa}" 'sino existe, recarga los datos diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index f8ca5d0f7..466f25b58 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -3568,7 +3568,7 @@ Public Class ClsRH End Function Public Function AddTurno(Turno As String, HorarioDe As String, HorarioA As String, CveUsuario As Integer, CveEmpresa As Integer, CveChecadorHorario As Integer, ToleranciaERetardo As Integer, ToleranciaEFalta As Integer, ToleranciaSRetardo As Integer, ToleranciaSFalta As Integer, - Comida As Integer, ComidaDe As String, ComidaA As String) As Boolean + Comida As Integer, ComidaDe As String, ComidaA As String, Optional DiaDescanso As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -3590,6 +3590,7 @@ Public Class ClsRH .Add("@ToleranciaEFalta", SqlDbType.Int).Value = ToleranciaEFalta .Add("@ToleranciaSRetardo", SqlDbType.Int).Value = ToleranciaSRetardo .Add("@ToleranciaSFalta", SqlDbType.Int).Value = ToleranciaSFalta + .Add("@DiaDescanso", SqlDbType.Int).Value = DiaDescanso End With Try @@ -3609,7 +3610,7 @@ Public Class ClsRH End Function Public Function UpdateTurno(Turno As String, HorarioDe As String, HorarioA As String, Estatus As Boolean, CveTurno As Integer, CveUsuario As Integer, CveChecadorHorario As Integer, ToleranciaERetardo As Integer, ToleranciaEFalta As Integer, ToleranciaSRetardo As Integer, ToleranciaSFalta As Integer, - Comida As Integer, ComidaDe As String, ComidaA As String) As Boolean + Comida As Integer, ComidaDe As String, ComidaA As String, Optional DiaDescanso As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -3631,7 +3632,8 @@ Public Class ClsRH .Add("@ToleranciaERetardo", SqlDbType.Int).Value = ToleranciaERetardo .Add("@ToleranciaEFalta", SqlDbType.Int).Value = ToleranciaEFalta .Add("@ToleranciaSRetardo", SqlDbType.Int).Value = ToleranciaSRetardo - .Add("@ToleranciaSFalta", SqlDbType.Int).Value = ToleranciaSFalta + .Add("@ToleranciaSFalta", SqlDbType.Int).Value = ToleranciaSFalta + .Add("@DiaDescanso", SqlDbType.Int).Value = DiaDescanso End With @@ -7441,6 +7443,110 @@ Public Class ClsRH End Try Return Retorno End Function + + Public Function PersonalTurnoUp(cveTurno As Int32, cveUsuario As Int32, cveEmpresa As Int32, cvePersonal As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_PersonalTurnoUp", CommandType.StoredProcedure) + addParameters("@CveTurno", SqlDbType.Int, cveTurno) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + retorno = RunQuery("Ocurrió un error al actualizar el turno del personal.") + Return retorno + End Function + + Public Function SupervisorOrganigramaGet(cveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_SupervisorOrganigramaGet", CommandType.StoredProcedure) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_SupervisorOrganigramaGet.") + Return retorno + End Function + + Public Function PersonalRPUpdate(cvePersonal As Int32, cveUsuario As Int32, cveEmpresa As Int32, registroPatronal As String) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_PersonalRPUpdate", CommandType.StoredProcedure) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@RegistroPatronal", SqlDbType.VarChar, registroPatronal) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_PersonalRPUpdate.") + Return retorno + End Function + + Public Function PersonalTSUpdate(cvePersonal As Int32, cveUsuario As Int32, cveEmpresa As Int32, tipodeSalario As String) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_PersonalTSUpdate", CommandType.StoredProcedure) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@TipodeSalario", SqlDbType.VarChar, tipodeSalario) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_PersonalTSUpdate.") + Return retorno + End Function + + Public Function GetAsistenciaChecador(cveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_GetAsistenciaChecador", CommandType.StoredProcedure) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_GetAsistenciaChecador.") + Return retorno + End Function + + Public Function PersonalDomUp(cveEstadoDomicilio As Int32, ciudadOrigen As String, cvePersonal As Int32, cveEmpresa As Int32, cveUsuario As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_PersonalDomUp", CommandType.StoredProcedure) + addParameters("@CveEstadoDomicilio", SqlDbType.Int, cveEstadoDomicilio) + addParameters("@CiudadOrigen", SqlDbType.VarChar, ciudadOrigen) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_PersonalDomUp.") + Return retorno + End Function + + + Public Function PersonalAltasRemove(cvePersonalAltas As Int32, cvePersonal As Int32, cveEmpresa As Int32, cveUsuario As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_PersonalAltasRemove", CommandType.StoredProcedure) + addParameters("@CvePersonalAltas", SqlDbType.Int, cvePersonalAltas) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_PersonalAltasRemove.") + Return retorno + End Function + + Public Function PersonalAltasUpFechas(cvePersonalAltas As Int32, fechaInicio As String, fechaFin As String, cvePersonal As Int32, cveEmpresa As Int32, cveUsuario As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_PersonalAltasUpFechas", CommandType.StoredProcedure) + addParameters("@CvePersonalAltas", SqlDbType.Int, cvePersonalAltas) + addParameters("@FechaInicio", SqlDbType.VarChar, fechaInicio) + addParameters("@FechaFin", SqlDbType.VarChar, fechaFin) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_PersonalAltasUpFechas.") + Return retorno + End Function + + + + + + Public Function AsistenciaDetTurnoUp(cveAsistenciaDetalle As Int32, fecha As String, cveTurno As Int32, cveTurnoOLD As Int32, cvePersonal As Int32, cveUsuario As Int32, cveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_RH_AsistenciaDetTurnoUp", CommandType.StoredProcedure) + addParameters("@CveAsistenciaDetalle", SqlDbType.Int, cveAsistenciaDetalle) + addParameters("@Fecha", SqlDbType.VarChar, fecha) + addParameters("@CveTurno", SqlDbType.Int, cveTurno) + addParameters("@CveTurnoOLD", SqlDbType.Int, cveTurnoOLD) + addParameters("@CvePersonal", SqlDbType.Int, cvePersonal) + addParameters("@CveUsuario", SqlDbType.Int, cveUsuario) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al obtener el PA_RH_AsistenciaDetTurnoUp.") + Return retorno + End Function Public Function estatusPersonalUp(Fecha As DateTime, CvePersonal As Integer, CveEstatusPersonal As Integer, CveEmpresa As Integer, CveUsuario As Integer, Optional CveMotivoBaja As Integer = -1, Optional Observaciones As String = "") As Boolean Dim Retorno As Boolean = False Data = New DataTable diff --git a/Bancos/ConciliacionesBancarias.aspx b/Bancos/ConciliacionesBancarias.aspx index 39a3e738f..f3eb42492 100644 --- a/Bancos/ConciliacionesBancarias.aspx +++ b/Bancos/ConciliacionesBancarias.aspx @@ -396,10 +396,10 @@