AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://oirigoyen@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
rakcsle
2022-04-25 19:25:45 -07:00
parent 6313084450 5b3682c133
commit 928304a637
52 changed files with 8407 additions and 3333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Compras/Compras.aspx.vb
View File

@@ -2194,9 +2194,8 @@ Partial Class Compras_Compras
DdlRetISRConcepto.Items.Clear()
DdlRetISRConcepto.Items.Insert(0, New ListItem("Honorarios", "1"))
DdlRetISRConcepto.Items.Insert(1, New ListItem("Arrendamiento", "2"))
If UsuarioActual.CveEmpresa.Contiene(119, 7, 11, 12, 122, 145) Then
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
DdlRetISRConcepto.Items.Insert(1, New ListItem("Resico", "3"))
End If
UpPS.Update()
End Sub
@@ -14716,7 +14715,7 @@ Partial Class Compras_Compras
Protected Sub BtnRefacturacionVer_Click(sender As Object, e As EventArgs) Handles BtnRefacturacionVer.Click
Dim Opcion As Integer = 1
If UsuarioActual.CveEmpresa.Contiene(119, 1) Then Opcion = 2
If UsuarioActual.CveEmpresa.Contiene(119, 1, 140) Then Opcion = 2
Dim ObjCompras As New ClsCompras
@@ -20356,10 +20355,14 @@ Partial Class Compras_Compras
ObjCompras.Dispose()
Dim ObjInv As New ClsInventarios
If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
DdlFletes.DataSource = ObjInv.DtResultados
If ObjInv.GetFletesRep(UsuarioActual.CveEmpresa, -1, "-1", -1, -1, -1, MinFecha, MaxFecha, TipoGasto:=1, CveEstatus:=0) Then
DdlFletes.DataSource = ObjInv.DtResultados.FiltraParametros("CveFlete > 0")
DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
End If
'If ObjInv.GetFletes(UsuarioActual.CveEmpresa, OpcionInventario:=1) Then
' DdlFletes.DataSource = ObjInv.DtResultados
' DdlFletes.Items.Insert(0, New ListItem("Seleccione", "-1"))
'End If
ObjInv.Dispose()
DdlImportaciones.DataBind()

213
Compras/PopUpVerFactura.aspx.vb
View File

@@ -33,7 +33,7 @@ Partial Class PopUpVerFactura
End Property
Public Property DtDetalle() As DataTable
Get
Return CType(ViewState("DtDetalle"), DataTable)
Return DirectCast(IfNull(ViewState("DtDetalle"), New DataTable, ViewState("DtDetalle")), DataTable)
End Get
Set(value As DataTable)
ViewState("DtDetalle") = value
@@ -205,9 +205,13 @@ Partial Class PopUpVerFactura
If Request("onlyPrint").ToString() = "PalletCaja" Then
imprimirpallet(Request("CvePallet").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "manifiesto" Then
imprimirManifiesto(Request("cveEmbarqueManifiesto").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "manifiestoRemision" Then
imprimirManifiestoRemision(Request("cveEmbarqueManifiesto").ToString.ToEntero())
End If
End If
End If
@@ -330,12 +334,157 @@ Partial Class PopUpVerFactura
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/EmbarqueManifiesto.rdlc", lrds, params, "Manifesto")
End Sub
Private Sub imprimirManifiestoRemisionRemision(cveEmbarqueManifiesto As Integer)
Dim NoEmbarque As String = ""
Dim Fecha As String = ""
Dim SubProyecto As String = ""
Dim AgenciaAduanalUSA As String = ""
Dim AgenciaAduanalMEX As String = ""
Dim Temperatura As String = ""
Dim Hora As String = ""
Dim Chofer As String = ""
Dim CamPlaca As String = ""
Dim Camion As String = ""
Dim Rem1Placa As String = ""
Dim Remolque1 As String = ""
Dim NoPallets As String = ""
Dim NoBultos As String = ""
Dim NoKgManifiesto As String = ""
Dim Mercado As String = ""
Dim NoFactura As String = ""
Dim DivisoresdeCarton As String = ""
Dim BolsasdePlastico As String = ""
Dim TapaderasdeCarton As String = ""
Dim CAJASDECARTON As String = ""
Dim RPC As String = ""
Dim BINSDECARTON As String = ""
Dim TotalDlls As String = ""
Dim LongitudCaja As String = ""
Dim LineaTransportacion As String = ""
Dim SCAC As String = ""
Dim CAAT As String = ""
Dim NumeroTrailer As String = ""
Dim tablaReporte As New DataTable
'Envase = "1 1/9"
'Tamano = "Small"
'Cultivo = "Tomate"
'noPallet = "000001"
'Variedad = "Golden"
Using objnom As New ClsNominas
If objnom.PA_AGRO_Embarque_ManifiestoGet(-1, -1, -1, cveEmbarqueManifiesto) And objnom.DtResultados.Rows.Count > 0 Then
Dim row As DataRow = objnom.DtResultados.Rows(0)
NoEmbarque = row("NoEmbarque").ToString()
Fecha = String.Format("{0:dd/MM/yyyy}", row("Fecha"))
DivisoresdeCarton = String.Format("{0:N0}", row("DivisoresdeCarton"))
BolsasdePlastico = String.Format("{0:N0}", row("BolsasdePlastico"))
TapaderasdeCarton = String.Format("{0:N0}", row("TapaderasdeCarton"))
CAJASDECARTON = String.Format("{0:N0}", row("CAJASDECARTON"))
RPC = String.Format("{0:N0}", row("RPC"))
BINSDECARTON = String.Format("{0:N0}", row("BINSDECARTON"))
SubProyecto = row("SubProyecto").ToString()
AgenciaAduanalUSA = row("AgenciaAduanalUSA").ToString()
AgenciaAduanalMEX = row("AgenciaAduanalMEX").ToString()
Temperatura = row("Temperatura").ToString()
Hora = String.Format("{0:hh }:{0:mm }:{0:ss tt}:", row("FechaIng"))
Chofer = row("Chofer").ToString()
CamPlaca = row("CamPlaca").ToString()
Camion = String.Format("{0} {1}", row("CamEspecificacion"), row("CamAnio"))
Rem1Placa = row("Rem1Placa").ToString()
NoFactura = row("NoFactura").ToString()
Remolque1 = String.Format("{0} ", row("NumeroTrailer"), row("Rem1Anio"))
Mercado = If(row("CveDestino").ToString() = "2", "Extranjero", "Nacional")
NumeroTrailer = String.Format("No. {0}", row("NumeroTrailer").ToString())
LongitudCaja = row("LongitudCaja").ToString()
LineaTransportacion = row("LineaTransportacion").ToString()
SCAC = row("SCAC").ToString()
CAAT = row("CAAT").ToString()
'If row("CveCamionRemolque1").ToString() = "1" Then
' Rem1Placa = "12-TF-5E"
' Remolque1 = "Remolque 1"
'Else
' Rem1Placa = "15-TF-7f"
' Remolque1 = "Remolque 2"
'End If
If objnom.PA_Agro_Embarque_PalletGet(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, cveEmbarqueManifiesto, -1) And objnom.DtResultados.Rows.Count > 0 Then
NoPallets = objnom.DtResultados.Rows.Count.ToString()
NoKgManifiesto = objnom.DtResultados.SUM("Peso").ToString("N2")
NoBultos = objnom.DtResultados.SUM("NoCajas").ToString("N0")
tablaReporte = objnom.DtResultados
End If
End If
'Remolque 1 12-TF-5E' }, { cveCamion: 2, placa: 'Remolque 2 15-TF-7f
End Using
Dim params As New List(Of ReportParameter)
params.Add(New ReportParameter("NoEmbarque", NoEmbarque))
params.Add(New ReportParameter("Fecha", Fecha))
params.Add(New ReportParameter("SubProyecto", SubProyecto))
params.Add(New ReportParameter("AgenciaAduanalUSA", AgenciaAduanalUSA))
params.Add(New ReportParameter("AgenciaAduanalMEX", AgenciaAduanalMEX))
params.Add(New ReportParameter("Temperatura", Temperatura))
params.Add(New ReportParameter("Hora", Hora))
params.Add(New ReportParameter("Chofer", Chofer))
params.Add(New ReportParameter("CamPlaca", CamPlaca))
params.Add(New ReportParameter("Camion", Camion))
params.Add(New ReportParameter("Rem1Placa", Rem1Placa))
params.Add(New ReportParameter("Remolque1", Remolque1))
params.Add(New ReportParameter("LongitudCaja", LongitudCaja))
params.Add(New ReportParameter("LineaTransportacion", LineaTransportacion))
params.Add(New ReportParameter("SCAC", SCAC))
params.Add(New ReportParameter("CAAT", CAAT))
params.Add(New ReportParameter("NumeroTrailer", NumeroTrailer))
params.Add(New ReportParameter("NoFactura", NoFactura))
params.Add(New ReportParameter("Mercado", Mercado))
params.Add(New ReportParameter("NoBultos", NoBultos))
params.Add(New ReportParameter("NoPallets", NoPallets))
params.Add(New ReportParameter("NoKgManifiesto", NoKgManifiesto))
params.Add(New ReportParameter("DivisoresdeCarton", DivisoresdeCarton))
params.Add(New ReportParameter("BolsasdePlastico", BolsasdePlastico))
params.Add(New ReportParameter("TapaderasdeCarton", TapaderasdeCarton))
params.Add(New ReportParameter("CAJASDECARTON", CAJASDECARTON))
params.Add(New ReportParameter("RPC", RPC))
params.Add(New ReportParameter("BINSDECARTON", BINSDECARTON))
params.Add(New ReportParameter("TotalDlls", TotalDlls))
Dim lrds As New List(Of ReportDataSource)
Dim rds As New ReportDataSource With {.Name = "DataSet1", .Value = tablaReporte}
lrds.Add(rds)
'"Empresas/Grales/Formatos/EquiposGPS.rdlc"
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/EmbarqueManifiestoRemision.rdlc", lrds, params, "Manifesto")
End Sub
Private Sub imprimirpallet2(cvePallet As Integer)
Dim Envase As String = ""
Dim Tamano As String = ""
Dim Cultivo As String = ""
Dim noPallet As String = ""
Dim Variedad As String = ""
Dim NoCajas As String = ""
'Envase = "1 1/9"
'Tamano = "Small"
@@ -350,6 +499,7 @@ Partial Class PopUpVerFactura
Cultivo = row("Cultivo").ToString()
noPallet = row("Codigo").ToString()
Variedad = row("CultivoVariedad").ToString()
NoCajas = String.Format("{0:N0}", row("NoCajas"))
End If
@@ -360,10 +510,38 @@ Partial Class PopUpVerFactura
params.Add(New ReportParameter("Cultivo", Cultivo))
params.Add(New ReportParameter("noPallet", noPallet))
params.Add(New ReportParameter("Variedad", Variedad))
Dim tablaReporte As New DataTable
params.Add(New ReportParameter("NoCajas", NoCajas))
Dim lrds As New List(Of ReportDataSource)
'img
Dim dtqr As New DataTable
Dim column As DataColumn = New DataColumn("ImagenByte")
column.DataType = System.Type.[GetType]("System.Byte[]")
column.AllowDBNull = True
column.Caption = "ImagenByte"
dtqr.Columns.Add(column)
Dim rowqr As DataRow = dtqr.NewRow()
Dim bcode As New BarcodeLib.Barcode()
Dim img = bcode.Encode(BarcodeLib.TYPE.CODE128, String.Format("{0}", noPallet), 500, 100)
Dim barcodebyte As Byte()
Using ms = New MemoryStream()
img.Save(ms, System.Drawing.Imaging.ImageFormat.Png)
barcodebyte = ms.ToArray()
End Using
rowqr("ImagenByte") = barcodebyte
dtqr.Rows.Add(rowqr)
Dim rds2 As New ReportDataSource With {.Name = "dsImagenes", .Value = dtqr}
rds2.Name = "dsImagenes"
rds2.Value = dtqr
lrds.Add(rds2)
'endimg
'"Empresas/Grales/Formatos/EquiposGPS.rdlc"
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/PalletEtiqueta2.rdlc", (New List(Of ReportDataSource)), params, "Pallet")
ImprimirPDF("GPS/PalletEtiqueta2.rdlc", lrds, params, "Pallet")
End Sub
Private Sub imprimirpallet(cvePallet As Integer)
Dim Envase As String = ""
@@ -377,6 +555,8 @@ Partial Class PopUpVerFactura
Dim NoCajas As String = ""
Dim NumberOfCode As String = ""
Dim CvetypeImpresion As Integer
Dim NumberSmall As String = ""
Dim NumberBig As String = ""
'Envase = "1 1/9"
'Tamano = "Small"
'Cultivo = "Tomate"
@@ -394,8 +574,9 @@ Partial Class PopUpVerFactura
NoCajas = row("NoCajas").ToString()
Fecha = String.Format("{0:MMM dd}", row("Fecha")).Replace(".", "").ToUpper()
CvetypeImpresion = row("CvetypeImpresion").ToString().ToEntero()
NumberOfCode = String.Format("(01)00856977005186(13){1:ddMMyy}(10){0}01", Right(String.Format("0{0}", Regex.Match(row("Cuadro").ToString(), "\d+")), 2), row("Fecha"))
NumberOfCode = String.Format("(00)00000000000000(00){1:ddMMyy}(00){0}00", Right(String.Format("0{0}", Regex.Match(row("Cuadro").ToString(), "\d+")), 2), row("Fecha"))
NumberSmall = String.Format("{0:00}", noPallet.ToEntero())
NumberBig = String.Format("{0:00}", row("Consecutivo").ToString().ToEntero()) ' String.Format("{0:dd}", row("Fecha"))
End If
End Using
Dim params As New List(Of ReportParameter)
@@ -405,11 +586,13 @@ Partial Class PopUpVerFactura
params.Add(New ReportParameter("FormatoImpresion", FormatoImpresion))
params.Add(New ReportParameter("Consecutivo", Consecutivo))
params.Add(New ReportParameter("Fecha", Fecha))
params.Add(New ReportParameter("CveFormato", If(Cultivo.ToLower() = "tomate", "3", CvetypeImpresion.ToString())))
params.Add(New ReportParameter("CveFormato", If(Cultivo.ToLower().Contains("tomate"), "3", CvetypeImpresion.ToString())))
params.Add(New ReportParameter("NoCajas", NoCajas))
params.Add(New ReportParameter("NumberOfCode", NumberOfCode))
params.Add(New ReportParameter("Cultivo", If(CvetypeImpresion = 2, Cultivoingles, Cultivo)))
params.Add(New ReportParameter("Envase", If(CvetypeImpresion = 2, "PLU 4062", Envase)))
params.Add(New ReportParameter("NumberSmall", NumberSmall))
params.Add(New ReportParameter("NumberBig", NumberBig))
@@ -431,10 +614,10 @@ Partial Class PopUpVerFactura
Dim bcode As New BarcodeLib.Barcode()
' Dim img = bcode.Encode(BarcodeLib.TYPE.CODE128, String.Format("{0}", noPallet), 500, 100)
Dim img = bcode.Encode(BarcodeLib.TYPE.CODE128, String.Format("{0}", noPallet), 500, 100)
Dim barcodebyte As Byte()
Using ms = New MemoryStream()
' img.Save(ms, System.Drawing.Imaging.ImageFormat.Png)
img.Save(ms, System.Drawing.Imaging.ImageFormat.Png)
barcodebyte = ms.ToArray()
End Using
rowqr("ImagenByte") = barcodebyte
@@ -651,7 +834,11 @@ Partial Class PopUpVerFactura
If UrlParametros("OP").ToString = "CORT" Then
If UrlParametros("CVECORTE") IsNot Nothing AndAlso UrlParametros("CVECORTE").ToString.ToEntero > 0 Then
ImprimeCorte(UrlParametros("CVECORTE").ToString.ToEntero, UrlParametros("FORMATO").ToString)
Dim CveSubProyecto As Integer = -1
If UrlParametros("CVESUBPROYECTO") IsNot Nothing Then
CveSubProyecto = UrlParametros("CVESUBPROYECTO").ToString.ToEntero
End If
ImprimeCorte(UrlParametros("CVECORTE").ToString.ToEntero, UrlParametros("FORMATO").ToString, CveSubProyecto)
End If
End If
@@ -797,17 +984,18 @@ Partial Class PopUpVerFactura
#Region "OP = CORT - IMPRIMIR CORTE"
Private Sub ImprimeCorte(CveCorte As Integer, Formato As String)
Private Sub ImprimeCorte(CveCorte As Integer, Formato As String, Optional CveSubProyecto As Integer = -1)
Dim ObjVenta As New ClsVentas
Dim ObjPuntoVenta As New ClsPuntoVenta
Dim DtCortesVentasResumen As DataTable = Nothing
Dim DtCortesVentas As DataTable = Nothing
Dim Fecha = "", Nombre = ""
If ObjVenta.GetCortesDetalleVentasResumen(CveCorte, UsuarioActual.CveEmpresa) Then
If ObjVenta.GetCortesDetalleVentasResumen(CveCorte, CveSubProyecto, UsuarioActual.CveEmpresa) Then
DtCortesVentasResumen = ObjVenta.DtResultados
End If
If ObjPuntoVenta.GetCortesDetalleVentas(CveCorte, UsuarioActual.CveEmpresa) Then
If ObjPuntoVenta.GetCortesDetalleVentas(CveCorte, CveSubProyecto, UsuarioActual.CveEmpresa) Then
DtCortesVentas = ObjPuntoVenta.DtResultados
If DtCortesVentas.Rows.Count > 0 Then
Dim RowInfo As DataRow = DtCortesVentas.FiltroPrimero("CveVenta > 0")
@@ -816,6 +1004,7 @@ Partial Class PopUpVerFactura
Nombre = RowInfo("Nombre").ToString
End If
End If
ObjVenta.Dispose()
ObjPuntoVenta.Dispose()
Dim FechaCorte As String = $"&emsp;<b>Fecha fin:</b> {Fecha}"

22
Compras/Proveedores.aspx
View File

@@ -1524,22 +1524,22 @@
<asp:Literal ID="LtlDiasVencido" runat="server" Text='<%# Eval("DiasVencidos", "{0}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Total">
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlSaldoOriginal" runat="server" Text='<%# Eval("Original", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Abonado">
<asp:TemplateField HeaderText="Abonado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlAbonado" runat="server" Text='<%# Eval("Abonado", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="% Abonado">
<asp:TemplateField HeaderText="% Abonado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlPorRecuperado" runat="server" Text='<%# Eval("PorPagado", "{0:N2}%") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Saldo">
<asp:TemplateField HeaderText="Saldo" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlSaldo" runat="server" Text='<%# Eval("Saldo", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
@@ -1602,37 +1602,37 @@
</div>
<asp:GridView ID="GvCxPHistorial" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontró Historial de Cuentas X Pagar" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" GridLines="None" BorderColor="#D3D3D3" BorderWidth="1">
<Columns>
<asp:TemplateField HeaderText="Factura">
<asp:TemplateField HeaderText="SerieFolio">
<ItemTemplate>
<asp:Label ID="LtlFactura" runat="server"></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Fecha Compra">
<asp:TemplateField HeaderText="Fecha">
<ItemTemplate>
<asp:Literal ID="LtlFecha" runat="server" Text='<%# Eval("Fecha", "{0:d}") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Fecha Vencimiento">
<asp:TemplateField HeaderText="F. Vencimiento">
<ItemTemplate>
<asp:Literal ID="LtlFechaVenci" runat="server" Text='<%# Eval("FechaVencimiento", "{0:d}") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Días Vencidos">
<asp:TemplateField HeaderText="Días Venc.">
<ItemTemplate>
<asp:Literal ID="LtlDiasVencido" runat="server" Text='<%# Eval("DiasVencidos", "{0}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Monto Compra (Saldo Orig)">
<asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlSaldoOriginal" runat="server" Text='<%# Eval("Original", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Abonado">
<asp:TemplateField HeaderText="Abonado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlAbonado" runat="server" Text='<%# Eval("Abonado", "{0:N2}") %>'></asp:Literal>&nbsp;
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="% Pagado">
<asp:TemplateField HeaderText="% Pagado" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Literal ID="LtlPorRecuperado" runat="server" Text='<%# Eval("PorPagado", "{0:N2}%") %>'></asp:Literal>&nbsp;
</ItemTemplate>

6
Compras/Proveedores.aspx.vb
View File

@@ -2613,12 +2613,6 @@ Partial Class Compras_Proveedores
End If
e.Row.Cells(5).HorizontalAlign = HorizontalAlign.Right
e.Row.Cells(6).HorizontalAlign = HorizontalAlign.Right
e.Row.Cells(7).HorizontalAlign = HorizontalAlign.Right
e.Row.Cells(8).HorizontalAlign = HorizontalAlign.Right
If e.Row.DBCampo("Saldo").ToDouble < 0 Then e.Row.Cells(6).ForeColor = Drawing.Color.Red
If e.Row.DBCampo("DiasVencidos").ToDouble > 0 AndAlso CType(sender, GridView).ID = "GvCxP" Then e.Row.Cells(4).ForeColor = Drawing.Color.Red