From ae86c09e64ef84606573a91deb8d49718c6b0710 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Thu, 6 Oct 2022 02:26:18 -0700 Subject: [PATCH] --- App_Code/ClsNominas.vb | 23 +++++++++++++++++++++++ App_Code/ClsRH.vb | 26 +++++++++++++++++++++++++- App_Code/ClsVentas.vb | 18 ++++++++++++++++++ App_Code/modExtensiones.vb | 7 +++++++ RH/CatPersonal.aspx | 2 +- RH/CatPersonal.aspx.vb | 2 +- Ventas/Ventas.aspx.vb | 12 ++++++++++++ 7 files changed, 87 insertions(+), 3 deletions(-) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 22921dad9..c2289f545 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -237,6 +237,29 @@ Public Class ClsNominas End Sub #End Region + Public Function AgroOrdenProduccionForVtaGet(CveEmpresa As Integer, CveUsuario As Integer, CveOrdenProduccion As Integer) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Vta_AgroOrdenProduccionForVtaGet", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveOrdenProduccion", SqlDbType.Int).Value = CveOrdenProduccion + + End With + Try + SqlAdapter.Fill(DTSet) + If DTSet.Tables.Count > 0 Then + Data = DTSet.Tables(0) + End If + retorno = True + Catch Ex1 As SqlException + + Me.OnError("Ocurrió un error al obtener datos manifiesto.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Catch ex As Exception + OnError("Ocurrió un error al obtener los datos manifiesto.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return retorno + End Function Public Function ManifiestoForVtaGet(CveEmpresa As Integer, CveUsuario As Integer, PersonalXml As String, CveEmbarqueManifiesto As Integer) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Vta_ManifiestoForVtaGet", CommandType.StoredProcedure) diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 8d4a1894e..b5c42d4a8 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -2226,9 +2226,33 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo OnError("Ocurrió un error al intentar guardar los cambios en el Personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try Return Retorno + End Function + + Public Function PersonalSalarioUp(CvePersonal As Integer, Fecha As String, CveUsuario As Integer, CveEmpresa As Integer, SalarioDiario As Double, SDI As Double, SalarioDiarioSS As Double, SalarioDiarioPago As Double, SDUp As TipoUpdate, SDIUp As TipoUpdate, SDCUp As TipoUpdate) As Boolean + Dim Retorno As Boolean = False + SqlDataAdapter("PA_RH_PersonalSalarioUp") + With SqlAdapter.SelectCommand.Parameters + .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal + .Add("@Fecha", SqlDbType.Date).Value = Fecha + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@SalarioDiarioPago", SqlDbType.Money).Value = SalarioDiarioPago + .Add("@SalarioDiario", SqlDbType.Money).Value = SalarioDiario + .Add("@SDI", SqlDbType.Money).Value = SDI + .Add("@SalarioDiarioSS", SqlDbType.Money).Value = SalarioDiarioSS + .Add("@SDUp", SqlDbType.Int).Value = SDUp + .Add("@SDIUp", SqlDbType.Int).Value = SDIUp + .Add("@SDCUp", SqlDbType.Int).Value = SDCUp + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As SqlException + OnError("Ocurrió un error al intentar guardar los cambios en el Personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return Retorno End Function - Public Function GetMovimientosToSUA(CveEmpresa As Integer, FechaI As String, FechaF As String) As Boolean Dim Retorno As Boolean = False SqlDataAdapter("PA_RH_MovimientosToSUA") diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index ebcea89aa..7f7f2cc8d 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -181,6 +181,24 @@ Public Class ClsVentas Return Retorno End Function + Public Function AgroOrdenProduccionUpvta(cveVenta As Int32, cveUsuario As Int32, cveEmpresa As Int32, CveOrdenProduccion As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_AGRO_OrdenProduccionUpvta", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveVenta", SqlDbType.Int).Value = cveVenta + .Add("@CveEmpresa", SqlDbType.Int).Value = cveEmpresa + .Add("@CveOrdenProduccion", SqlDbType.Int).Value = CveOrdenProduccion + .Add("@CveUsuario", SqlDbType.Int).Value = cveUsuario + End With + + Try + SqlAdapter.Fill(Data) + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar venta manifiesto.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return retorno + End Function Public Function Embarque_ManifiestoUpvta(cveVenta As Int32, cveUsuario As Int32, cveEmpresa As Int32, cveEmbarqueManifiesto As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("PA_AGRO_Embarque_ManifiestoUpvta", CommandType.StoredProcedure) diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index 40e68aafc..87171a475 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -301,6 +301,13 @@ Namespace Extensiones #Region "Alertas y notificaciones" + Public Enum TipoUpdate As Integer + + NoGuardar = 0 + Guardar = 1 + CalcularYGuardar = 2 + + End Enum Public Enum TipoMensaje As Integer MsgError = 1 diff --git a/RH/CatPersonal.aspx b/RH/CatPersonal.aspx index 4f78b5dc8..eb25ddb01 100644 --- a/RH/CatPersonal.aspx +++ b/RH/CatPersonal.aspx @@ -1115,7 +1115,7 @@
- +
diff --git a/RH/CatPersonal.aspx.vb b/RH/CatPersonal.aspx.vb index 95ec9d60b..2044c0802 100644 --- a/RH/CatPersonal.aspx.vb +++ b/RH/CatPersonal.aspx.vb @@ -1180,7 +1180,7 @@ Partial Class RH_CatPersonal Dim CvePersonal As Integer = 0 Using ObjPersonal As New ClsRH() ObjPersonal.IniciaTransacSQL() - If ObjPersonal.AddPersonal("-1", TxtAPaterno.Text.Trim, TxtAMaterno.Text.Trim, TxtNombres.Text.Trim, "", TxtFechaIngreso.Text.ToDate, + If ObjPersonal.AddPersonal(TxtCodigo.Text, TxtAPaterno.Text.Trim, TxtAMaterno.Text.Trim, TxtNombres.Text.Trim, "", TxtFechaIngreso.Text.ToDate, DdlTipoPeriodoAdd.SelectedValue.ToEntero, TxtNumeroSS.Text.Trim, True, SalarioDiario, SalarioDiario, 0, 0, 0, 15, 25, DdlMetodoPagoAdd.SelectedValue.ToEntero, TxtFechaIngreso.Text.Trim.ToDate, "-1", DdlTipoContratoAdd.SelectedValue.ToEntero, "", diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 96797b397..ae3516748 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -9703,6 +9703,18 @@ Partial Class Ventas Catch ex As Exception OnError("Ocurrió un error al actualizar el embarque", ex) End Try + Try + ViewState("CveVenta") = ObjFactura.CveVenta + + If Request("CveOrdenProduccion") IsNot Nothing AndAlso IsNumeric(Request("CveOrdenProduccion")) AndAlso Request("CveOrdenProduccion").ToEntero() > 0 Then + + If ObjVentas.AgroOrdenProduccionUpvta(ObjFactura.CveVenta, UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario, Request("CveOrdenProduccion").ToEntero()) Then + + End If + End If + Catch ex As Exception + OnError("Ocurrió un error al actualizar el embarque", ex) + End Try Try Dim DirectoriArchivoXML As String = String.Format("{0}{1}", UsuarioActual.Empresa.Ruta, ObjFactura.TipoDocto) ' System.IO.Path.Combine()