diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 7f5db8213..2aa169d32 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -2765,7 +2765,8 @@ Public Class ClsNominas End Function Public Function GetNominaEmpleado(CveProyecto As Integer, CveSubProyecto As Integer, CveTurno As Integer, CvePeriodo As Integer, CveEmpresa As Integer, Agrupador As Integer, Optional RegimenContratacion As Integer = 1, Optional CvePersonal As Integer = -1, Optional NetoxSalario As Decimal = 0, Optional Neto As Decimal = 0, - Optional CveTipoTrabajador As Integer = -1) As Boolean + Optional CveTipoTrabajador As Integer = -1, Optional EsSimulador As Boolean = 0, Optional TipoPeriodo As Integer = -1, Optional AreaGeografica As String = "A", + Optional EjercicioSimula As Integer = -1, Optional FactorISimula As Decimal = 1.0493150684931D) As Boolean Dim retorno As Boolean = False Try DTSet = New DataSet() @@ -2782,6 +2783,11 @@ Public Class ClsNominas .Add("@NetoxSalario", SqlDbType.Decimal).Value = NetoxSalario .Add("@Neto", SqlDbType.Decimal).Value = Neto .Add("@CveTipoTrabajador", SqlDbType.Decimal).Value = CveTipoTrabajador + .Add("@EsSimulador", SqlDbType.Bit).Value = EsSimulador + .Add("@TipoPeriodo", SqlDbType.Int).Value = TipoPeriodo + .Add("@AreaGeografica", SqlDbType.VarChar).Value = AreaGeografica.ToUpper() + .Add("@EjercicioSimula", SqlDbType.Int).Value = EjercicioSimula + .Add("@FactorISimula", SqlDbType.Decimal).Value = FactorISimula End With diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 806a0d125..e0ee2474c 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -3,7 +3,9 @@ Option Explicit On Imports System.Data Imports System.Data.SqlClient +Imports CrystalDecisions.[Shared].Json Imports Extensiones +Imports Microsoft.Ajax.Utilities Imports Profact.TimbraCFDI40 @@ -2053,17 +2055,25 @@ Public Class ClsRH .Add("@CveSubTipoPeriodo", SqlDbType.Int).Value = CveSubTipoPeriodo + .Add("@ErrorMostrarADS", SqlDbType.VarChar).Direction = ParameterDirection.Output - .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue + .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.Output - End With + End With + Try - SqlAdapter.Fill(Data) - _CvePersonal = SqlAdapter.SelectCommand.Parameters("@RETURN_VALUE").Value.ToString.ToEntero + SqlAdapter.SelectCommand.ExecuteNonQuery() + + 'SqlAdapter.Fill(Data) + _CvePersonal = SqlAdapter.SelectCommand.Parameters("@RETURN_VALUE").Value.ToString().ToEntero() Retorno = True Catch Ex1 As SqlException - 'dbo.Vw_Val_Nom_Curps - If Ex1.Message.Contains("Número: 2627;") Then + Dim ErrorMostrarADS As String = trygetparameter("@ErrorMostrarADS") + + 'dbo.Vw_Val_Nom_Curps + If Not (ErrorMostrarADS.IsNullOrWhiteSpace()) Then + Alert(ErrorMostrarADS, TipoMensaje.MsgAdvertencia) + ElseIf Ex1.Message.Contains("Número: 2627;") Then Alert("El nuevo personal no se guardo debido a que actualmente se encuentra registrado", TipoMensaje.MsgAdvertencia) ElseIf Ex1.Message.Contains("Chk_RH_PersonalSalarioIMSS") Then Alert("El nuevo personal no se guardo debido a que se presento un problema al calcular el salario", TipoMensaje.MsgAdvertencia) @@ -2077,11 +2087,26 @@ Public Class ClsRH Me.OnError("Ocurrió un error al guardar el nuevo personal.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End If Catch ex As Exception - OnError("Ocurrió un error al guardar el nuevo personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + Dim ErrorMostrarADS As String = trygetparameter("@ErrorMostrarADS") + + If Not (ErrorMostrarADS.IsNullOrWhiteSpace()) Then + Alert(ErrorMostrarADS, TipoMensaje.MsgAdvertencia) + Else + OnError("Ocurrió un error al guardar el nuevo personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End If End Try Return Retorno End Function + Private Function trygetparameter(parametername As String) As String + Try + Return SqlAdapter.SelectCommand.Parameters(parametername).Value.ToString() + Catch ex As Exception + Return Nothing + End Try + End Function + + Public Function UpdatePersonal(Codigo As String, APaterno As String, AMaterno As String, Nombres As String, Correo As String, FechaIngreso As Date, CveTipoPeriodo As Integer, NumeroSS As String, SeInscribioSS As Boolean, SalarioDiarioPago As Double, SalarioDiario As Double, SDI As Double, SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, diff --git a/Bin/GoCfdi.dll b/Bin/GoCfdi.dll index 37c940d76..12e6171e5 100644 Binary files a/Bin/GoCfdi.dll and b/Bin/GoCfdi.dll differ diff --git a/Nomina/RepFiniquito.aspx b/Nomina/RepFiniquito.aspx index 7fea45c34..fe01b8bad 100644 --- a/Nomina/RepFiniquito.aspx +++ b/Nomina/RepFiniquito.aspx @@ -91,7 +91,12 @@ - + + + + + +