diff --git a/App_Code/ClsExportaciones.vb b/App_Code/ClsExportaciones.vb index 81c817d3f..ea59fddc9 100644 --- a/App_Code/ClsExportaciones.vb +++ b/App_Code/ClsExportaciones.vb @@ -143,9 +143,10 @@ Public Class ClsExportaciones Public Function AddExportacion(CveSubProyecto As Integer, NumeroPedimento As String, FechaPedimento As Date, CveVenta As Integer, TipoCambio As Decimal, TipoExportacion As Integer, CveExportacionEstatus As Integer, CveClienteExportador As Integer, CveClienteImportador As Integer, CveClienteConsignatario As Integer, CveAgente As Integer, - ClaveAduana As Integer, DescripcionContenedor As String, CveProveedor As Integer, MedioTransporte As Integer, TipoContenedor As Integer, Sello1 As String, Sello2 As String, - Sello3 As String, SCAC As String, CAAT As String, ContenedorPlaca As String, CveEmpresa As Integer, CveUsuario As Integer, CveDirExportador As Integer, CveDirConsignatario As Integer, - CveIncoterm As Integer, Notas As String, CvePedimento As Integer, CveAgenteExtranjero As Integer, ITN As String, Vinculacion As Boolean, EsExportacion As Boolean) As Integer + ClaveAduana As Integer, DescripcionContenedor As String, CveProveedor As Integer, MedioTransporte As Integer, TipoContenedor As Integer, Sello1 As String, + Sello2 As String, Sello3 As String, SCAC As String, CAAT As String, ContenedorPlaca As String, CveEmpresa As Integer, CveUsuario As Integer, CveDirExportador As Integer, + CveDirImportador As Integer, CveDirConsignatario As Integer, CveIncoterm As Integer, Notas As String, CvePedimento As Integer, CveAgenteExtranjero As Integer, + ITN As String, Vinculacion As Boolean, EsExportacion As Boolean) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Exp_ExportacionesAdd") With SqlAdapter.SelectCommand.Parameters @@ -174,6 +175,7 @@ Public Class ClsExportaciones .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveDirExportador", SqlDbType.Int).Value = CveDirExportador + .Add("@CveDirImportador", SqlDbType.Int).Value = CveDirImportador .Add("@CveDirConsignatario", SqlDbType.Int).Value = CveDirConsignatario .Add("@CveIncoterm", SqlDbType.Int).Value = CveIncoterm .Add("@Notas", SqlDbType.VarChar).Value = Notas @@ -198,8 +200,9 @@ Public Class ClsExportaciones Public Function UpdateExportacion(CveExportacion As Integer, CveSubProyecto As Integer, NumeroPedimento As String, FechaPedimento As Date, CveVenta As Integer, TipoCambio As Decimal, TipoExportacion As Integer, CveExportacionEstatus As Integer, CveClienteExportador As Integer, CveClienteImportador As Integer, CveClienteConsignatario As Integer, CveAgente As Integer, ClaveAduana As Integer, DescripcionContenedor As String, CveProveedor As Integer, MedioTransporte As Integer, TipoContenedor As Integer, - Sello1 As String, Sello2 As String, Sello3 As String, SCAC As String, CAAT As String, ContenedorPlaca As String, CveEmpresa As Integer, CveUsuario As Integer, CveDirExportador As Integer, - CveDirConsignatario As Integer, CveIncoterm As Integer, Notas As String, CvePedimento As Integer, CveAgenteExtranjero As Integer, ITN As String, Vinculacion As Boolean) As Boolean + Sello1 As String, Sello2 As String, Sello3 As String, SCAC As String, CAAT As String, ContenedorPlaca As String, CveEmpresa As Integer, CveUsuario As Integer, + CveDirExportador As Integer, CveDirImportador As Integer, CveDirConsignatario As Integer, CveIncoterm As Integer, Notas As String, CvePedimento As Integer, + CveAgenteExtranjero As Integer, ITN As String, Vinculacion As Boolean) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Exp_ExportacionesUpdate") With SqlAdapter.SelectCommand.Parameters @@ -229,6 +232,7 @@ Public Class ClsExportaciones .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveDirExportador", SqlDbType.Int).Value = CveDirExportador + .Add("@CveDirImportador", SqlDbType.Int).Value = CveDirImportador .Add("@CveDirConsignatario", SqlDbType.Int).Value = CveDirConsignatario .Add("@CveIncoterm", SqlDbType.Int).Value = CveIncoterm .Add("@Notas", SqlDbType.VarChar).Value = Notas diff --git a/Export/ExpDetalle.aspx b/Export/ExpDetalle.aspx index e11559959..ac4590e6d 100644 --- a/Export/ExpDetalle.aspx +++ b/Export/ExpDetalle.aspx @@ -215,6 +215,14 @@ +
+ +
+ + + +
+
diff --git a/Export/ExpDetalle.aspx.cs b/Export/ExpDetalle.aspx.cs index 90996a4ae..995c5e416 100644 --- a/Export/ExpDetalle.aspx.cs +++ b/Export/ExpDetalle.aspx.cs @@ -227,6 +227,7 @@ public partial class Export_ExpDetalle : ClsPaginas ActualizarValores(); // Se actualizan los valores que dependen de otros campos DdlDirExp.SelectedValue = DTExportaciones.FiltroPrimeroValor("CveDirExportador"); // Seleccionar las Dir DESPUÉS de llenar el dropdown + DdlDirImp.SelectedValue = DTExportaciones.FiltroPrimeroValor("CveDirImportador"); DdlDirCon.SelectedValue = DTExportaciones.FiltroPrimeroValor("CveDirConsignatario"); CargarPartidas(); @@ -292,6 +293,23 @@ public partial class Export_ExpDetalle : ClsPaginas } } + // Clave Dir. Importador + string CveImportador = DdlImp.SelectedValue; + if (CveImportador != "" && CveImportador != "-1") + { + string CveDirImp = DdlDirImp.Text; + DdlDirImp.Items.Clear(); + DdlDirImp.DataSource = get_GlobalDTProveedorSucursales(CveImportador.ToEntero(), CveEmpresa); + DdlDirImp.Items.Insert(0, new ListItem("Seleccione", "-1")); + DdlDirImp.DataBind(); + if (CveDirImp != "" && CveDirImp != "-1") + { + ListItem ItemDirImp = DdlDirImp.Items.FindByValue(CveDirImp); + if (ItemDirImp != null) + DdlDirImp.SelectedValue = CveDirImp; + } + } + // Clave Dir. Consignatario string CveConsignatario = DdlCon.SelectedValue; if (CveConsignatario != "" && CveConsignatario != "-1") @@ -388,6 +406,7 @@ public partial class Export_ExpDetalle : ClsPaginas int CveEmpresa = UsuarioActual.CveEmpresa; int CveUsuario = UsuarioActual.CveUsuario; int CveDirExportador = DdlDirExp.Text.ToEntero(); + int CveDirImportador = DdlDirImp.Text.ToEntero(); int CveDirConsignatario = DdlDirCon.Text.ToEntero(); bool Vinculacion = CkbVinculacion.Checked; int CveIncoterm = DdlIncoterm.Text.ToEntero(); @@ -436,6 +455,7 @@ public partial class Export_ExpDetalle : ClsPaginas CveEmpresa, CveUsuario, CveDirExportador, + CveDirImportador, CveDirConsignatario, CveIncoterm, Notas, @@ -517,6 +537,7 @@ public partial class Export_ExpDetalle : ClsPaginas CveEmpresa, CveUsuario, CveDirExportador, + CveDirImportador, CveDirConsignatario, CveIncoterm, Notas,