From d8a90f9c33df69d2958977f3fdf68fffdf5a4b72 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Wed, 30 Mar 2022 08:14:28 -0700 Subject: [PATCH] --- App_Code/ADSBase.vb | 4 + App_Code/ClsNominas.vb | 57 +- App_Code/ClsVentas.vb | 19 + App_Code/Timbrado.vb | 4 +- Documentacion/TableroMaterialidad.aspx | 12 +- Documentacion/TableroMaterialidad.aspx.cs | 40 +- General/SaldosIniciales.aspx | 2 +- General/SaldosIniciales.aspx.vb | 171 ++- Inicio.aspx | 34 +- Metronic/assets/admin/layout/css/custom.css | 6 + Nomina/CalculoISRAnual.aspx | 6 +- Nomina/CalculoISRAnual.aspx.cs | 97 +- Nomina/CargaArchivosNomina.aspx | 65 + Nomina/CargaArchivosNomina.aspx.cs | 218 ++++ Nomina/Nomina.aspx | 1248 ++++++++++--------- Nomina/Nomina.aspx.cs | 128 +- RH/CatPersonal.aspx | 7 + RH/CatPersonal.aspx.vb | 19 +- RH/Personal.aspx | 2 +- RH/Personal.aspx.vb | 7 + SAT/Default.aspx | 21 + SAT/Default.aspx.cs | 14 + SAT/SolicitudesNominaSat.aspx | 373 ++++++ SAT/SolicitudesNominaSat.aspx.cs | 79 ++ vwd.webinfo | 16 + 25 files changed, 1939 insertions(+), 710 deletions(-) create mode 100644 Nomina/CargaArchivosNomina.aspx create mode 100644 Nomina/CargaArchivosNomina.aspx.cs create mode 100644 SAT/Default.aspx create mode 100644 SAT/Default.aspx.cs create mode 100644 SAT/SolicitudesNominaSat.aspx create mode 100644 SAT/SolicitudesNominaSat.aspx.cs diff --git a/App_Code/ADSBase.vb b/App_Code/ADSBase.vb index 979b1af09..708cac5cb 100644 --- a/App_Code/ADSBase.vb +++ b/App_Code/ADSBase.vb @@ -180,6 +180,10 @@ Public Class ADSBase If Not IsNothing(pr.SqlDataType) Then If Not IsNothing(pr.ParameterDirection) Then SqlAdapter.SelectCommand.Parameters.Add(pr.ParameterName, pr.SqlDataType).Direction = pr.ParameterDirection + If (Not IsNothing(pr.SqlValue)) Then + + SqlAdapter.SelectCommand.Parameters.Add(pr.ParameterName, pr.SqlDataType).Value = If(Not IsNothing(pr.SqlValue), pr.SqlValue, DBNull.Value) + End If Else SqlAdapter.SelectCommand.Parameters.Add(pr.ParameterName, pr.SqlDataType).Value = If(Not IsNothing(pr.SqlValue), pr.SqlValue, DBNull.Value) End If diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 8823cda54..491e1ca31 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -2482,12 +2482,13 @@ Public Class ClsNominas Return retorno End Function + Public Function CalculoISRAnual(ejercicio As Integer, cveEmpresa As Integer) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Nom_CalculoISRAnual", CommandType.StoredProcedure) addParameters("@Ejercicio", SqlDbType.Int, ejercicio) addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) - retorno = RunQuery("Ocurrió un error al obtener el PA_Nom_CalculoISRAnual.") + retorno = RunQuery("Ocurrió un error al obtener el Calculo ISR anual.") Return retorno End Function Public Function GetNominaAcumulado(Ejercicio As Integer, CveProyecto As Integer, CveSubProyecto As Integer, CveTurno As Integer, CvePeriodoI As Integer, CvePeriodoF As Integer, CveEmpresa As Integer, Optional RegimenContratacion As Integer = 1, Optional CvePersonal As Integer = -1, Optional CveTipoPeriodo As Integer = -1) As Boolean @@ -3180,7 +3181,61 @@ Public Class ClsNominas retorno = RunQuery("Ocurrió un error al obtener el PA_Agro_Embarque_PalletGet.") Return retorno End Function +#Region "Visor sat" + Public Function SATSolicitudTimbreNominaGral(IDsolicitud As Integer, cveEmpresa As Integer) As Boolean + Dim retorno As Boolean = False + DataAdapter("[PA_SAT_SolicitudTimbreNominaGral]", CommandType.StoredProcedure) + addParameters("@IDsolicitud", SqlDbType.Int, IDsolicitud) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al obtener el Calculo ISR anual.") + Return retorno + End Function +#Region "CRUD_SolicitudesNominas" + Public Function SolicitudesNominasGet(idSolicitudNominas As Integer, CveEmpresa As Integer) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Gral_SAT_SolicitudesNominasGet", CommandType.StoredProcedure) + addParameters("@idSolicitudNominas", SqlDbType.Int, idSolicitudNominas) + addParameters("@CveEmpresa", SqlDbType.Int, CveEmpresa) + retorno = RunQuery("Ocurrió un error al obtener el SolicitudesNominas.") + Return retorno + End Function + Public Function SolicitudesNominasAdd(idSolicitudCFDI As Integer, idSolicitudMetadata As Integer, estatus As Integer, observaciones As String, fechaInicio As DateTime, fechaFin As DateTime, cveUsuarioIng As Int32, cveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Gral_SAT_SolicitudesNominasAdd", CommandType.StoredProcedure) + addParameters("@idSolicitudCFDI", SqlDbType.Int, idSolicitudCFDI) + addParameters("@idSolicitudMetadata", SqlDbType.Int, idSolicitudMetadata) + addParameters("@Estatus", SqlDbType.Int, estatus) + addParameters("@Observaciones", SqlDbType.VarChar, observaciones) + addParameters("@FechaInicio", SqlDbType.DateTime, fechaInicio) + addParameters("@FechaFin", SqlDbType.DateTime, fechaFin) + addParameters("@CveUsuarioIng", SqlDbType.Int, cveUsuarioIng) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al agregar el SolicitudesNominas.") + Return retorno + End Function + Public Function SolicitudesNominasUp(idSolicitudNominas As Int32, idSolicitudCFDI As Int32, idSolicitudMetadata As Int32, estatus As Int32, observaciones As String, cveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Gral_SAT_SolicitudesNominasUp", CommandType.StoredProcedure) + addParameters("@idSolicitudNominas", SqlDbType.Int, idSolicitudNominas) + addParameters("@idSolicitudCFDI", SqlDbType.Int, idSolicitudCFDI) + addParameters("@idSolicitudMetadata", SqlDbType.Int, idSolicitudMetadata) + addParameters("@Estatus", SqlDbType.Int, estatus) + addParameters("@Observaciones", SqlDbType.VarChar, observaciones) + addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa) + retorno = RunQuery("Ocurrió un error al actualizar el SolicitudesNominas.") + Return retorno + End Function + Public Function SolicitudesNominasRemove(idSolicitudNominas As Int32, CveEmpresa As Integer) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Gral_SAT_SolicitudesNominasRemove", CommandType.StoredProcedure) + addParameters("@idSolicitudNominas", SqlDbType.Int, idSolicitudNominas) + addParameters("@CveEmpresa", SqlDbType.Int, CveEmpresa) + retorno = RunQuery("Ocurrió un error al eliminar el SolicitudesNominas.") + Return retorno + End Function +#End Region +#End Region #Region "IDisposable Support" ' IDisposable Protected Overridable Sub Dispose(ByVal disposing As Boolean) diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index fa31af006..a340074f6 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -144,6 +144,25 @@ Public Class ClsVentas End Sub #End Region + Public Function GuardaTimbre(CveVenta As Integer, CveNomina As Integer, UUID As String) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_GuardaTimbreGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveVenta", SqlDbType.Int).Value = CveVenta + .Add("@CveNomina", SqlDbType.Int).Value = CveNomina + .Add("@UUID", SqlDbType.VarChar).Value = UUID + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al guardar los dataos del timbre.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function Public Function GetVenta(CveVenta As Integer, CveEmpresa As Integer, Optional VerificaAlmacen As Boolean = True) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_VentasGet") diff --git a/App_Code/Timbrado.vb b/App_Code/Timbrado.vb index 0bcf64bbb..fc320f55f 100644 --- a/App_Code/Timbrado.vb +++ b/App_Code/Timbrado.vb @@ -211,7 +211,7 @@ Public Class Timbrado Public Function CFDICancelar(Empresa As Empresa, FolioFiscal As String, Total As Decimal, RFCReceptor As String, RFCEmisor As String, Optional CvePACCancelacion As Integer = 2, Optional ValidaFactura As Boolean = True, Optional CveSATMotivoCancelacion As Integer = -1, Optional FolioSustitucion As String = "") As RespuestaCancelacionSAT Dim Retorno As New RespuestaCancelacionSAT Dim MsgCancelacion As New StringBuilder - + 'dim Error If CvePACCancelacion = 3 Then ValidaFactura = False End If @@ -1238,7 +1238,7 @@ Public Class Timbrado If Ret <> "" Then MensajeErrorCFDI = Ret Retorno = If(Ret = "", True, False) End If - + 'Dim error End Select diff --git a/Documentacion/TableroMaterialidad.aspx b/Documentacion/TableroMaterialidad.aspx index 3c43bafe2..ae6341363 100644 --- a/Documentacion/TableroMaterialidad.aspx +++ b/Documentacion/TableroMaterialidad.aspx @@ -287,12 +287,12 @@ - + <%# string.Format("{1}", Eval("CveCliente"), Eval("Cliente")) %> - - + + @@ -449,7 +449,7 @@ - <%----%> +