From fed72cbc38864ea872d28f11977149d0cbcaadd4 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Mon, 22 Jul 2024 06:45:47 -0700 Subject: [PATCH] --- App_Code/ClsNominas.vb | 63 +++++++++++++++++++++--------------------- Nomina/Nomina.aspx.cs | 33 ++++++++++++---------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 44f5a3d97..aff44610d 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -658,27 +658,28 @@ Public Class ClsNominas End Try Return retorno End Function - Public Function GetDispersionnominaXLS(CvePeriodo As Int32, CveEmpresa As Int32) As Boolean - Dim retorno As Boolean = False - DataAdapter("PA_Nom_DispersionnominaXLS", CommandType.StoredProcedure) - With SqlAdapter.SelectCommand.Parameters - .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - End With - Try - SqlAdapter.Fill(Data) - retorno = True - Catch ex As Exception - OnError("Ocurrió un error al obtener el layout de nóminas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - End Try - Return retorno - End Function - Public Function GetDispersionnomina(CvePeriodo As Int32, CveEmpresa As Int32) As Boolean + 'Public Function GetDispersionnominaXLS(CvePeriodo As Int32, CveEmpresa As Int32) As Boolean + ' Dim retorno As Boolean = False + ' DataAdapter("PA_Nom_DispersionnominaXLS", CommandType.StoredProcedure) + ' With SqlAdapter.SelectCommand.Parameters + ' .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo + ' .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + ' End With + ' Try + ' SqlAdapter.Fill(Data) + ' retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al obtener el layout de nóminas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + ' Return retorno + 'End Function + Public Function GetDispersionnomina(CvePeriodo As Int32, CveEmpresa As Int32, CveSATBanco As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Nom_Dispersionnomina", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveSATBanco", SqlDbType.Int).Value = CveSATBanco End With Try SqlAdapter.Fill(Data) @@ -3763,21 +3764,21 @@ Public Class ClsNominas End Function - Public Function GetDispersionNominaBanorte(CvePeriodo As Integer, CveEmpresa As Integer) As Boolean - Dim retorno As Boolean = False - DataAdapter("PA_Nom_DispersionNominaBanorteGet", CommandType.StoredProcedure) - With SqlAdapter.SelectCommand.Parameters - .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo - .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - End With - Try - SqlAdapter.Fill(Data) - retorno = True - Catch ex As Exception - OnError("Ocurrió un error al obtener el layout de nominas Banorte.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - End Try - Return retorno - End Function + 'Public Function GetDispersionNominaBanorte(CvePeriodo As Integer, CveEmpresa As Integer) As Boolean + ' Dim retorno As Boolean = False + ' DataAdapter("PA_Nom_DispersionNominaBanorteGet", CommandType.StoredProcedure) + ' With SqlAdapter.SelectCommand.Parameters + ' .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo + ' .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + ' End With + ' Try + ' SqlAdapter.Fill(Data) + ' retorno = True + ' Catch ex As Exception + ' OnError("Ocurrió un error al obtener el layout de nominas Banorte.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + ' End Try + ' Return retorno + 'End Function Public Function PreNominaTotalSemana(numeroPeriodo As Int32, cveEmpresa As Int32, cveSubProyecto As Int32, cveTipoNomina As Int32, tipoTrabajador As String, ejercicio As Int32, facturado As Boolean) As Boolean Dim retorno As Boolean = False diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs index 0afbbfbf2..de3b59033 100644 --- a/Nomina/Nomina.aspx.cs +++ b/Nomina/Nomina.aspx.cs @@ -10005,28 +10005,31 @@ public partial class Nomina_Nomina2 : ClsPaginas libro.Cell(row, column++).Value = "XTIPOPEDIDO"; libro.Cell(row, column++).Value = "XNUMERO"; libro.Cell(row, column++).Value = "XIMPORTE"; - //libro.Cell(row, column++).Value = "CLABE"; - //libro.Cell(row, column++).Value = "Neto"; + int maxxolumn = column; libro.Range(row, 1, row, column - 1).Style.Font.FontColor = ClosedXML.Excel.XLColor.White; libro.Range(row, 1, row, column - 1).Style.Fill.SetBackgroundColor(ClosedXML.Excel.XLColor.FromArgb(79, 129, 189)); DataRow dcon; decimal subtotal = 0; - if (dtempleados != null && dtempleados.Rows.Count > 0 && dtConceptos != null && dtConceptos.Rows.Count > 0 && (dcon = dtConceptos.FiltroPrimero("Tipo ='P' AND Codigo = 'P028' ")) != null) + DataTable dt = null; + using (ClsNominas objnom = new ClsNominas()) { - foreach (DataRow dRow in dtempleados.FiltraParametros("CvePersonal > 0").Rows) + objnom.GetEfectivaleXLS(CvePeriodoSeleccionado, UsuarioActual.CveEmpresa, -1); + dt = objnom.DtResultados; + } + if (dt != null && dt.Rows.Count > 0) + { + + foreach (DataRow dRow in dt.Rows) { - decimal importe = dRow[string.Format("V_{0}", dcon["CveConcepto"])].ToString().ToDecimal(); - if (importe > 0) - { - subtotal = subtotal + importe; - row++; - column = 1; - libro.Cell(row, column++).Value = "'103646-1"; - libro.Cell(row, column++).Value = "'DISPERSION"; - libro.Cell(row, column++).Value = string.Format("'{0}", dRow["Codigo"]); - libro.Cell(row, column++).Value = importe; - } + decimal importe = dRow["Importe"].ToString().ToDecimal(); + subtotal = subtotal + importe; + row++; + column = 1; + libro.Cell(row, column++).Value = string.Format("'{0}", dRow["XCLIENTE"]); + libro.Cell(row, column++).Value = string.Format("'{0}", dRow["XTIPOPEDIDO"]); + libro.Cell(row, column++).Value = string.Format("'{0}", dRow["CodigoDispersionVale"]); + libro.Cell(row, column++).Value = importe; } } libro.Cell(1, 2).Value = subtotal;