From 83545b7710685051afd40f7c803dc04ea9cbabce Mon Sep 17 00:00:00 2001 From: JPerez Date: Fri, 11 Jul 2025 11:03:10 -0700 Subject: [PATCH 1/8] --FIX envio polizas virtuales --- Ventas/Ventas.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 65774ea22..8f601ab49 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -37655,7 +37655,7 @@ Partial Class Ventas Try Using wc As New HttpClient() - Dim Url As New Uri("http://polizavirtual.com.mx/webservice/api/Venta") + Dim Url As New Uri("https://polizavirtual.com.mx/webservice/api/Venta") Dim Parametros As New List(Of KeyValuePair(Of String, String)) From 3db652dcb51471049520ca80e86f4383161e512e Mon Sep 17 00:00:00 2001 From: SLopez Date: Fri, 11 Jul 2025 18:04:30 -0700 Subject: [PATCH 2/8] =?UTF-8?q?Cambios=20en=20el=20documento=20exportaci?= =?UTF-8?q?=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Export/ExpDetalle.aspx.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Export/ExpDetalle.aspx.cs b/Export/ExpDetalle.aspx.cs index a166ebb37..c0eac7c49 100644 --- a/Export/ExpDetalle.aspx.cs +++ b/Export/ExpDetalle.aspx.cs @@ -1039,9 +1039,12 @@ public partial class Export_ExpDetalle : ClsPaginas string ClienteExportador = DTExportaciones.FiltroPrimeroValor("ClienteExportador"); string DirExportador = DTExportaciones.FiltroPrimeroValor("DirExportador"); string RFCExp = DTExportaciones.FiltroPrimeroValor("RFCExp"); + string PPSExp = DTExportaciones.FiltroPrimeroValor("PPSExp"); + string IMMEXexp = DTExportaciones.FiltroPrimeroValor("IMMEXexp"); string ClienteImportador = DTExportaciones.FiltroPrimeroValor("ClienteImportador"); string DirImportador = DTExportaciones.FiltroPrimeroValor("DirImportador"); string RFCImp = DTExportaciones.FiltroPrimeroValor("RFCImp"); + string PPSImp = DTExportaciones.FiltroPrimeroValor("PPSImp"); string IMMEXimp = DTExportaciones.FiltroPrimeroValor("IMMEXimp"); string NumFactura = DTExportaciones.FiltroPrimeroValor("SerieFolio"); string ClaveSATPedimento = DTExportaciones.FiltroPrimeroValor("ClaveSATPedimento"); @@ -1071,6 +1074,7 @@ public partial class Export_ExpDetalle : ClsPaginas string ClienteConsignatario = DTExportaciones.FiltroPrimeroValor("ClienteConsignatario"); string DirConsignatario = DTExportaciones.FiltroPrimeroValor("DirConsignatario"); string RFCCon = DTExportaciones.FiltroPrimeroValor("RFCCon"); + string PPSCon = DTExportaciones.FiltroPrimeroValor("PPSCon"); string IMMEXcon = DTExportaciones.FiltroPrimeroValor("IMMEXcon"); decimal IncFletes = 0.00m; @@ -1086,6 +1090,18 @@ public partial class Export_ExpDetalle : ClsPaginas decimal TotalInc = 0.00m; decimal TotalDec = 0.00m; + string Sellos = ""; + for (int i = 1; i <= 3; i++) + { + string sello = DTExportaciones.FiltroPrimeroValor($"Sello{i}"); + if (sello != "") + { + if(Sellos == "") + Sellos += sello; + else + Sellos += $", {sello}"; + } + } string DescContenedor = DTExportaciones.FiltroPrimeroValor("DescripcionContenedor"); string ContenedorPlaca = DTExportaciones.FiltroPrimeroValor("ContenedorPlaca"); string Proveedor = DTExportaciones.FiltroPrimeroValor("Proveedor"); @@ -1105,9 +1121,12 @@ public partial class Export_ExpDetalle : ClsPaginas para.Add(new ReportParameter("ClienteExportador", ClienteExportador)); para.Add(new ReportParameter("DirExportador", DirExportador)); para.Add(new ReportParameter("RFCExp", RFCExp)); + para.Add(new ReportParameter("PPSExp", PPSExp)); + para.Add(new ReportParameter("IMMEXexp", IMMEXexp)); para.Add(new ReportParameter("ClienteImportador", ClienteImportador)); para.Add(new ReportParameter("DirImportador", DirImportador)); para.Add(new ReportParameter("RFCImp", RFCImp)); + para.Add(new ReportParameter("PPSImp", PPSImp)); para.Add(new ReportParameter("IMMEXimp", IMMEXimp)); para.Add(new ReportParameter("NumFactura", NumFactura)); para.Add(new ReportParameter("ClaveSATPedimento", ClaveSATPedimento)); @@ -1121,6 +1140,7 @@ public partial class Export_ExpDetalle : ClsPaginas para.Add(new ReportParameter("ClienteConsignatario", ClienteConsignatario)); para.Add(new ReportParameter("DirConsignatario", DirConsignatario)); para.Add(new ReportParameter("RFCCon", RFCCon)); + para.Add(new ReportParameter("PPSCon", PPSCon)); para.Add(new ReportParameter("IMMEXcon", IMMEXcon)); ClsExportaciones Gastos = new ClsExportaciones(); @@ -1158,6 +1178,7 @@ public partial class Export_ExpDetalle : ClsPaginas para.Add(new ReportParameter("DecOtros", DecOtros.ToString("#,###.####"))); para.Add(new ReportParameter("TotalDec", TotalDec.ToString("#,###.####"))); + para.Add(new ReportParameter("Sellos", Sellos)); para.Add(new ReportParameter("DescContenedor", DescContenedor)); para.Add(new ReportParameter("ContenedorPlaca", ContenedorPlaca)); para.Add(new ReportParameter("Proveedor", Proveedor)); From 9452dcb4d2d430a924ddde977fadb1ebf9798825 Mon Sep 17 00:00:00 2001 From: JPerez Date: Sat, 12 Jul 2025 01:15:19 -0700 Subject: [PATCH 3/8] --Cambios clase, cancelacion timbre --- App_Code/ClsGenerales.vb | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 9df264da9..ba614ae20 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -4018,7 +4018,7 @@ Public Class ClsGenerales End Try Return Retorno End Function - Public Function CancelarTimbreTimbrado(CveTimbre As Integer, FechaCancelacion As DateTime, CvePACCancelacion As Integer, SelloCancelacion As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Public Function CancelarTimbreTimbrado(CveTimbre As Integer, FechaCancelacion As DateTime, CvePACCancelacion As Integer, SelloCancelacion As String, CveUsuario As Integer, CveEmpresa As Integer, Optional RegenerarTimbre As Boolean = False) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_TimbreTimbradoCancelar") @@ -4030,6 +4030,27 @@ Public Class ClsGenerales .Add("@SelloCancelacion", SqlDbType.VarChar).Value = SelloCancelacion .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@RegenerarTimbre", SqlDbType.Bit).Value = RegenerarTimbre + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar el timbrado", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return Retorno + End Function + + Public Function ReactivarTimbreEntregaAlmacen(CveTimbre As Integer, CveEntregaAlmacen As Integer, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_Gral_TimbreReactivarUpdate") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTimbre", SqlDbType.Int).Value = CveTimbre + .Add("@CveEntregaAlmacen", SqlDbType.Int).Value = CveEntregaAlmacen + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -4040,6 +4061,7 @@ Public Class ClsGenerales End Try Return Retorno End Function + Public Function RemoveGralTimbre(CveTimbre As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_TimbreRemove") From 5d06af3dc7d6dfed34be5a2f0db4ca251e7a7a26 Mon Sep 17 00:00:00 2001 From: SLopez Date: Sat, 12 Jul 2025 13:27:58 -0700 Subject: [PATCH 4/8] =?UTF-8?q?Cambios=20en=20documento=20exportaci=C3=B3n?= =?UTF-8?q?=20y=20creaci=C3=B3n=20de=20tabla=20Exp=5FExportacionesDescarga?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Export/ExpDetalle.aspx.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Export/ExpDetalle.aspx.cs b/Export/ExpDetalle.aspx.cs index c0eac7c49..f5a72afff 100644 --- a/Export/ExpDetalle.aspx.cs +++ b/Export/ExpDetalle.aspx.cs @@ -1211,6 +1211,18 @@ public partial class Export_ExpDetalle : ClsPaginas DTPartidas.Columns["ValorUnitarioMN"].DefaultValue = 0.0m; foreach (DataRow row in DTPartidas.Rows) { + string PSCodigoSinDescripcion = row["PSCodigoSinDescripcion"].ToString(); + if (PSCodigoSinDescripcion != "") + row["PSCodigo"] = PSCodigoSinDescripcion; + + string FraccionArancelaria = row["FraccionArancelaria"].ToString(); + if (FraccionArancelaria.Contains("-")) + { + string[] partes = FraccionArancelaria.Split('-'); + if (partes[0] != "") + row["FraccionArancelaria"] = partes[0]; + } + decimal cantidad = Convert.ToDecimal(row["Cantidad"]); if (cantidad > 0) { @@ -1246,6 +1258,7 @@ public partial class Export_ExpDetalle : ClsPaginas lrds.Add(RDSBultos); } } + Partidas.Dispose(); string NombreArchivo; string Formato; From 8b198856ac3848a329e651f0c87f0c845676d9d7 Mon Sep 17 00:00:00 2001 From: JPerez Date: Sat, 12 Jul 2025 14:31:19 -0700 Subject: [PATCH 5/8] --BDH.Opcion de cancelacion en recolecciones --- Inventarios/RepEntregaAlmacenRuta.aspx | 303 +++++++++++------- Inventarios/RepEntregaAlmacenRuta.aspx.cs | 359 +++++++++++++++++++--- 2 files changed, 506 insertions(+), 156 deletions(-) diff --git a/Inventarios/RepEntregaAlmacenRuta.aspx b/Inventarios/RepEntregaAlmacenRuta.aspx index 4fe1a652b..2d9e59f2c 100644 --- a/Inventarios/RepEntregaAlmacenRuta.aspx +++ b/Inventarios/RepEntregaAlmacenRuta.aspx @@ -15,7 +15,6 @@ - @@ -32,7 +31,7 @@
- Sucursal: + Sucursal:
@@ -43,63 +42,61 @@
- -
-
- - - - + +
+
+ + + + +
+ + + + + +
- - - - - - -
- -
-
- - - - + +
+
+ + + + +
+ + + + + +
- - - - - - -
- +
- @@ -109,75 +106,68 @@ " style="display: inline-block; margin-right: -20px; width: 150px;" /> " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"> - - - + + - - - + + + - + - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + - - - + + - - - - + + + +<%-- --%> + - - + + - + - - + + - - + + - - - + + + - - - + + + @@ -188,10 +178,10 @@ - -