diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index 5764b4f20..0ae7b54da 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -159,6 +159,7 @@ Public Class ClsClientes Public Property RepresentanteLegal As String Public Property CveAlmacenAsignado As Integer = -1 Public Property CveAlmacenAlterno As Integer = -1 + Public Property CveAlmacenConsignacion As Integer = -1 Public Property UsaProductoAlterno As Boolean = False @@ -409,6 +410,8 @@ Public Class ClsClientes _RepresentanteLegal = Data(0)("RepresentanteLegal").ToString _CveAlmacenAsignado = Data(0)("CveAlmacenAsignado").ToString.ToEntero _CveAlmacenAlterno = Data(0)("CveAlmacenAlterno").ToString.ToEntero + _CveAlmacenConsignacion = Data(0)("CveAlmacenConsignacion").ToString.ToEntero + _UsaProductoAlterno = CBool(Data(0)("UsaProductoAlterno")) End If @@ -527,7 +530,7 @@ Public Class ClsClientes Optional CveMotivoTraslado As Integer = 0, Optional NumRegIdTrib As String = "", Optional ComExtEstado As String = "-1", Optional ComExtMunicipio As String = "-1", Optional ComExtColonia As String = "-1", Optional RequiereOC As Boolean = False, Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False, - Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True, Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenAlterno As Integer = -1, Optional UsaProductoAlterno As Boolean = False) As Boolean + Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True, Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenConsignacion As Integer = -1, Optional CveAlmacenAlterno As Integer = -1, Optional UsaProductoAlterno As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -657,6 +660,7 @@ Public Class ClsClientes .Add("@Genero", SqlDbType.Bit).Value = Genero .Add("@CveAlmacenAsignado", SqlDbType.Int).Value = CveAlmacenAsignado .Add("@CveAlmacenAlterno", SqlDbType.Int).Value = CveAlmacenAlterno + .Add("@CveAlmacenConsignacion", SqlDbType.Int).Value = CveAlmacenConsignacion .Add("@UsaProductoAlterno", SqlDbType.Bit).Value = UsaProductoAlterno End With Try @@ -703,7 +707,7 @@ Public Class ClsClientes Optional ApellidoPaternoPF As String = "-1", Optional ApellidoMaternoPF As String = "-1", Optional NombresPF As String = "-1", Optional RequiereOC As Boolean = False, Optional LT As String = "0", Optional LG As String = "0", Optional EsDistribuidor As Boolean = False, Optional TipoCliente As Integer = 1, Optional CargoUsado As Boolean = False, Optional BonificacionUsado As Boolean = False, Optional CveTipoRetencion As Integer = 0, Optional CorreoEntregaCompras As String = "-1", Optional CorreoEntregaAlmacen As String = "-1", Optional CveSATEstado As Integer = -1, Optional CveAdminTrayecto As Integer = -1, Optional NoDesglosaIVA As Boolean = False, Optional CveRegimenFiscal As Integer = 0, Optional RegimenSociedad As String = "-1", Optional TipoPersona As Boolean = False, - Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True, Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenAlterno As Integer = -1, Optional UsaProductoAlterno As Boolean = False) As Boolean + Optional RepresentanteLegal As String = "", Optional FechaLimiteCredito As Date = MinFecha, Optional ComExtCalle As String = "-1", Optional ComExtNumExt As String = "-1", Optional ComExtCP As String = "-1", Optional Genero As Boolean = True, Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenAlterno As Integer = -1, Optional CveAlmacenConsignacion As Integer = -1, Optional UsaProductoAlterno As Boolean = False) As Boolean Dim Retorno As Boolean = False @@ -842,6 +846,7 @@ Public Class ClsClientes .Add("@ComExtCP", SqlDbType.VarChar).Value = ComExtCP .Add("@Genero", SqlDbType.Bit).Value = Genero .Add("@CveAlmacenAsignado", SqlDbType.Int).Value = CveAlmacenAsignado + .Add("@CveAlmacenConsignacion", SqlDbType.Int).Value = CveAlmacenConsignacion .Add("@CveAlmacenAlterno", SqlDbType.Int).Value = CveAlmacenAlterno .Add("@UsaProductoAlterno", SqlDbType.Bit).Value = UsaProductoAlterno @@ -984,9 +989,12 @@ Public Class ClsClientes Dim Retorno As Boolean = False DataAdapter("PA_Vta_SucursalClienteGet") - SqlAdapter.SelectCommand.Parameters.Add("@CveCliente", SqlDbType.Int).Value = CveCliente - SqlAdapter.SelectCommand.Parameters.Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal - SqlAdapter.SelectCommand.Parameters.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + With SqlAdapter.SelectCommand.Parameters + .Add("@CveCliente", SqlDbType.Int).Value = CveCliente + .Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try SqlAdapter.Fill(Data) Retorno = True @@ -1001,10 +1009,13 @@ Public Class ClsClientes Dim Retorno As Boolean = False DataAdapter("PA_Vta_ClientesSucursalesGet") - SqlAdapter.SelectCommand.Parameters.Add("@RFC", SqlDbType.VarChar).Value = RFC - SqlAdapter.SelectCommand.Parameters.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - SqlAdapter.SelectCommand.Parameters.Add("@CveCliente", SqlDbType.Int).Value = CveCliente - SqlAdapter.SelectCommand.Parameters.Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal + With SqlAdapter.SelectCommand.Parameters + .Add("@RFC", SqlDbType.VarChar).Value = RFC + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveCliente", SqlDbType.Int).Value = CveCliente + .Add("@CveClienteSucursal", SqlDbType.Int).Value = CveClienteSucursal + End With + Try SqlAdapter.Fill(Data) Retorno = True @@ -1052,7 +1063,7 @@ Public Class ClsClientes 'End Function Public Function AddSucursal(CveCliente As Integer, Sucursal As String, CveUsuario As Integer, Ciudad As String, Colonia As String, CP As String, Direccion As String, Estado As String, Localidad As String, Pais As String, NoExt As String, NoInt As String, Telefono As String, Correo As String, CorreoCotizacion As String, Contacto As String, CveVendedor As Integer, NumCtaPago As String, CveMetodoPago As Integer, LimiteCredito As Decimal, CveResponsableSucursal As Integer, CveUsoCFDI As Integer, CveFormaPago33 As Integer, CveMetodoPago33 As Integer, Optional LT As String = "0", Optional LG As String = "0", Optional RFC As String = "", - Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenAlterno As Integer = -1) As Boolean + Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenConsignacion As Integer = -1, Optional CveAlmacenAlterno As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_SucursalClienteAdd") @@ -1088,6 +1099,7 @@ Public Class ClsClientes .Add("@RFC", SqlDbType.VarChar).Value = RFC .Add("@CveAlmacenAsignado", SqlDbType.Int).Value = CveAlmacenAsignado + .Add("@CveAlmacenConsignacion", SqlDbType.Int).Value = CveAlmacenConsignacion .Add("@CveAlmacenAlterno", SqlDbType.Int).Value = CveAlmacenAlterno End With @@ -1109,7 +1121,7 @@ Public Class ClsClientes End Function Public Function UpdateSucursal(Sucursal As String, Estatus As Boolean, CveCliente As Integer, CveClienteSucursal As Integer, Ciudad As String, Colonia As String, CP As String, Direccion As String, Estado As String, Localidad As String, Pais As String, NoExt As String, NoInt As String, Telefono As String, Correo As String, CorreoCotizacion As String, Contacto As String, CveVendedor As Integer, NumCtaPago As String, CveMetodoPago As Integer, LimiteCredito As Decimal, CveResponsableSucursal As Integer, CveUsoCFDI33 As Integer, CveFormaPago33 As Integer, CveMetodoPago33 As Integer, Optional LT As String = "0", Optional LG As String = "0", Optional RFC As String = "-1", - Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenAlterno As Integer = -1) As Boolean + Optional CveAlmacenAsignado As Integer = -1, Optional CveAlmacenConsignacion As Integer = -1, Optional CveAlmacenAlterno As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_SucursalClienteUpdate") @@ -1142,12 +1154,12 @@ Public Class ClsClientes .Add("@CveFormaPago33", SqlDbType.Int).Value = CveFormaPago33 .Add("@CveMetodoPago33", SqlDbType.Int).Value = CveMetodoPago33 - .Add("@LT", SqlDbType.VarChar).Value = LT .Add("@LG", SqlDbType.VarChar).Value = LG .Add("@RFC", SqlDbType.VarChar).Value = RFC .Add("@CveAlmacenAsignado", SqlDbType.Int).Value = CveAlmacenAsignado + .Add("@CveAlmacenConsignacion", SqlDbType.Int).Value = CveAlmacenConsignacion .Add("@CveAlmacenAlterno", SqlDbType.Int).Value = CveAlmacenAlterno End With diff --git a/Ventas/Clientes.aspx b/Ventas/Clientes.aspx index fcf2d5513..90b18644b 100644 --- a/Ventas/Clientes.aspx +++ b/Ventas/Clientes.aspx @@ -804,14 +804,21 @@
-
+
-
-
+
+
+
+ + + +
+
+
@@ -5256,12 +5263,16 @@
-
-
+
+
+
+
+ +
-
+
diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb index f03d07f5e..3b7809560 100644 --- a/Ventas/Clientes.aspx.vb +++ b/Ventas/Clientes.aspx.vb @@ -1579,6 +1579,7 @@ Partial Class Clientes ChkProductoAlterno.Checked = ObjClientes.UsaProductoAlterno DdlAlmacenAsignado.SelectedValueExist(ObjClientes.CveAlmacenAsignado) DdlAlmacenAlterno.SelectedValueExist(ObjClientes.CveAlmacenAlterno) + DdlAlmacenConsignacion.SelectedValueExist(ObjClientes.CveAlmacenConsignacion) 'COMERCIO EXTERIOR ChkAplicaComercioExterior.Checked = ObjClientes.AplicaComercioExterior @@ -3055,8 +3056,7 @@ Partial Class Clientes HDMAPOP.Value = "2" If UsuarioActual.Empresa.Funcionalidad(578) = "1" Then - DvAlmacenSucursal.Visible = True - DvAlmacenAlternoSucursal.Visible = True + DivAlmacenesSucursal.Visible = True ddlAlmacenSucursal.Items.Clear() ddlAlmacenSucursal.ClearSelection() ddlAlmacenSucursal.SelectedValue = Nothing @@ -3067,12 +3067,19 @@ Partial Class Clientes DdlAlmacenAlternoSucursal.SelectedValue = Nothing DdlAlmacenAlternoSucursal.DataSource = GlobalDTAlmacen(UsuarioActual.CveEmpresa) DdlAlmacenAlternoSucursal.DataBind() + DdlAlmacenConsignacionSucursal.Items.Clear() + DdlAlmacenConsignacionSucursal.ClearSelection() + DdlAlmacenConsignacionSucursal.SelectedValue = Nothing + DdlAlmacenConsignacionSucursal.DataSource = GlobalDTAlmacen(UsuarioActual.CveEmpresa) + DdlAlmacenConsignacionSucursal.DataBind() End If ddlAlmacenSucursal.Items.Insert(0, New ListItem("Seleccione", "-1")) ddlAlmacenSucursal.SelectedValueExist("-1") DdlAlmacenAlternoSucursal.Items.Insert(0, New ListItem("Seleccione", "-1")) DdlAlmacenAlternoSucursal.SelectedValueExist("-1") + DdlAlmacenConsignacionSucursal.Items.Insert(0, New ListItem("Seleccione", "-1")) + DdlAlmacenConsignacionSucursal.SelectedValueExist("-1") UpModalDivMapa.Update() RegistraScript("showDivEC();") @@ -3105,6 +3112,7 @@ Partial Class Clientes Dim RFC As String = If(String.IsNullOrEmpty(TxtRFCSucursal.Text), "-1", TxtRFCSucursal.Text) Dim CveAlmacenAgregadoSucursal As Integer = ddlAlmacenSucursal.SelectedValue.ToEntero Dim CveAlmacenAlternoSucursal As Integer = DdlAlmacenAlternoSucursal.SelectedValue.ToEntero + Dim CveAlmacenConsignacionSucursal As Integer = DdlAlmacenConsignacionSucursal.SelectedValue.ToEntero If CveCliente > 0 Then @@ -3124,7 +3132,7 @@ Partial Class Clientes Dim Estatus As Boolean = ChkEstatusSucursal.Checked If ObjCliente.UpdateSucursal(TxtNombreSucursal.Text.Trim, Estatus, CveCliente, CveClienteSuc, TxtCiudadSucursal.Text.Trim, TxtColoniaSucursal.Text.Trim, TxtCPSucursal.Text.Trim, TxtDireccionSucursal.Text.Trim, TxtEstadoSucursal.Text.Trim, TxtLocalidadSucursal.Text.Trim, TxtPaisSucursal.Text.Trim, TxtNumExtSucursal.Text.Trim, TxtNumIntSucursal.Text.Trim, TxtTelefonoSucursal.Text.Trim.Replace(" ", "").Replace("(", "").Replace(")", "").Replace("-", "").Replace("_", ""), TxtCorreoSucursal.Text.Trim, TxtCorreoSucursalCotizacion.Text.Trim, TxtContactoSucursal.Text.Trim, DdlVendedorSucursal.SelectedValue.ToEntero(), TxtNumeroCuenta.Text, DdlMetodoPagoSucursal.SelectedValue.ToEntero(), TxtLimiteCreditoSucursal.Text.ToDecimal(), DdlResponsableSucursal.SelectedValue.ToEntero(), - DdlSucursalUsoCFDI.SelectedValue.ToEntero(), DdlSucursalFormaPago33.SelectedValue.ToEntero(), DdlSucursalMetodoPago33.SelectedValue.ToEntero(), LT:=LT, LG:=LG, RFC:=RFC, CveAlmacenAsignado:=CveAlmacenAgregadoSucursal, CveAlmacenAlterno:=CveAlmacenAlternoSucursal) Then + DdlSucursalUsoCFDI.SelectedValue.ToEntero(), DdlSucursalFormaPago33.SelectedValue.ToEntero(), DdlSucursalMetodoPago33.SelectedValue.ToEntero(), LT:=LT, LG:=LG, RFC:=RFC, CveAlmacenAsignado:=CveAlmacenAgregadoSucursal, CveAlmacenConsignacion:=CveAlmacenConsignacionSucursal, CveAlmacenAlterno:=CveAlmacenAlternoSucursal) Then GVSucursales.EditIndex = -1 ViewState("DTSucursalesCliente") = ObjCliente.DtResultados Alert("Los cambios se guardaron correctamente.", TipoMensaje.MsgInformacion) @@ -3136,7 +3144,7 @@ Partial Class Clientes Else If ObjCliente.AddSucursal(CveCliente, TxtNombreSucursal.Text.Trim, UsuarioActual.CveUsuario, TxtCiudadSucursal.Text.Trim, TxtColoniaSucursal.Text.Trim, TxtCPSucursal.Text.Trim, TxtDireccionSucursal.Text.Trim, TxtEstadoSucursal.Text.Trim, TxtLocalidadSucursal.Text.Trim, TxtPaisSucursal.Text.Trim, TxtNumExtSucursal.Text.Trim, TxtNumIntSucursal.Text.Trim, TxtTelefonoSucursal.Text.Trim.Replace(" ", "").Replace("(", "").Replace(")", "").Replace("-", ""), TxtCorreoSucursal.Text.Trim, TxtCorreoSucursalCotizacion.Text.Trim, TxtContactoSucursal.Text.Trim, DdlVendedorSucursal.SelectedValue.ToEntero(), TxtNumeroCuenta.Text, DdlMetodoPagoSucursal.SelectedValue.ToEntero(), TxtLimiteCreditoSucursal.Text.ToDecimal(), DdlResponsableSucursal.SelectedValue.ToEntero(), - DdlSucursalUsoCFDI.SelectedValue.ToEntero(), DdlSucursalFormaPago33.SelectedValue.ToEntero(), DdlSucursalMetodoPago33.SelectedValue.ToEntero(), LT:=LT, LG:=LG, RFC:=RFC, CveAlmacenAsignado:=CveAlmacenAgregadoSucursal, CveAlmacenAlterno:=CveAlmacenAlternoSucursal) Then + DdlSucursalUsoCFDI.SelectedValue.ToEntero(), DdlSucursalFormaPago33.SelectedValue.ToEntero(), DdlSucursalMetodoPago33.SelectedValue.ToEntero(), LT:=LT, LG:=LG, RFC:=RFC, CveAlmacenAsignado:=CveAlmacenAgregadoSucursal, CveAlmacenConsignacion:=CveAlmacenConsignacionSucursal, CveAlmacenAlterno:=CveAlmacenAlternoSucursal) Then TxtNombreSucursal.Text = "" TxtCiudadSucursal.Text = "" TxtColoniaSucursal.Text = "" @@ -3319,7 +3327,7 @@ Partial Class Clientes HDMAPOP.Value = "2" If UsuarioActual.Empresa.Funcionalidad(578) = "1" Then - DvAlmacenSucursal.Visible = True + DivAlmacenesSucursal.Visible = True ddlAlmacenSucursal.Items.Clear() ddlAlmacenSucursal.ClearSelection() ddlAlmacenSucursal.SelectedValue = Nothing @@ -3327,7 +3335,6 @@ Partial Class Clientes ddlAlmacenSucursal.DataBind() ddlAlmacenSucursal.Items.Insert(0, New ListItem("Seleccione", "-1")) ddlAlmacenSucursal.SelectedValueExist(ObjCliente.DtResultados.Rows(0)("CveAlmacenAsignado").ToString()) - DvAlmacenAlternoSucursal.Visible = True DdlAlmacenAlternoSucursal.Items.Clear() DdlAlmacenAlternoSucursal.ClearSelection() DdlAlmacenAlternoSucursal.SelectedValue = Nothing @@ -3335,6 +3342,13 @@ Partial Class Clientes DdlAlmacenAlternoSucursal.DataBind() DdlAlmacenAlternoSucursal.Items.Insert(0, New ListItem("Seleccione", "-1")) DdlAlmacenAlternoSucursal.SelectedValueExist(ObjCliente.DtResultados.Rows(0)("CveAlmacenAlterno").ToString()) + DdlAlmacenConsignacionSucursal.Items.Clear() + DdlAlmacenConsignacionSucursal.ClearSelection() + DdlAlmacenConsignacionSucursal.SelectedValue = Nothing + DdlAlmacenConsignacionSucursal.DataSource = GlobalDTAlmacen(UsuarioActual.CveEmpresa) + DdlAlmacenConsignacionSucursal.DataBind() + DdlAlmacenConsignacionSucursal.Items.Insert(0, New ListItem("Seleccione", "-1")) + DdlAlmacenConsignacionSucursal.SelectedValueExist(ObjCliente.DtResultados.Rows(0)("CveAlmacenConsignacion").ToString()) End If UpAgregarSucursal.Update() @@ -5615,6 +5629,7 @@ Partial Class Clientes RowSucursal("LG") = If(txtLg.Text.ToDouble <> 0, txtLg.Text, "0") RowSucursal("CveAlmacenAsignado") = ddlAlmacenSucursal.SelectedValue.ToEntero + RowSucursal("CveAlmacenConsignacion") = DdlAlmacenConsignacionSucursal.SelectedValue.ToEntero RowSucursal("CveAlmacenAlterno") = DdlAlmacenAlternoSucursal.SelectedValue.ToEntero TempDTSucursales.Rows.Add(RowSucursal)