diff --git a/Agropecuaria/RepPreciosVentaManifiesto.aspx b/Agropecuaria/RepPreciosVentaManifiesto.aspx
index 4d439724d..7aa2415ec 100644
--- a/Agropecuaria/RepPreciosVentaManifiesto.aspx
+++ b/Agropecuaria/RepPreciosVentaManifiesto.aspx
@@ -13,6 +13,12 @@ color: #666;
font-size: 12px;
}
+ .fa-xs {
+ padding: 0px 0px 0px 0px;
+ font-size: 12px;
+ margin: 0px 0px 0px 0px;
+ }
+
@@ -129,6 +135,7 @@ font-size: 12px;
+
@@ -253,12 +260,12 @@ font-size: 12px;
-
+
-
+
diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb
index 52f588e8d..ba52a899c 100644
--- a/App_Code/ClsVentas.vb
+++ b/App_Code/ClsVentas.vb
@@ -7717,10 +7717,11 @@ Public Class ClsVentas
Return Retorno
End Function
- Public Function AddPreciosVentaManifiesto(CveCultivo As Integer, CveTamaño As Integer, CveCultivoVariedad As Integer, Referencia As String, LdDate As Date, InvDate As Date, PDDate As Date, CantidadVendida As Decimal, PUVenta As Decimal, Observaciones As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean
+ Public Function AddPreciosVentaManifiesto(PalletNum As String, CveCultivo As Integer, CveTamaño As Integer, CveCultivoVariedad As Integer, Referencia As String, LdDate As Date, InvDate As Date, PDDate As Date, CantidadVendida As Decimal, PUVenta As Decimal, Observaciones As String, CveUsuario As Integer, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Agro_PreciosVentaManifiestoAdd")
With SqlAdapter.SelectCommand.Parameters
+ .Add("@PalletNum", SqlDbType.VarChar).Value = PalletNum
.Add("@CveCultivo", SqlDbType.Int).Value = CveCultivo
.Add("@CveTamaño", SqlDbType.Int).Value = CveTamaño
.Add("@CveCultivoVariedad", SqlDbType.Int).Value = CveCultivoVariedad
@@ -7770,7 +7771,6 @@ Public Class ClsVentas
Dim Retorno As Boolean = False
DataAdapter("PA_Agro_PreciosVentaFechaAdd")
With SqlAdapter.SelectCommand.Parameters
-
.Add("@CveCultivo", SqlDbType.Int).Value = CveCultivo
.Add("@CveTamaño", SqlDbType.Int).Value = CveTamaño
.Add("@Descripcion", SqlDbType.VarChar).Value = Descripcion
diff --git a/Ashx/E158.ashx b/Ashx/E158.ashx
index 84e067e77..cc6b92bc6 100644
--- a/Ashx/E158.ashx
+++ b/Ashx/E158.ashx
@@ -77,8 +77,8 @@ Public Class E158 : Implements IHttpHandler, IReadOnlySessionState
End Sub
Private Function PreciosVentaCultivo(ByVal CveEmpresa As Integer, ByVal context As HttpContext) As Boolean
- Dim Respuesta As Boolean = False
- Dim Usuario As Usuario = ValidaUsuarioSistema(100, CveEmpresa)
+ Dim Respuesta As Boolean = True
+ Dim UsuarioActual As Usuario = ValidaUsuarioSistema(100, CveEmpresa)
' Crear una instancia del servicio web
Dim wsservice As New GrowerService.Service()
@@ -94,13 +94,120 @@ Public Class E158 : Implements IHttpHandler, IReadOnlySessionState
Dim Parametro6 As Integer = 0
Dim Parametro6Date As Date = Now.AddDays(-3)
- Dim DTresp As DataTable = wsservice.GetSales(Parametro1, Parametro2, Parametro3, Parametro4, Parametro5, Parametro6)
- DTresp.WriteXml("C:\temp\GrowerService\Sales.xml", XmlWriteMode.WriteSchema)
- DTresp.FiltraParametros("", "", {"CommodityDesc"}).WriteXml("C:\temp\GrowerService\CommodityDesc.xml", XmlWriteMode.WriteSchema)
- DTresp.FiltraParametros("", "", {"VarietyDesc"}).WriteXml("C:\temp\GrowerService\VarietyDesc.xml", XmlWriteMode.WriteSchema)
- DTresp.FiltraParametros("", "", {"SizeDesc"}).WriteXml("C:\temp\GrowerService\SizeDesc.xml", XmlWriteMode.WriteSchema)
+ Dim DTresp As DataTable = wsservice.GetSales(Parametro1, Parametro2, Parametro3, Parametro4, Parametro5, Parametro6)
+ 'DTresp.WriteXml("C:\temp\GrowerService\Sales.xml", XmlWriteMode.WriteSchema)
+ 'DTresp.FiltraParametros("", "", {"CommodityDesc"}).WriteXml("C:\temp\GrowerService\CommodityDesc.xml", XmlWriteMode.WriteSchema)
+ 'DTresp.FiltraParametros("", "", {"VarietyDesc"}).WriteXml("C:\temp\GrowerService\VarietyDesc.xml", XmlWriteMode.WriteSchema)
+ 'DTresp.FiltraParametros("", "", {"SizeDesc"}).WriteXml("C:\temp\GrowerService\SizeDesc.xml", XmlWriteMode.WriteSchema)
+
+
+ DTresp.Columns.Add("InvoiceDateReal", GetType(DateTime))
+
+ For Each row As DataRow In DTresp.Rows
+ Dim fechaTexto As String = row("InvoiceDate").ToString().Trim()
+
+ If DateTime.TryParseExact(fechaTexto, "MM/dd/yy", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, Nothing) Then
+ row("InvoiceDateReal") = DateTime.ParseExact(fechaTexto, "MM/dd/yy", System.Globalization.CultureInfo.InvariantCulture)
+ Else
+ row("InvoiceDateReal") = DBNull.Value
+ End If
+ Next
+
+ DTresp = DTresp.FiltraParametros(" InvoiceDateReal >= #01/01/2025# ")
+
+
+ Dim ObjVentas As New ClsVentas
+ Dim DTCultivo As New DataTable
+ Dim DTCultivoVariedad As New DataTable
+ Dim DTTamaño As New DataTable
+
+ If ObjVentas.GetCultivos(-1, CveEmpresa) Then
+ DTCultivo = ObjVentas.DtResultados
+ Else
+ Respuesta = False
+ End If
+
+ If ObjVentas.GetCultivosVariedad(-1, -1, CveEmpresa) Then
+ DTCultivoVariedad = ObjVentas.DtResultados
+ Else
+ Respuesta = False
+ End If
+
+ If ObjVentas.GetEmbarqueTamaño(-1, -1, CveEmpresa) Then
+ DTTamaño = ObjVentas.DtResultados
+ Else
+ Respuesta = False
+ End If
+
+ If Respuesta Then
+ ObjVentas.IniciaTransacSQL()
+
+ For Each dRow As DataRow In DTresp.Rows
+
+ Dim PalletNum As String = dRow("PalletNum").ToString
+
+ Try
+ Dim CveCultivo As Integer = DTCultivo.FiltroPrimeroValor("CveCultivo", $" Alias = '{dRow("CommodityDesc").ToString}' ").ToEntero
+ If Not CveCultivo > 0 Then
+ GuardaLog($"No se encontro el cultivo {dRow("CommodityDesc").ToString}")
+ Exit For
+ End If
+
+ Dim CveCultivoVariedad As Integer = DTCultivoVariedad.FiltroPrimeroValor("CveCultivoVariedad", $" Alias = '{dRow("VarietyDesc").ToString}' ").ToEntero
+ If Not CveCultivoVariedad > 0 Then
+ GuardaLog($"No se encontro la variedad {dRow("VarietyDesc").ToString}")
+ Exit For
+ End If
+
+ Dim CveTamaño As Integer = DTTamaño.FiltroPrimeroValor("CveTamaño", $" Alias = '{dRow("SizeDesc").ToString.Replace("'", "''")}' ").ToEntero
+ If Not CveTamaño > 0 Then
+ GuardaLog($"No se encontro el tamaño {dRow("SizeDesc").ToString}")
+ Exit For
+ End If
+
+ Dim LoadDate As Date = DateTime.ParseExact(dRow("LoadDate").ToString, "MM/dd/yy", System.Globalization.CultureInfo.InvariantCulture)
+ Dim InvoiceDate As Date = DateTime.ParseExact(dRow("InvoiceDate").ToString, "MM/dd/yy", System.Globalization.CultureInfo.InvariantCulture)
+
+ Dim PaidDate As Date = MinFecha
+ If dRow("PaidDate").ToString.Trim.Length > 0 Then
+ PaidDate = DateTime.ParseExact(dRow("PaidDate").ToString, "MM/dd/yy", System.Globalization.CultureInfo.InvariantCulture)
+ End If
+
+
+
+ If Not ObjVentas.AddPreciosVentaManifiesto(dRow("PalletNum").ToString, CveCultivo, CveTamaño, CveCultivoVariedad, dRow("GroReference").ToString,
+ LoadDate, InvoiceDate, PaidDate,
+ dRow("InvPkgs").ToString.ToDecimal, dRow("NetProdPrice").ToString.ToDecimal, dRow("ProductDesc").ToString,
+ UsuarioActual.CveUsuario, CveEmpresa) Then
+ Respuesta = False
+ Exit For
+ End If
+
+ Catch ex As Exception
+
+ GuardaLog($"Error PalletNum: {PalletNum} {ex.Message} --> {ex.StackTrace}")
+ Respuesta = False
+
+ End Try
+
+
+
+ Next
+
+
+ If Respuesta Then
+ ObjVentas.Commit()
+ Else
+ ObjVentas.RollBack()
+ End If
+ End If
+
+
+
+ ObjVentas.Dispose()
+
'For Each dRow As DataRow In DTresp.Rows
diff --git a/Empresas/Grales/Formatos/CartaPorteTimbrado.rdlc b/Empresas/Grales/Formatos/CartaPorteTimbrado.rdlc
index 1d74af708..38000e5c8 100644
--- a/Empresas/Grales/Formatos/CartaPorteTimbrado.rdlc
+++ b/Empresas/Grales/Formatos/CartaPorteTimbrado.rdlc
@@ -522,7 +522,7 @@
1pt
-
+
1pt
2pt
@@ -7356,6 +7356,9 @@ Se ha recibido el número arriba indicado de bultos/contenedores/remolques/autot
Textbox85
+
+ =IIF(Fields!MaterialPeligroso.Value = "No",true,false)
+