From 88233be132b3565afa685ed0c60aecc72e138159 Mon Sep 17 00:00:00 2001 From: Oscar Irigoyen Date: Fri, 4 Jul 2025 17:37:21 -0700 Subject: [PATCH] CatBancos CveSATBancos, EntregaAlamcen desactivar requiered de fecha de caducidad cuando no este marcado el check --- App_Code/ClsBancos.vb | 8 ++- Bancos/CatBancos.aspx | 51 ++++++++++++-- Bancos/CatBancos.aspx.vb | 104 ++++++++++++++++++++++------- Inventarios/EntregaAlmacen.aspx | 22 +++++- Inventarios/EntregaAlmacen.aspx.vb | 4 +- 5 files changed, 157 insertions(+), 32 deletions(-) diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb index 8e7c0f8a7..8882bb2d9 100644 --- a/App_Code/ClsBancos.vb +++ b/App_Code/ClsBancos.vb @@ -295,7 +295,8 @@ Public Class ClsBancos Return Retorno End Function - Public Function AddBancos(Banco As String, Ejecutivo As String, Telefono As String, CveUsuario As Integer, CveEmpresa As Integer, Optional IdContPaq As Integer = -1, Optional RFC As String = "-1") As Boolean + Public Function AddBancos(Banco As String, Ejecutivo As String, Telefono As String, CveUsuario As Integer, CveEmpresa As Integer, Optional IdContPaq As Integer = -1, Optional RFC As String = "-1", + Optional CveSATBanco As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Banc_BancosAdd ") @@ -308,6 +309,7 @@ Public Class ClsBancos .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@IdContPaq", SqlDbType.Int).Value = IdContPaq .Add("@RFC", SqlDbType.VarChar).Value = RFC + .Add("@CveSATBanco", SqlDbType.Int).Value = CveSATBanco End With Try @@ -326,7 +328,8 @@ Public Class ClsBancos Return Retorno End Function - Public Function UpdateBancos(Banco As String, Ejecutivo As String, Telefono As String, Estatus As Boolean, CveBanco As Integer, Optional IdContPaq As Integer = -1, Optional RFC As String = "-1") As Boolean + Public Function UpdateBancos(Banco As String, Ejecutivo As String, Telefono As String, Estatus As Boolean, CveBanco As Integer, Optional IdContPaq As Integer = -1, Optional RFC As String = "-1", + Optional CveSATBanco As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Banc_BancosUpdate") @@ -339,6 +342,7 @@ Public Class ClsBancos .Add("@CveBanco", SqlDbType.Int).Value = CveBanco .Add("@IdContPaq", SqlDbType.Int).Value = IdContPaq .Add("@RFC", SqlDbType.VarChar).Value = RFC + .Add("@CveSATBanco", SqlDbType.Int).Value = CveSATBanco End With Try diff --git a/Bancos/CatBancos.aspx b/Bancos/CatBancos.aspx index 3fa839955..481fe7485 100644 --- a/Bancos/CatBancos.aspx +++ b/Bancos/CatBancos.aspx @@ -4,6 +4,16 @@ +
  • @@ -24,6 +34,12 @@ + +
    + + Banco SAT + + + Banco @@ -64,6 +80,13 @@
    + + Seleccione uno + + + + @@ -90,8 +113,22 @@ - + + + + + + + + Seleccione uno + + + + + @@ -142,10 +179,14 @@ -
    - -   -
    +
    +
    + +
    +
    + +
    +
    diff --git a/Bancos/CatBancos.aspx.vb b/Bancos/CatBancos.aspx.vb index 1784f8c16..ab30a2db6 100644 --- a/Bancos/CatBancos.aspx.vb +++ b/Bancos/CatBancos.aspx.vb @@ -19,13 +19,43 @@ Partial Class Bancos_CatBancos End Set End Property + Private Property DTBancosSAT As DataTable + Get + If ViewState("DTBancosSAT") Is Nothing Then + ViewState("DTBancosSAT") = New DataTable() + End If + Return DirectCast(ViewState("DTBancosSAT"), DataTable) + End Get + + Set(ByVal value As DataTable) + ViewState("DTBancosSAT") = value + End Set + End Property + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then + CargaBancosSAT() ViewState("Orden") = "" CargaDatos() End If End Sub + Private Sub CargaBancosSAT() + + Dim ObjBancos As New ClsBancos + + If ObjBancos.GetBancosSAT Then + DdlSatBanco.DataSource = ObjBancos.DtResultados + DTBancosSAT = ObjBancos.DtResultados + End If + + ObjBancos.Dispose() + + DdlSatBanco.DataBind() + DdlSatBanco.Items.Insert(0, New ListItem("Seleccione uno", "-1")) + + End Sub + Public Sub CargaDatos() Dim ObjBancos As New ClsBancos If ObjBancos.GetBancos() Then @@ -47,7 +77,8 @@ Partial Class Bancos_CatBancos Protected Sub LbAgregar_Click(sender As Object, e As System.EventArgs) Handles LbAgregar.Click Dim ObjBancos As New ClsBancos - If ObjBancos.AddBancos(TxtBanco.Text.Trim, TxtEjecutivo.Text.Trim, TxtTelefono.Text.Trim, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then + If ObjBancos.AddBancos(TxtBanco.Text.Trim, TxtEjecutivo.Text.Trim, TxtTelefono.Text.Trim, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveSATBanco:=DdlSatBanco.SelectedValue.ToEntero) Then + DdlSatBanco.SelectedValueExist(-1) TxtBanco.Text = "" TxtEjecutivo.Text = "" TxtTelefono.Text = "" @@ -68,24 +99,42 @@ Partial Class Bancos_CatBancos #Region "G V D A T O S" Protected Sub GvDatos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvDatos.RowDataBound + If e.Row.RowType = DataControlRowType.DataRow Then + If e.Row.RowIndex = 0 Then - e.Row.Cells(0).Width = Unit.Pixel(156) 'BANCO - e.Row.Cells(1).Width = Unit.Pixel(206) 'EJECUTIVO - e.Row.Cells(2).Width = Unit.Pixel(106) 'TELEFONO - e.Row.Cells(3).Width = Unit.Pixel(95) 'ESTATUS - e.Row.Cells(4).Width = Unit.Pixel(95) 'FECHA - e.Row.Cells(5).Width = Unit.Pixel(100) 'USUARIO - e.Row.Cells(6).Width = Unit.Pixel(100) 'EDITAR - e.Row.Cells(7).Width = Unit.Pixel(65) 'ELIMINAR + e.Row.Cells(0).Width = Unit.Pixel(156) 'BANCO SAT + e.Row.Cells(1).Width = Unit.Pixel(156) 'BANCO + e.Row.Cells(2).Width = Unit.Pixel(206) 'EJECUTIVO + e.Row.Cells(3).Width = Unit.Pixel(106) 'TELEFONO + e.Row.Cells(4).Width = Unit.Pixel(95) 'ESTATUS + e.Row.Cells(5).Width = Unit.Pixel(95) 'FECHA + e.Row.Cells(6).Width = Unit.Pixel(100) 'USUARIO + e.Row.Cells(7).Width = Unit.Pixel(65) 'EDITAR + e.Row.Cells(8).Width = Unit.Pixel(65) 'ELIMINAR End If + e.Row.Cells(0).HorizontalAlign = HorizontalAlign.Left - e.Row.Cells(3).HorizontalAlign = HorizontalAlign.Center + e.Row.Cells(1).HorizontalAlign = HorizontalAlign.Left e.Row.Cells(4).HorizontalAlign = HorizontalAlign.Center e.Row.Cells(5).HorizontalAlign = HorizontalAlign.Center e.Row.Cells(6).HorizontalAlign = HorizontalAlign.Center - e.Row.Cells(7).HorizontalAlign = HorizontalAlign.Center + 'e.Row.Cells(7).HorizontalAlign = HorizontalAlign.Center + e.Row.Cells(8).HorizontalAlign = HorizontalAlign.Center + End If + + If (e.Row.RowState And DataControlRowState.Edit) = DataControlRowState.Edit Then + Dim DdlSatBanco As DropDownList = e.Row.FCDropDownList("DdlSatBanco") + DdlSatBanco.ClearSelection() + DdlSatBanco.SelectedValue = Nothing + DdlSatBanco.Items.Clear() + DdlSatBanco.DataSource = DTBancosSAT + DdlSatBanco.DataBind() + DdlSatBanco.Items.Insert(0, New ListItem("Seleccione uno", "-1")) + DdlSatBanco.SelectedValueExist(e.Row.DataKey("CveSATBanco").ToString()) + End If + End Sub Protected Sub GvDatos_RowDeleting(sender As Object, e As System.Web.UI.WebControls.GridViewDeleteEventArgs) Handles GvDatos.RowDeleting @@ -126,19 +175,16 @@ Partial Class Bancos_CatBancos Dim Telefono As String = DirectCast(GvDatos.Rows(e.RowIndex).FindControl("TxtTelefono"), TextBox).Text.Trim Dim Estatus As Boolean = GvDatos.Rows(e.RowIndex).FCCheckBox("ChkEstatus").Checked Dim CveBanco As Integer = GvDatos.DataKeys(e.RowIndex).Value.ToString.ToEntero + Dim CveSATBanco As Integer = GvDatos.Rows(e.RowIndex).FCDropDownList("DdlSatBanco").SelectedValue.ToEntero Dim TieneError As Boolean = False - If ObjBancos.UpdateBancos(Banco, Ejecutivo, Telefono, Estatus, CveBanco) Then - If ObjBancos.InhabilitarCuentasBancos(CveBanco, Estatus) Then - GvDatos.EditIndex = -1 - ViewState("DTBancos") = ObjBancos.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa) - DtBan = ObjBancos.DtResultados.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa) - GlobalDTBancos = ObjBancos.DtResultados - Alert("Los cambios se guardaron correctamente.", TipoMensaje.MsgInformacion) - Else + If ObjBancos.UpdateBancos(Banco, Ejecutivo, Telefono, Estatus, CveBanco, CveSATBanco:=CveSATBanco) Then + + If Not ObjBancos.InhabilitarCuentasBancos(CveBanco, Estatus) Then TieneError = True End If + Else TieneError = True End If @@ -152,12 +198,24 @@ Partial Class Bancos_CatBancos ObjBancos.Dispose() - If ViewState("Orden").ToString() <> String.Empty Then - CargaGrid(ViewState("Orden").ToString()) - Else - CargaGrid("") + If Not TieneError Then + + GvDatos.EditIndex = -1 + CargaDatos() + GlobalDTBancos = Nothing + Alert("Los cambios se guardaron correctamente.", TipoMensaje.MsgInformacion) + + If ViewState("Orden").ToString() <> String.Empty Then + CargaGrid(ViewState("Orden").ToString()) + Else + CargaGrid("") + End If + End If + + + End Sub Protected Sub GvDatos_RowEditing(sender As Object, e As System.Web.UI.WebControls.GridViewEditEventArgs) Handles GvDatos.RowEditing diff --git a/Inventarios/EntregaAlmacen.aspx b/Inventarios/EntregaAlmacen.aspx index 704ef64f1..9962a828a 100644 --- a/Inventarios/EntregaAlmacen.aspx +++ b/Inventarios/EntregaAlmacen.aspx @@ -1163,16 +1163,36 @@ } - function fncCantidad(checkbox, numeroMax, idTbCantidadF) { + function fncCantidad(checkbox, numeroMax, idTbCantidadF, rfv) { var $textbox = $('#' + idTbCantidadF); if ($(checkbox).is(':checked')) { $textbox.val(numeroMax); + activarValidatorPorId(rfv); } else { $textbox.val(0); + desactivarValidatorPorId(rfv); } } + + function desactivarValidatorPorId(idValidatorCliente) { + var validator = document.getElementById(idValidatorCliente); + if (validator) { + validator.enabled = false; + validator.style.display = "none"; + } + } + + function activarValidatorPorId(idValidatorCliente) { + var validator = document.getElementById(idValidatorCliente); + if (validator) { + validator.enabled = true; + validator.style.display = "inline"; + } + } + + diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb index e28995f1c..a269e448a 100644 --- a/Inventarios/EntregaAlmacen.aspx.vb +++ b/Inventarios/EntregaAlmacen.aspx.vb @@ -1278,7 +1278,7 @@ Partial Class Inventarios_EntregaAlmacen If BloqueCantidad Then e.Row.FCTextBox("TbCantidadF").Enabled = False Else - e.Row.FCCheckBox("cbInv").Attributes.Add("onclick", $"fncCantidad(this,{e.Row.DBCampo("CantidadF")},'{e.Row.FCTextBox("TbCantidadF").ClientID}')") + e.Row.FCCheckBox("cbInv").Attributes.Add("onclick", $"fncCantidad(this,{e.Row.DBCampo("CantidadF")},'{e.Row.FCTextBox("TbCantidadF").ClientID}','{e.Row.FCRequiredFieldValidator("RFVCaducidad").ClientID}')") End If @@ -1996,6 +1996,8 @@ Partial Class Inventarios_EntregaAlmacen #Region " GUARDAR " Protected Sub BtnGuardar_Click(sender As Object, e As EventArgs) + Alert("ok") + Exit Sub Select Case TipoEntrega Case 1