From 824be8348cfb58b1b84f8ae9e63bc5388e3211e8 Mon Sep 17 00:00:00 2001 From: HECTOR RODRIGUEZ Date: Thu, 8 Jul 2021 21:39:56 -0700 Subject: [PATCH 1/3] Filtro in inventario fisico: proveedores --- App_Code/ClsInventarios.vb | 66 ++++ Compras/RepCxP.aspx | 2 +- Compras/RepCxP.aspx.vb | 335 +++++++++++++++++++- Inventarios/InventarioFisico.aspx | 45 +++ Inventarios/InventarioFisico.aspx.vb | 86 +++++ Inventarios/InventarioFisicoDetalle.aspx | 4 + Inventarios/InventarioFisicoDetalle.aspx.vb | 14 + Inventarios/RepAnomalias.aspx | 3 + Inventarios/RepAnomalias.aspx.vb | 13 + 9 files changed, 564 insertions(+), 4 deletions(-) diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index e21615b2c..e965a4e5b 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -2440,6 +2440,50 @@ Public Class ClsInventarios Return Retorno End Function + Public Function RemoveInventarioFisicoProveedores(CveInventarioFisico As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_InventarioFisicoProveedoresRemove") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveInventarioFisico", SqlDbType.Int).Value = CveInventarioFisico + + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + + Catch Ex1 As SqlException + Me.OnError("Ocurrió un error al eliminar el producto del servicio del inventario fisico.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Catch ex As Exception + OnError("Ocurrió un error al eliminar el producto del servicio del inventario fisico.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function AddInventarioFisicoProveedores(CveInventarioFisico As Integer, CveProveedor As Integer, Incluye As Boolean) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_InventarioFisicoProveedoresAdd") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveInventarioFisico", SqlDbType.Int).Value = CveInventarioFisico + .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor + .Add("@Incluye", SqlDbType.Bit).Value = If(Incluye, 1, 0) + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + + Catch Ex1 As SqlException + Me.OnError("Ocurrió un error al guardar el producto del servicio del inventario fisico.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Catch ex As Exception + OnError("Ocurrió un error al guardar el producto del servicio del inventario fisico.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function Public Function AddInventarioFisicoAlmacenes(CveInventarioFisico As Integer, CveAlmacen As Integer) As Boolean @@ -2535,6 +2579,28 @@ Public Class ClsInventarios Return Retorno End Function + Public Function GetInventarioFisicoDetallesProveedores(CveInventarioFisico As Integer, CveEmpresa As Integer) As Boolean + + Dim Retorno As Boolean = False + DataAdapter("PA_Inv_InventarioFisicoDetallesProveedoresGet") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveInventarioFisico", SqlDbType.Int).Value = CveInventarioFisico + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + + Catch Ex1 As SqlException + Me.OnError("Ocurrió un error al obtener la clasificacion del inventario fisico.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Catch ex As Exception + OnError("Ocurrió un error al obtener la clasificacion del inventario fisico.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + #Region "I N V E N T A R I O - F I S I C O - D E T A L L E" diff --git a/Compras/RepCxP.aspx b/Compras/RepCxP.aspx index 274250559..07bd70a8c 100644 --- a/Compras/RepCxP.aspx +++ b/Compras/RepCxP.aspx @@ -254,7 +254,7 @@
-
Agrupar por meses:
+
Ver por meses:
diff --git a/Compras/RepCxP.aspx.vb b/Compras/RepCxP.aspx.vb index e5a2d5bf9..c63fb42cb 100644 --- a/Compras/RepCxP.aspx.vb +++ b/Compras/RepCxP.aspx.vb @@ -1,6 +1,8 @@ Imports Microsoft.Reporting.WebForms Imports Extensiones Imports System.Data +Imports GemBox.Spreadsheet + Partial Class Compras_RepCxP Inherits ClsPaginas @@ -191,7 +193,7 @@ Partial Class Compras_RepCxP If chkAgruparMes.Checked Then Dim monthNames As String() = {"", "Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"} - GvCxP.Columns(2).Visible = True + GvCxP.Columns(2).Visible = False GvCxP.Columns(3).Visible = True GvCxP.Columns(4).Visible = True GvCxP.Columns(5).Visible = True @@ -486,7 +488,8 @@ Partial Class Compras_RepCxP FC.Add(0, " ,2,1,Titulos") FC.Add(2, String.Format("Vencido,{0},1,Titulos", CantVencidos + 2)) FC.Add(3, String.Format("Por Vencer,{0},1,Titulos", CantPorVencer + 2)) - + CantVencidos = 0 + CantPorVencer = 0 End If GetMultiRowHeader(DirectCast(sender, GridView), e, FC, "Titulos") End If @@ -1015,7 +1018,333 @@ Partial Class Compras_RepCxP Protected Sub ImgExcel_Click(sender As Object, e As System.EventArgs) Handles ImgExcel.Click - GenerarPDF("EXCEL") + Dim Mov As New ClsMovimientos + Dim FechaI As String = txtFechaI.Text + Dim FechaF As String = txtFechaF.Text + Dim FechaVI As String = txtFechaVI.Text + Dim FechaVF As String = txtFechaVF.Text + If txtFechaI.Text = "" Then FechaI = "-1" + If txtFechaF.Text = "" Then FechaF = "-1" + If txtFechaVI.Text = "" Then FechaVI = "-1" + If txtFechaVF.Text = "" Then FechaVF = "-1" + Dim TipoAgrupacion As Integer = IIf(chkAgruparMes.Checked, 1, -1) + Dim TipoDocto As String = If(DdlTipoDocto.GetSelectedValuesM = "", "-1", DdlTipoDocto.GetSelectedValuesM) + If Mov.GetCxP(FechaI, FechaF, DdlProveedor.SelectedValue.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, DdlProveedoresClasificaciones.SelectedValue.ToEntero, -1, DdlUsuarioResponsable.SelectedValue.ToEntero, DdlUsuarioRegistro.SelectedValue.ToEntero, DdlEstatusCompra.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, DdlGrupo.SelectedValue.ToEntero, + DdlSubProyecto.SelectedValue.ToEntero, RblTipoCambio.SelectedValue.ToEntero, TCEspecifico, FechaVI, FechaVF, FechaCorte:=txtCorteA.Text.ToDate, CveUsuarioConsulta:=UsuarioActual.CveUsuario, CveTipoProveedor:=IIf(DdlTipoProveedor.SelectedValue.ToEntero = 3, -1, DdlTipoProveedor.SelectedValue.ToEntero), Comprobaciones:=DdlComprobacion.SelectedValue.ToEntero, + TipoDocto:=TipoDocto, TipoAgrupacion:=TipoAgrupacion) Then + + End If + Dim Dr As DataRow = Mov.DtResultados.Rows(0) + Dim NombreArchivo As String + SpreadsheetInfo.SetLicense(ModExtensiones.SerialGemBoxSpreadsheet) + Dim workbook As New ExcelFile() + Dim worksheet = workbook.Worksheets.Add("Cxp") + Dim Mes(12) As String + Dim monthNames As String() = {"", "Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"} + Mes(0) = monthNames(Dr("NomMes1").ToString.ToDate.Month) + Mes(1) = monthNames(Dr("NomMes2").ToString.ToDate.Month) + Mes(2) = monthNames(Dr("NomMes3").ToString.ToDate.Month) + Mes(3) = monthNames(Dr("NomMes4").ToString.ToDate.Month) + Mes(4) = monthNames(Dr("NomMes5").ToString.ToDate.Month) + Mes(5) = monthNames(Dr("NomMes6").ToString.ToDate.Month) + Mes(6) = monthNames(Dr("NomMes7").ToString.ToDate.Month) + Mes(7) = monthNames(Dr("NomMes8").ToString.ToDate.Month) + Mes(8) = monthNames(Dr("NomMes9").ToString.ToDate.Month) + Mes(9) = monthNames(Dr("NomMes10").ToString.ToDate.Month) + Mes(10) = monthNames(Dr("NomMes11").ToString.ToDate.Month) + Mes(11) = monthNames(Dr("NomMes12").ToString.ToDate.Month) + Mes(12) = "12+" + If RblTipoCambio.SelectedValue = 3 And TxtEspecifico.Text <> "" Then + TCEspecifico = TxtEspecifico.Text + Else + TCEspecifico = -1 + End If + + + Dim DtExcel As DataTable + If chkAgruparMes.Checked Then + DtExcel = (From row As DataRow In Mov.DtResultados.Rows + Select New With + { + .GPO = row.Item("GPO"), + .Saldo = row.Item("Saldo"), + .TotalVencido = row.Item("vencido"), + .Mes1 = row.Item("Mes1"), + .Mes2 = row.Item("Mes2"), + .Mes3 = row.Item("Mes3"), + .Mes4 = row.Item("Mes4"), + .Mes5 = row.Item("Mes5"), + .Mes6 = row.Item("Mes6"), + .Mes7 = row.Item("Mes7"), + .Mes8 = row.Item("Mes8"), + .Mes9 = row.Item("Mes9"), + .Mes10 = row.Item("Mes10"), + .Mes11 = row.Item("Mes11"), + .Mes12 = row.Item("Mes12"), + .Mes13 = row.Item("Mes13"), + .TotalxVencer = row.Item("por_vencer") + }).QueryToDataTable(True) + Else + DtExcel = (From row As DataRow In Mov.DtResultados.Rows + Select New With + { + .GPO = row.Item("GPO"), + .Saldo = row.Item("Saldo"), + .Columna1vencido = row.Item("Columna1"), + .Columna2vencido = row.Item("Columna2"), + .Columna3vencido = row.Item("Columna3"), + .Columna4vencido = row.Item("Columna4"), + .Columna5vencido = row.Item("Columna5"), + .Columna6vencido = row.Item("Columna6"), + .Columna7vencido = row.Item("Columna7"), + .Columna8vencido = row.Item("Columna8"), + .Columna9vencido = row.Item("Columna9"), + .Columna10vencido = row.Item("Columna10"), + .Columna11vencido = row.Item("Columna11"), + .Columna12vencido = row.Item("Columna12"), + .Columna13vencido = row.Item("Columna13"), + .TotalVencido = row.Item("vencido"), + .Columna1xVencer = row.Item("Columna1"), + .Columna2xVencer = row.Item("Columna2"), + .Columna3xVencer = row.Item("Columna3"), + .Columna4xVencer = row.Item("Columna4"), + .Columna5xVencer = row.Item("Columna5"), + .Columna6xVencer = row.Item("Columna6"), + .Columna7xVencer = row.Item("Columna7"), + .Columna8xVencer = row.Item("Columna8"), + .Columna9xVencer = row.Item("Columna9"), + .Columna10xVencer = row.Item("Columna10"), + .Columna11xVencer = row.Item("Columna11"), + .Columna12xVencer = row.Item("Columna12"), + .Columna13xVencer = row.Item("Columna13"), + .TotalxVencer = row.Item("por_vencer") + }).QueryToDataTable(True) + End If + Mov.Dispose() + + + worksheet.InsertDataTable(DtExcel, New InsertDataTableOptions() With + { + .ColumnHeaders = True, + .StartRow = 0, + .StartColumn = 0 + }) + + Dim columnCount = worksheet.CalculateMaxUsedColumns() + For i = 0 To columnCount + worksheet.Columns(i).AutoFit(1, worksheet.Rows(0), worksheet.Rows(worksheet.Rows.Count - 1)) + Next + + + If chkAgruparMes.Checked Then + worksheet.Cells("A1").Value = DdlGrupo.SelectedItem.Text + worksheet.Cells("D1").Value = Mes(0) + worksheet.Cells("E1").Value = Mes(1) + worksheet.Cells("F1").Value = Mes(2) + worksheet.Cells("G1").Value = Mes(3) + worksheet.Cells("H1").Value = Mes(4) + worksheet.Cells("I1").Value = Mes(5) + worksheet.Cells("J1").Value = Mes(6) + worksheet.Cells("K1").Value = Mes(7) + worksheet.Cells("L1").Value = Mes(8) + worksheet.Cells("M1").Value = Mes(9) + worksheet.Cells("N1").Value = Mes(10) + worksheet.Cells("O1").Value = Mes(11) + worksheet.Cells("P1").Value = Mes(12) + Else + Dim Vencido As Integer = 0 + Dim Xvencer As Integer = 0 + If Dr("TC1").ToString.ToEntero = 1 Then + worksheet.Cells("C1").Value = Dr("NomC1").ToString + Vencido += 1 + ElseIf Dr("TC1").ToString.ToEntero = 2 Then + worksheet.Cells("Q1").Value = Dr("NomC1").ToString + Xvencer += 1 + End If + If Dr("TC2").ToString.ToEntero = 1 Then + worksheet.Cells("D1").Value = Dr("NomC2").ToString + Vencido += 1 + ElseIf Dr("TC2").ToString.ToEntero = 2 Then + worksheet.Cells("R1").Value = Dr("NomC2").ToString + Xvencer += 1 + End If + If Dr("TC3").ToString.ToEntero = 1 Then + worksheet.Cells("E1").Value = Dr("NomC3").ToString + Vencido += 1 + ElseIf Dr("TC3").ToString.ToEntero = 2 Then + worksheet.Cells("S1").Value = Dr("NomC3").ToString + Xvencer += 1 + End If + If Dr("TC4").ToString.ToEntero = 1 Then + worksheet.Cells("F1").Value = Dr("NomC4").ToString + Vencido += 1 + ElseIf Dr("TC4").ToString.ToEntero = 2 Then + worksheet.Cells("T1").Value = Dr("NomC4").ToString + Xvencer += 1 + End If + If Dr("TC5").ToString.ToEntero = 1 Then + worksheet.Cells("G1").Value = Dr("NomC5").ToString + Vencido += 1 + ElseIf Dr("TC5").ToString.ToEntero = 2 Then + worksheet.Cells("U1").Value = Dr("NomC5").ToString + Xvencer += 1 + End If + If Dr("TC6").ToString = "1" Then + worksheet.Cells("H1").Value = Dr("NomC6").ToString + Vencido += 1 + ElseIf Dr("TC6").ToString.ToEntero = 2 Then + worksheet.Cells("V1").Value = Dr("NomC6").ToString + Xvencer += 1 + End If + If Dr("TC7").ToString.ToEntero = 1 Then + worksheet.Cells("I1").Value = Dr("NomC7").ToString + Vencido += 1 + ElseIf Dr("TC7").ToString.ToEntero = 2 Then + worksheet.Cells("W1").Value = Dr("NomC7").ToString + Xvencer += 1 + End If + If Dr("TC8").ToString.ToEntero = 1 Then + worksheet.Cells("J1").Value = Dr("NomC8").ToString + Vencido += 1 + ElseIf Dr("TC8").ToString.ToEntero = 2 Then + worksheet.Cells("X1").Value = Dr("NomC8").ToString + Xvencer += 1 + End If + If Dr("TC9").ToString.ToEntero = 1 Then + worksheet.Cells("K1").Value = Dr("NomC9").ToString + Vencido += 1 + ElseIf Dr("TC9").ToString.ToEntero = 2 Then + worksheet.Cells("Y1").Value = Dr("NomC9").ToString + Xvencer += 1 + End If + If Dr("TC10").ToString.ToEntero = 1 Then + worksheet.Cells("L1").Value = Dr("NomC10").ToString + Vencido += 1 + ElseIf Dr("TC10").ToString.ToEntero = 2 Then + worksheet.Cells("Z1").Value = Dr("NomC10").ToString + Xvencer += 1 + End If + If Dr("TC11").ToString.ToEntero = 1 Then + worksheet.Cells("M1").Value = Dr("NomC11").ToString + Vencido += 1 + ElseIf Dr("TC11").ToString.ToEntero = 2 Then + worksheet.Cells("AA1").Value = Dr("NomC11").ToString + Xvencer += 1 + End If + If Dr("TC12").ToString.ToEntero = 1 Then + worksheet.Cells("N1").Value = Dr("NomC12").ToString + Vencido += 1 + ElseIf Dr("TC12").ToString.ToEntero = 2 Then + worksheet.Cells("AB1").Value = Dr("NomC12").ToString + Xvencer += 1 + End If + If Dr("TC13").ToString.ToEntero = 1 Then + worksheet.Cells("O1").Value = Dr("NomC13").ToString + Vencido += 1 + ElseIf Dr("TC13").ToString.ToEntero = 2 Then + worksheet.Cells("AC1").Value = Dr("NomC13").ToString + Xvencer += 1 + End If + + + If Dr("TC13").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(28) + End If + If Dr("TC12").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(27) + End If + + If Dr("TC11").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(26) + End If + + If Dr("TC10").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(25) + End If + If Dr("TC9").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(24) + End If + + If Dr("TC8").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(23) + End If + If Dr("TC7").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(22) + End If + + If Dr("TC6").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(21) + End If + If Dr("TC5").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(20) + End If + + If Dr("TC4").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(19) + End If + If Dr("TC3").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(18) + End If + If Dr("TC2").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(17) + End If + If Dr("TC1").ToString.ToEntero <> 2 Then + worksheet.Columns.Remove(16) + End If + + + If Dr("TC13").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(14) + End If + + If Dr("TC12").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(13) + End If + + If Dr("TC11").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(12) + End If + + If Dr("TC10").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(11) + End If + If Dr("TC9").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(10) + End If + + If Dr("TC8").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(9) + End If + If Dr("TC7").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(8) + End If + + If Dr("TC6").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(7) + End If + If Dr("TC5").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(6) + End If + + If Dr("TC4").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(5) + End If + If Dr("TC3").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(4) + End If + If Dr("TC2").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(3) + End If + If Dr("TC1").ToString.ToEntero <> 1 Then + worksheet.Columns.Remove(2) + End If + End If + + + + NombreArchivo = "CxP" + workbook.Save(Response, $"{NombreArchivo}.xlsx", SaveOptions.XlsxDefault) + 'GenerarPDF("EXCEL") End Sub Private Sub ImgImprimir_Click(sender As Object, e As EventArgs) Handles ImgImprimir.Click diff --git a/Inventarios/InventarioFisico.aspx b/Inventarios/InventarioFisico.aspx index 441bbb7c4..9c038e2fb 100644 --- a/Inventarios/InventarioFisico.aspx +++ b/Inventarios/InventarioFisico.aspx @@ -366,6 +366,51 @@
+
+
+
+
+ + Proveedores +
+
+ +
+
+
+ + +
+
+ + + +
+
+ +
+ +
+ +
+
+ + + + + + + + + + +
+
+ + +
+
+
diff --git a/Inventarios/InventarioFisico.aspx.vb b/Inventarios/InventarioFisico.aspx.vb index 3f8632f2d..a81812484 100644 --- a/Inventarios/InventarioFisico.aspx.vb +++ b/Inventarios/InventarioFisico.aspx.vb @@ -24,6 +24,14 @@ Partial Class Inventarios_InventarioFisico ViewState("tDTClasif") = value End Set End Property + Private Property tDTProv As DataTable + Get + Return If(IsNothing(ViewState("tDTProv")), Nothing, CType(ViewState("tDTProv"), DataTable)) + End Get + Set(value As DataTable) + ViewState("tDTProv") = value + End Set + End Property Private Property tDTClasifExcluye As DataTable Get Return If(IsNothing(ViewState("tDTClasifExcluye")), Nothing, CType(ViewState("tDTClasifExcluye"), DataTable)) @@ -67,11 +75,13 @@ Partial Class Inventarios_InventarioFisico If Not IsPostBack Then CargaDdlSubProyectos() CargaDdlClasificacion() + CargDdlProveedor() CargaDdlProductosServicios() CargDdlAlmacen() CreaTmpClasificaciones() CreaTmpProductosServicios() CreaTmpAlmacen() + CreaTmpProveedores() CargaDatos(UsuarioActual.CveEmpresa) End If @@ -153,6 +163,25 @@ Partial Class Inventarios_InventarioFisico DdlAlmacen.DataBind() End Sub + Private Sub CargDdlProveedor() + + If (UsuarioActual.Empresa.Funcionalidad(105) = "1") Then + DdlProveedor.setEsWebService(True) + DdlProveedor.Attributes.Add("data-metodo", "getproveedores") + DdlProveedor.SelectedText = "Todos" + DdlProveedor.SelectedValue = "-1" + Else + DdlProveedor.setEsWebService(False) + DdlProveedor.ddl.DataSource = GlobalDTCompProveedores(UsuarioActual.CveEmpresa) + DdlProveedor.ddl.DataBind() + DdlProveedor.ddl.Items.Insert(0, New ListItem("Todos", "-1")) + End If + + + + End Sub + + #End Region #Region "PRODUCTOS SERVICIOS" @@ -287,6 +316,39 @@ Partial Class Inventarios_InventarioFisico #End Region + Private Sub BtnAgregarProveedor_Click(sender As Object, e As EventArgs) Handles BtnAgregarProveedor.Click + If DdlProveedor.SelectedValue = -1 Then + Alert("Tienes seleccionada la opcion 'Todos'.", TipoMensaje.MsgInformacion) + GvPS.DataSource = Nothing + GvPS.DataBind() + tDTPS.Rows.Clear() + Else + Dim Row As DataRow = Nothing + Row = tDTProv.NewRow + Row("CveProveedor") = DdlProveedor.SelectedValue.ToEntero + Row("RazonSocial") = DdlProveedor.SelectedText + tDTProv.Rows.Add(Row) + GvProveedor.DataSource = tDTProv + GvProveedor.DataBind() + UpProveedor.Update() + End If + End Sub + + Private Sub CreaTmpProveedores() + tDTProv = New DataTable + tDTProv.Columns.Add("CveProveedor", GetType(Integer)) + tDTProv.Columns.Add("RazonSocial", GetType(String)) + tDTProv.Columns.Add("Incluye", GetType(Integer)) + End Sub + + Protected Sub DeleteProveedor_Click(sender As Object, e As EventArgs) + Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) + tDTProv.Rows(GvRow.RowIndex.ToEntero).Delete() + GvProveedor.DataSource = tDTProv + GvProveedor.DataBind() + UpProveedor.Update() + End Sub + #Region "INVENTARIO FISICO" Public Sub Delete_Click(sender As Object, e As EventArgs) Dim ObjInventario As New ClsInventarios() @@ -422,6 +484,16 @@ Partial Class Inventarios_InventarioFisico Next End If + If ErrorClasif = False Then + For Each Gvr As GridViewRow In GvProveedor.Rows + If Not ObjInventario.AddInventarioFisicoProveedores(HdnID.Value, Gvr.DataKey("CveProveedor").ToEntero, True) Then + ErrorClasif = True + Exit For + End If + Next + + End If + If ErrorClasif = False And CveInventarioFisico > 0 Then ObjInventario.Commit() Alert("Agregado Correctamente.", TipoMensaje.MsgInformacion) @@ -450,6 +522,10 @@ Partial Class Inventarios_InventarioFisico ErrorClasif = True End If + If Not ObjInventario.RemoveInventarioFisicoProveedores(HdnID.Value) Then + ErrorClasif = True + End If + If ErrorClasif = False Then For Each Gvr As GridViewRow In GvAlmacen.Rows If Not ObjInventario.AddInventarioFisicoAlmacenes(HdnID.Value, Gvr.DataKey("CveAlmacen").ToEntero) Then @@ -490,6 +566,16 @@ Partial Class Inventarios_InventarioFisico Next End If + If ErrorClasif = False Then + For Each Gvr As GridViewRow In GvProveedor.Rows + If Not ObjInventario.AddInventarioFisicoProveedores(HdnID.Value, Gvr.DataKey("CveProveedor").ToEntero, True) Then + ErrorClasif = True + Exit For + End If + Next + + End If + If ErrorClasif = False And HdnID.Value > 0 Then ObjInventario.Commit() diff --git a/Inventarios/InventarioFisicoDetalle.aspx b/Inventarios/InventarioFisicoDetalle.aspx index e7c1feb0c..8596e2357 100644 --- a/Inventarios/InventarioFisicoDetalle.aspx +++ b/Inventarios/InventarioFisicoDetalle.aspx @@ -184,6 +184,10 @@      + +      + + diff --git a/Inventarios/InventarioFisicoDetalle.aspx.vb b/Inventarios/InventarioFisicoDetalle.aspx.vb index 435d8b4ac..57691da6c 100644 --- a/Inventarios/InventarioFisicoDetalle.aspx.vb +++ b/Inventarios/InventarioFisicoDetalle.aspx.vb @@ -190,6 +190,20 @@ Partial Class Inventarios_InventarioFisicoDetalle LblProductosExcluidos.Text = str.ToString End If + End If + + If ObjInventario.GetInventarioFisicoDetallesProveedores(CveInventarioFisico, UsuarioActual.CveEmpresa) Then + Dim dt As DataTable = ObjInventario.DtResultados + Dim str As New StringBuilder + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + For Each dr As DataRow In dt.FiltraParametros("Incluye = 1").Rows + str.AppendFormat("{0},", dr("RazonSocial")) + Next + LblProveedores.Text = str.ToString + str.Clear() + End If + End If If ObjInventario.GetInventarioFisicoDetalle(CveInventarioFisico, CveUsuario) Then diff --git a/Inventarios/RepAnomalias.aspx b/Inventarios/RepAnomalias.aspx index 61dc09004..46a77b822 100644 --- a/Inventarios/RepAnomalias.aspx +++ b/Inventarios/RepAnomalias.aspx @@ -167,6 +167,9 @@      + + +
    
diff --git a/Inventarios/RepAnomalias.aspx.vb b/Inventarios/RepAnomalias.aspx.vb index 57f6afc1a..5ef0314de 100644 --- a/Inventarios/RepAnomalias.aspx.vb +++ b/Inventarios/RepAnomalias.aspx.vb @@ -132,6 +132,19 @@ Partial Class Inventarios_RepAnomalias End If End If + If Inventario.GetInventarioFisicoDetallesProveedores(CveInventarioFisico, UsuarioActual.CveEmpresa) Then + Dim dta As DataTable = Inventario.DtResultados + Dim str As New StringBuilder + If dta IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + For Each dr As DataRow In dta.FiltraParametros("Incluye = 1").Rows + str.AppendFormat("{0},", dr("RazonSocial")) + Next + LblProveedores.Text = str.ToString + str.Clear() + End If + + End If End If Inventario.Dispose() From a744894bd36471f225a95469ed8239e7370e5f34 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Fri, 9 Jul 2021 17:30:04 -0700 Subject: [PATCH 2/3] --- App_Code/ClsNominas.vb | 3 - Nomina/Finiquito.aspx | 6 +- Nomina/ReportedeAcumulados.aspx | 367 +++++++++++++++-------------- Nomina/ReportedeAcumulados.aspx.cs | 2 +- RH/Personal.aspx | 62 ++++- RH/Personal.aspx.vb | 72 +++++- vwd.webinfo | 6 + 7 files changed, 326 insertions(+), 192 deletions(-) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 9da716735..5143dad1e 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -2279,8 +2279,6 @@ Public Class ClsNominas .Add("@RegimenContratacion", SqlDbType.Int).Value = RegimenContratacion .Add("@CvePersonal", SqlDbType.Decimal).Value = CvePersonal End With - - SqlAdapter.Fill(DTSet) retorno = True Catch sqEx As SqlException @@ -2303,7 +2301,6 @@ Public Class ClsNominas .Add("@Tipo", SqlDbType.Int).Value = Tipo .Add("@Fecha", SqlDbType.Date).Value = FechaCalculo End With - SqlAdapter.Fill(DTSet) retorno = True Catch sqEx As SqlException diff --git a/Nomina/Finiquito.aspx b/Nomina/Finiquito.aspx index 0d915c274..9b5a83db9 100644 --- a/Nomina/Finiquito.aspx +++ b/Nomina/Finiquito.aspx @@ -219,7 +219,7 @@
- +
@@ -251,12 +251,12 @@
- Separación unica + Separación única
- Prima de antiguedad + Prima de antigüedad
diff --git a/Nomina/ReportedeAcumulados.aspx b/Nomina/ReportedeAcumulados.aspx index bbe05b491..65f0577e0 100644 --- a/Nomina/ReportedeAcumulados.aspx +++ b/Nomina/ReportedeAcumulados.aspx @@ -10,7 +10,7 @@ } } - + .GvConceptos tr td a { color: #5b9bd1; } @@ -74,10 +74,11 @@ .isOnlyBisibleP td:nth-child(-n+3) a { color: #999; } - + .isOnlyBisibleD td:nth-last-child(-n+3) a { color: #999; } + .isOnlyBisibleO td:nth-last-child(-n+3) a { color: #999; } @@ -135,6 +136,7 @@ + Acumulados de Nóminas @@ -168,10 +170,14 @@
<%----%> -
- + +
+ + + + - +
@@ -179,10 +185,13 @@
<%----%> -
- +
+ + + + - +
@@ -268,186 +277,178 @@ - - - -
-
-
- - Acumulados nómina -
+
+
+
+ + Acumulados nómina +
-
- - -
-
-
-
-
-
- - -
-
-
- - - - - - - - - - - Nombre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - -
+
+ + +
+
+
- - +
+
+ + +
+
+
+ + - + + + + + + + + Nombre + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + +
+
- diff --git a/Nomina/ReportedeAcumulados.aspx.cs b/Nomina/ReportedeAcumulados.aspx.cs index 1d522d6ea..5cbbc8a75 100644 --- a/Nomina/ReportedeAcumulados.aspx.cs +++ b/Nomina/ReportedeAcumulados.aspx.cs @@ -159,7 +159,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas { DdlTipoPeriodo.DataSource = GlobalDTTipoPeriodo.FiltraParametros("Estatus = 'Activo'"); DdlTipoPeriodo.DataBind(); - DdlTipoPeriodo.Items.Insert(0, new ListItem("Seleccione", "-1")); + DdlTipoPeriodo.Items.Insert(0, new ListItem("Todos", "-1")); if (DdlTipoPeriodo.Items.Count > 0) { DdlTipoPeriodo.SelectedIndex = 0; diff --git a/RH/Personal.aspx b/RH/Personal.aspx index 0fb0c0b62..76908b21e 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -719,7 +719,9 @@
- + @@ -742,6 +744,64 @@ + + + + + +
diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index 09e4f08bb..da16a8d97 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -6507,12 +6507,82 @@ Partial Class RH_Personal + Property CvePersonalAltas As Integer + Get + If ViewState("CvePersonalAltas") Is Nothing Then + Return 0 + Else + Return DirectCast(ViewState("CvePersonalAltas"), Integer) + End If + End Get + Set(value As Integer) + ViewState("CvePersonalAltas") = value + End Set + End Property Protected Sub LnkUpAltass_Click(sender As Object, e As EventArgs) - + Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow) + CvePersonalAltas = GvRow.DataKey("CvePersonalAltas").ToEntero() + TxtFechaInicioUA.Text = String.Format("{0:dd/MM/yyyy}", GvRow.DataKey("FechaInicio").ToDateTime()) + Dim fechafin As DateTime = GvRow.DataKey("FechaFin").ToDateTime() + If fechafin.Year < 1900 Then + TxtFechaFinUA.Text = "" + Else + TxtFechaFinUA.Text = String.Format("{0:dd/MM/yyyy}", fechafin) + End If + UpAltasUpdate.Update() + RegistraScript("$('#ModalUpAltas').modal();") End Sub Protected Sub LnkDAltas_Click(sender As Object, e As EventArgs) + Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow) + CvePersonalAltas = GvRow.DataKey("CvePersonalAltas").ToEntero() + Dim strquery As String = String.Format("DELETE [RH_PersonalAltas] WHERE CvePersonalAltas ={0} AND [CvePersonal] ={1}", CvePersonalAltas, CvePersonal) + Using objbase As New ClsClaseBase + If (objbase.runQuerystr(strquery)) Then + Using objrh As New ClsRH() + If objrh.GetPersonalAltas(CvePersonal) Then + GvPersonalAltas.DataSource = objrh.DtResultados + GvPersonalAltas.DataBind() + UpDatos.Update() + End If + End Using + Alert("Alta eliminada") + End If + End Using + End Sub + + Protected Sub LnkUpAltas_Click(sender As Object, e As EventArgs) + + Dim strfin As String = "" + Dim fechafin As DateTime = TxtFechaFinUA.Text.ToDateTime() + If fechafin.Year < 1900 Then + strfin = ",[FechaFin]=null" + Else + strfin = String.Format(",[FechaFin]='{0:yyyy-MM-dd}'", fechafin) + + End If + Dim strquery As String = String.Format("UPDATE [RH_PersonalAltas] SET [FechaInicio]='{2:yyyy-MM-dd}' {3} WHERE CvePersonalAltas ={0} AND [CvePersonal] ={1}", CvePersonalAltas, CvePersonal, TxtFechaInicioUA.Text.ToDateTime(), strfin) + Using objbase As New ClsClaseBase + If (objbase.runQuerystr(strquery)) Then + Using objrh As New ClsRH() + If objrh.GetPersonalAltas(CvePersonal) Then + GvPersonalAltas.DataSource = objrh.DtResultados + GvPersonalAltas.DataBind() + UpDatos.Update() + End If + End Using + Alert("Alta actualizada") + End If + End Using + End Sub + + Protected Sub GvPersonalAltas_RowDataBound(sender As Object, e As GridViewRowEventArgs) + If e.Row.RowType = DataControlRowType.DataRow Then + e.Row.FCLinkButton("LnkUpAltass").Visible = UsuarioActual.TienePermisoProceso(327) + e.Row.FCLinkButton("LnkDAltas").Visible = e.Row.FCLinkButton("LnkUpAltass").Visible + End If End Sub End Class + diff --git a/vwd.webinfo b/vwd.webinfo index aa2858f6e..a4b7678ae 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -266,6 +266,12 @@ + + + + + + From 234c8247427316743f61be765af3f56038871376 Mon Sep 17 00:00:00 2001 From: HECTOR RODRIGUEZ Date: Fri, 9 Jul 2021 23:09:38 -0700 Subject: [PATCH 3/3] --- Compras/RepCxP.aspx.vb | 533 ++++++++++++++------------- Contabilidad/RegPrePolizaS.aspx.vb | 6 +- Inventarios/InventarioFisico.aspx.vb | 30 ++ PortalProveedor/PortalProveedor.aspx | 10 +- 4 files changed, 321 insertions(+), 258 deletions(-) diff --git a/Compras/RepCxP.aspx.vb b/Compras/RepCxP.aspx.vb index c63fb42cb..f22fe1d7f 100644 --- a/Compras/RepCxP.aspx.vb +++ b/Compras/RepCxP.aspx.vb @@ -1065,78 +1065,53 @@ Partial Class Compras_RepCxP If chkAgruparMes.Checked Then DtExcel = (From row As DataRow In Mov.DtResultados.Rows Select New With - { - .GPO = row.Item("GPO"), - .Saldo = row.Item("Saldo"), - .TotalVencido = row.Item("vencido"), - .Mes1 = row.Item("Mes1"), - .Mes2 = row.Item("Mes2"), - .Mes3 = row.Item("Mes3"), - .Mes4 = row.Item("Mes4"), - .Mes5 = row.Item("Mes5"), - .Mes6 = row.Item("Mes6"), - .Mes7 = row.Item("Mes7"), - .Mes8 = row.Item("Mes8"), - .Mes9 = row.Item("Mes9"), - .Mes10 = row.Item("Mes10"), - .Mes11 = row.Item("Mes11"), - .Mes12 = row.Item("Mes12"), - .Mes13 = row.Item("Mes13"), - .TotalxVencer = row.Item("por_vencer") - }).QueryToDataTable(True) - Else - DtExcel = (From row As DataRow In Mov.DtResultados.Rows - Select New With - { + { .GPO = row.Item("GPO"), .Saldo = row.Item("Saldo"), - .Columna1vencido = row.Item("Columna1"), - .Columna2vencido = row.Item("Columna2"), - .Columna3vencido = row.Item("Columna3"), - .Columna4vencido = row.Item("Columna4"), - .Columna5vencido = row.Item("Columna5"), - .Columna6vencido = row.Item("Columna6"), - .Columna7vencido = row.Item("Columna7"), - .Columna8vencido = row.Item("Columna8"), - .Columna9vencido = row.Item("Columna9"), - .Columna10vencido = row.Item("Columna10"), - .Columna11vencido = row.Item("Columna11"), - .Columna12vencido = row.Item("Columna12"), - .Columna13vencido = row.Item("Columna13"), .TotalVencido = row.Item("vencido"), - .Columna1xVencer = row.Item("Columna1"), - .Columna2xVencer = row.Item("Columna2"), - .Columna3xVencer = row.Item("Columna3"), - .Columna4xVencer = row.Item("Columna4"), - .Columna5xVencer = row.Item("Columna5"), - .Columna6xVencer = row.Item("Columna6"), - .Columna7xVencer = row.Item("Columna7"), - .Columna8xVencer = row.Item("Columna8"), - .Columna9xVencer = row.Item("Columna9"), - .Columna10xVencer = row.Item("Columna10"), - .Columna11xVencer = row.Item("Columna11"), - .Columna12xVencer = row.Item("Columna12"), - .Columna13xVencer = row.Item("Columna13"), + .Mes1 = row.Item("Mes1"), + .Mes2 = row.Item("Mes2"), + .Mes3 = row.Item("Mes3"), + .Mes4 = row.Item("Mes4"), + .Mes5 = row.Item("Mes5"), + .Mes6 = row.Item("Mes6"), + .Mes7 = row.Item("Mes7"), + .Mes8 = row.Item("Mes8"), + .Mes9 = row.Item("Mes9"), + .Mes10 = row.Item("Mes10"), + .Mes11 = row.Item("Mes11"), + .Mes12 = row.Item("Mes12"), + .Mes13 = row.Item("Mes13"), .TotalxVencer = row.Item("por_vencer") }).QueryToDataTable(True) - End If - Mov.Dispose() + Dim RowDolares As Integer = 0 + For Each row As DataRow In DtExcel.Rows + If row("GPO").ToString = "Dólares" Then + RowDolares += 1 + Exit For + Else + RowDolares += 1 + End If + Next + worksheet.InsertDataTable(DtExcel, New InsertDataTableOptions() With + { + .ColumnHeaders = True, + .StartRow = 0, + .StartColumn = 0 + }) + worksheet.Columns("B").Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Columns("C").Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Columns("Q").Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(0).Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(217, 217, 217), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(1).Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(103, 128, 159), SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(RowDolares).Style.FillPattern.SetPattern(FillPatternStyle.Solid, SpreadsheetColor.FromArgb(103, 128, 159), SpreadsheetColor.FromArgb(255, 255, 255)) - worksheet.InsertDataTable(DtExcel, New InsertDataTableOptions() With - { - .ColumnHeaders = True, - .StartRow = 0, - .StartColumn = 0 - }) + Dim columnCount = worksheet.CalculateMaxUsedColumns() + For i = 0 To columnCount + worksheet.Columns(i).AutoFit(1, worksheet.Rows(0), worksheet.Rows(worksheet.Rows.Count - 1)) + Next - Dim columnCount = worksheet.CalculateMaxUsedColumns() - For i = 0 To columnCount - worksheet.Columns(i).AutoFit(1, worksheet.Rows(0), worksheet.Rows(worksheet.Rows.Count - 1)) - Next - - - If chkAgruparMes.Checked Then worksheet.Cells("A1").Value = DdlGrupo.SelectedItem.Text worksheet.Cells("D1").Value = Mes(0) worksheet.Cells("E1").Value = Mes(1) @@ -1151,200 +1126,248 @@ Partial Class Compras_RepCxP worksheet.Cells("N1").Value = Mes(10) worksheet.Cells("O1").Value = Mes(11) worksheet.Cells("P1").Value = Mes(12) - Else - Dim Vencido As Integer = 0 - Dim Xvencer As Integer = 0 - If Dr("TC1").ToString.ToEntero = 1 Then - worksheet.Cells("C1").Value = Dr("NomC1").ToString - Vencido += 1 - ElseIf Dr("TC1").ToString.ToEntero = 2 Then - worksheet.Cells("Q1").Value = Dr("NomC1").ToString - Xvencer += 1 - End If - If Dr("TC2").ToString.ToEntero = 1 Then - worksheet.Cells("D1").Value = Dr("NomC2").ToString - Vencido += 1 - ElseIf Dr("TC2").ToString.ToEntero = 2 Then - worksheet.Cells("R1").Value = Dr("NomC2").ToString - Xvencer += 1 - End If - If Dr("TC3").ToString.ToEntero = 1 Then - worksheet.Cells("E1").Value = Dr("NomC3").ToString - Vencido += 1 - ElseIf Dr("TC3").ToString.ToEntero = 2 Then - worksheet.Cells("S1").Value = Dr("NomC3").ToString - Xvencer += 1 - End If - If Dr("TC4").ToString.ToEntero = 1 Then - worksheet.Cells("F1").Value = Dr("NomC4").ToString - Vencido += 1 - ElseIf Dr("TC4").ToString.ToEntero = 2 Then - worksheet.Cells("T1").Value = Dr("NomC4").ToString - Xvencer += 1 - End If - If Dr("TC5").ToString.ToEntero = 1 Then - worksheet.Cells("G1").Value = Dr("NomC5").ToString - Vencido += 1 - ElseIf Dr("TC5").ToString.ToEntero = 2 Then - worksheet.Cells("U1").Value = Dr("NomC5").ToString - Xvencer += 1 - End If - If Dr("TC6").ToString = "1" Then - worksheet.Cells("H1").Value = Dr("NomC6").ToString - Vencido += 1 - ElseIf Dr("TC6").ToString.ToEntero = 2 Then - worksheet.Cells("V1").Value = Dr("NomC6").ToString - Xvencer += 1 - End If - If Dr("TC7").ToString.ToEntero = 1 Then - worksheet.Cells("I1").Value = Dr("NomC7").ToString - Vencido += 1 - ElseIf Dr("TC7").ToString.ToEntero = 2 Then - worksheet.Cells("W1").Value = Dr("NomC7").ToString - Xvencer += 1 - End If - If Dr("TC8").ToString.ToEntero = 1 Then - worksheet.Cells("J1").Value = Dr("NomC8").ToString - Vencido += 1 - ElseIf Dr("TC8").ToString.ToEntero = 2 Then - worksheet.Cells("X1").Value = Dr("NomC8").ToString - Xvencer += 1 - End If - If Dr("TC9").ToString.ToEntero = 1 Then - worksheet.Cells("K1").Value = Dr("NomC9").ToString - Vencido += 1 - ElseIf Dr("TC9").ToString.ToEntero = 2 Then - worksheet.Cells("Y1").Value = Dr("NomC9").ToString - Xvencer += 1 - End If - If Dr("TC10").ToString.ToEntero = 1 Then - worksheet.Cells("L1").Value = Dr("NomC10").ToString - Vencido += 1 - ElseIf Dr("TC10").ToString.ToEntero = 2 Then - worksheet.Cells("Z1").Value = Dr("NomC10").ToString - Xvencer += 1 - End If - If Dr("TC11").ToString.ToEntero = 1 Then - worksheet.Cells("M1").Value = Dr("NomC11").ToString - Vencido += 1 - ElseIf Dr("TC11").ToString.ToEntero = 2 Then - worksheet.Cells("AA1").Value = Dr("NomC11").ToString - Xvencer += 1 - End If - If Dr("TC12").ToString.ToEntero = 1 Then - worksheet.Cells("N1").Value = Dr("NomC12").ToString - Vencido += 1 - ElseIf Dr("TC12").ToString.ToEntero = 2 Then - worksheet.Cells("AB1").Value = Dr("NomC12").ToString - Xvencer += 1 - End If - If Dr("TC13").ToString.ToEntero = 1 Then - worksheet.Cells("O1").Value = Dr("NomC13").ToString - Vencido += 1 - ElseIf Dr("TC13").ToString.ToEntero = 2 Then - worksheet.Cells("AC1").Value = Dr("NomC13").ToString - Xvencer += 1 - End If - - - If Dr("TC13").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(28) - End If - If Dr("TC12").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(27) - End If - - If Dr("TC11").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(26) - End If - - If Dr("TC10").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(25) - End If - If Dr("TC9").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(24) - End If - - If Dr("TC8").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(23) - End If - If Dr("TC7").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(22) - End If - - If Dr("TC6").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(21) - End If - If Dr("TC5").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(20) - End If - - If Dr("TC4").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(19) - End If - If Dr("TC3").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(18) - End If - If Dr("TC2").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(17) - End If - If Dr("TC1").ToString.ToEntero <> 2 Then - worksheet.Columns.Remove(16) - End If - - - If Dr("TC13").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(14) - End If - - If Dr("TC12").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(13) - End If - - If Dr("TC11").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(12) - End If - - If Dr("TC10").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(11) - End If - If Dr("TC9").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(10) - End If - - If Dr("TC8").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(9) - End If - If Dr("TC7").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(8) - End If - - If Dr("TC6").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(7) - End If - If Dr("TC5").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(6) - End If - - If Dr("TC4").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(5) - End If - If Dr("TC3").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(4) - End If - If Dr("TC2").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(3) - End If - If Dr("TC1").ToString.ToEntero <> 1 Then - worksheet.Columns.Remove(2) - End If - End If - NombreArchivo = "CxP" - workbook.Save(Response, $"{NombreArchivo}.xlsx", SaveOptions.XlsxDefault) - 'GenerarPDF("EXCEL") + workbook.Save(Response, $"{NombreArchivo}.xlsx", SaveOptions.XlsxDefault) + Else + 'DtExcel = (From row As DataRow In Mov.DtResultados.Rows + ' Select New With + ' { + ' .GPO = row.Item("GPO"), + ' .Saldo = row.Item("Saldo"), + ' .Columna1vencido = row.Item("Columna1"), + ' .Columna2vencido = row.Item("Columna2"), + ' .Columna3vencido = row.Item("Columna3"), + ' .Columna4vencido = row.Item("Columna4"), + ' .Columna5vencido = row.Item("Columna5"), + ' .Columna6vencido = row.Item("Columna6"), + ' .Columna7vencido = row.Item("Columna7"), + ' .Columna8vencido = row.Item("Columna8"), + ' .Columna9vencido = row.Item("Columna9"), + ' .Columna10vencido = row.Item("Columna10"), + ' .Columna11vencido = row.Item("Columna11"), + ' .Columna12vencido = row.Item("Columna12"), + ' .Columna13vencido = row.Item("Columna13"), + ' .TotalVencido = row.Item("vencido"), + ' .Columna1xVencer = row.Item("Columna1"), + ' .Columna2xVencer = row.Item("Columna2"), + ' .Columna3xVencer = row.Item("Columna3"), + ' .Columna4xVencer = row.Item("Columna4"), + ' .Columna5xVencer = row.Item("Columna5"), + ' .Columna6xVencer = row.Item("Columna6"), + ' .Columna7xVencer = row.Item("Columna7"), + ' .Columna8xVencer = row.Item("Columna8"), + ' .Columna9xVencer = row.Item("Columna9"), + ' .Columna10xVencer = row.Item("Columna10"), + ' .Columna11xVencer = row.Item("Columna11"), + ' .Columna12xVencer = row.Item("Columna12"), + ' .Columna13xVencer = row.Item("Columna13"), + ' .TotalxVencer = row.Item("por_vencer") + ' }).QueryToDataTable(True) + GenerarPDF("EXCEL") + + End If + Mov.Dispose() + + + + + + 'If chkAgruparMes.Checked Then + + 'Else + ' Dim Vencido As Integer = 0 + ' Dim Xvencer As Integer = 0 + ' If Dr("TC1").ToString.ToEntero = 1 Then + ' worksheet.Cells("C1").Value = Dr("NomC1").ToString + ' Vencido += 1 + ' ElseIf Dr("TC1").ToString.ToEntero = 2 Then + ' worksheet.Cells("Q1").Value = Dr("NomC1").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC2").ToString.ToEntero = 1 Then + ' worksheet.Cells("D1").Value = Dr("NomC2").ToString + ' Vencido += 1 + ' ElseIf Dr("TC2").ToString.ToEntero = 2 Then + ' worksheet.Cells("R1").Value = Dr("NomC2").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC3").ToString.ToEntero = 1 Then + ' worksheet.Cells("E1").Value = Dr("NomC3").ToString + ' Vencido += 1 + ' ElseIf Dr("TC3").ToString.ToEntero = 2 Then + ' worksheet.Cells("S1").Value = Dr("NomC3").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC4").ToString.ToEntero = 1 Then + ' worksheet.Cells("F1").Value = Dr("NomC4").ToString + ' Vencido += 1 + ' ElseIf Dr("TC4").ToString.ToEntero = 2 Then + ' worksheet.Cells("T1").Value = Dr("NomC4").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC5").ToString.ToEntero = 1 Then + ' worksheet.Cells("G1").Value = Dr("NomC5").ToString + ' Vencido += 1 + ' ElseIf Dr("TC5").ToString.ToEntero = 2 Then + ' worksheet.Cells("U1").Value = Dr("NomC5").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC6").ToString = "1" Then + ' worksheet.Cells("H1").Value = Dr("NomC6").ToString + ' Vencido += 1 + ' ElseIf Dr("TC6").ToString.ToEntero = 2 Then + ' worksheet.Cells("V1").Value = Dr("NomC6").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC7").ToString.ToEntero = 1 Then + ' worksheet.Cells("I1").Value = Dr("NomC7").ToString + ' Vencido += 1 + ' ElseIf Dr("TC7").ToString.ToEntero = 2 Then + ' worksheet.Cells("W1").Value = Dr("NomC7").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC8").ToString.ToEntero = 1 Then + ' worksheet.Cells("J1").Value = Dr("NomC8").ToString + ' Vencido += 1 + ' ElseIf Dr("TC8").ToString.ToEntero = 2 Then + ' worksheet.Cells("X1").Value = Dr("NomC8").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC9").ToString.ToEntero = 1 Then + ' worksheet.Cells("K1").Value = Dr("NomC9").ToString + ' Vencido += 1 + ' ElseIf Dr("TC9").ToString.ToEntero = 2 Then + ' worksheet.Cells("Y1").Value = Dr("NomC9").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC10").ToString.ToEntero = 1 Then + ' worksheet.Cells("L1").Value = Dr("NomC10").ToString + ' Vencido += 1 + ' ElseIf Dr("TC10").ToString.ToEntero = 2 Then + ' worksheet.Cells("Z1").Value = Dr("NomC10").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC11").ToString.ToEntero = 1 Then + ' worksheet.Cells("M1").Value = Dr("NomC11").ToString + ' Vencido += 1 + ' ElseIf Dr("TC11").ToString.ToEntero = 2 Then + ' worksheet.Cells("AA1").Value = Dr("NomC11").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC12").ToString.ToEntero = 1 Then + ' worksheet.Cells("N1").Value = Dr("NomC12").ToString + ' Vencido += 1 + ' ElseIf Dr("TC12").ToString.ToEntero = 2 Then + ' worksheet.Cells("AB1").Value = Dr("NomC12").ToString + ' Xvencer += 1 + ' End If + ' If Dr("TC13").ToString.ToEntero = 1 Then + ' worksheet.Cells("O1").Value = Dr("NomC13").ToString + ' Vencido += 1 + ' ElseIf Dr("TC13").ToString.ToEntero = 2 Then + ' worksheet.Cells("AC1").Value = Dr("NomC13").ToString + ' Xvencer += 1 + ' End If + + + ' If Dr("TC13").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(28) + ' End If + ' If Dr("TC12").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(27) + ' End If + + ' If Dr("TC11").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(26) + ' End If + + ' If Dr("TC10").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(25) + ' End If + ' If Dr("TC9").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(24) + ' End If + + ' If Dr("TC8").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(23) + ' End If + ' If Dr("TC7").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(22) + ' End If + + ' If Dr("TC6").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(21) + ' End If + ' If Dr("TC5").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(20) + ' End If + + ' If Dr("TC4").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(19) + ' End If + ' If Dr("TC3").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(18) + ' End If + ' If Dr("TC2").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(17) + ' End If + ' If Dr("TC1").ToString.ToEntero <> 2 Then + ' worksheet.Columns.Remove(16) + ' End If + + + ' If Dr("TC13").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(14) + ' End If + + ' If Dr("TC12").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(13) + ' End If + + ' If Dr("TC11").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(12) + ' End If + + ' If Dr("TC10").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(11) + ' End If + ' If Dr("TC9").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(10) + ' End If + + ' If Dr("TC8").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(9) + ' End If + ' If Dr("TC7").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(8) + ' End If + + ' If Dr("TC6").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(7) + ' End If + ' If Dr("TC5").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(6) + ' End If + + ' If Dr("TC4").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(5) + ' End If + ' If Dr("TC3").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(4) + ' End If + ' If Dr("TC2").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(3) + ' End If + ' If Dr("TC1").ToString.ToEntero <> 1 Then + ' worksheet.Columns.Remove(2) + ' End If + 'End If + + + + End Sub Private Sub ImgImprimir_Click(sender As Object, e As EventArgs) Handles ImgImprimir.Click diff --git a/Contabilidad/RegPrePolizaS.aspx.vb b/Contabilidad/RegPrePolizaS.aspx.vb index 6993700c2..706b97522 100644 --- a/Contabilidad/RegPrePolizaS.aspx.vb +++ b/Contabilidad/RegPrePolizaS.aspx.vb @@ -1911,7 +1911,11 @@ Partial Class ContabilidadC_RegPrePolizaS Dim NombreArchivo As String SpreadsheetInfo.SetLicense(ModExtensiones.SerialGemBoxSpreadsheet) Dim workbook As New ExcelFile() - Dim worksheet = workbook.Worksheets.Add(DdlPlantilla2.SelectedItem.Text.ToString) + Dim NombreHoja As String = DdlPlantilla2.SelectedItem.Text.ToString + If NombreHoja.Length > 30 Then + NombreHoja = NombreHoja.Substring(0, 29) + End If + Dim worksheet = workbook.Worksheets.Add(NombreHoja) Dim CvePlantilla As Integer = DdlPlantilla2.SelectedValue.ToEntero Dim Dt As DataTable = GlobalDTContaPlantillasPolizasDetalle(CvePlantilla).FiltraParametros(String.Format("CveEmpresa={0}", UsuarioActual.CveEmpresa), "Orden") diff --git a/Inventarios/InventarioFisico.aspx.vb b/Inventarios/InventarioFisico.aspx.vb index a81812484..619d2ea0d 100644 --- a/Inventarios/InventarioFisico.aspx.vb +++ b/Inventarios/InventarioFisico.aspx.vb @@ -135,6 +135,16 @@ Partial Class Inventarios_InventarioFisico UpProductosServicios.Update() UPPPSExcluye.Update() End Sub + + Private Sub CargaGvProveedores() + Dim ObjInventario As New ClsInventarios() + If ObjInventario.GetInventarioFisicoDetallesProveedores(HdnID.Value, UsuarioActual.CveEmpresa) Then + GvProveedor.DataSource = ObjInventario.DtResultados.FiltraParametros("Incluye = 1") + End If + ObjInventario.Dispose() + GvProveedor.DataBind() + UpProveedor.Update() + End Sub Private Sub CargaDdlSubProyectos() CargarCentrosDeCosto(Nothing, DdlSubProyecto, Nothing, LblSubProyecto) CargarCentrosDeCosto(Nothing, DdlFiltroSubProyecto, Nothing, LblFiltroSubProyecto) @@ -316,6 +326,7 @@ Partial Class Inventarios_InventarioFisico #End Region +#Region "PROVEEDORES" Private Sub BtnAgregarProveedor_Click(sender As Object, e As EventArgs) Handles BtnAgregarProveedor.Click If DdlProveedor.SelectedValue = -1 Then Alert("Tienes seleccionada la opcion 'Todos'.", TipoMensaje.MsgInformacion) @@ -348,6 +359,7 @@ Partial Class Inventarios_InventarioFisico GvProveedor.DataBind() UpProveedor.Update() End Sub +#End Region #Region "INVENTARIO FISICO" Public Sub Delete_Click(sender As Object, e As EventArgs) @@ -366,6 +378,12 @@ Partial Class Inventarios_InventarioFisico Public Sub Edit_Click(sender As Object, e As EventArgs) Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) + DdlProductosServicios.ddl.SelectedValueExist(-1) + DdlProveedor.ddl.SelectedValueExist(-1) + DdlPSExcluye.ddl.SelectedValueExist(-1) + DdlClasificacion.SelectedValueExist(-1) + DdlClasificacionExcluida.SelectedValueExist(-1) + tDTClasif.Rows.Clear() tDTClasifExcluye.Rows.Clear() tDTPS.Rows.Clear() @@ -392,10 +410,12 @@ Partial Class Inventarios_InventarioFisico CargaGvAlmacen() CargaGvClasificacion() CargaGvProductosServicios() + CargaGvProveedores() tDTClasif = GvClasificacion.DataSource tDTClasifExcluye = GvClasificacionExcluida.DataSource tDTPS = GvPS.DataSource tDTPSExcluye = GvPSExcluye.DataSource + tDTProv = GvProveedor.DataSource tALM = GvAlmacen.DataSource UpAddInventarioFisico.Update() RegistraScript(String.Format("$('#{0}').modal('show');", "divAddInventarioFisico")) @@ -413,8 +433,16 @@ Partial Class Inventarios_InventarioFisico tDTPSExcluye.Rows.Clear() tDTClasifExcluye.Rows.Clear() tALM.Rows.Clear() + tDTProv.Rows.Clear() End If + DdlProductosServicios.ddl.SelectedValueExist(-1) + DdlPSExcluye.ddl.SelectedValueExist(-1) + DdlProveedor.ddl.SelectedValueExist(-1) + + DdlClasificacion.SelectedValueExist(-1) + DdlClasificacionExcluida.SelectedValueExist(-1) + HdnModalidad.Value = "A" UppInventarioFisico.Update() BtnAgregarInventarioFisico.Text = "Agregar" @@ -431,6 +459,8 @@ Partial Class Inventarios_InventarioFisico GvPS.DataBind() GvPSExcluye.DataSource = Nothing GvPSExcluye.DataBind() + GvProveedor.DataSource = Nothing + GvProveedor.DataBind() UpAddInventarioFisico.Update() RegistraScript("$('#divAddInventarioFisico').modal('show');") diff --git a/PortalProveedor/PortalProveedor.aspx b/PortalProveedor/PortalProveedor.aspx index 28c9c6951..4bcd4e740 100644 --- a/PortalProveedor/PortalProveedor.aspx +++ b/PortalProveedor/PortalProveedor.aspx @@ -196,7 +196,7 @@ Aplica NC - + <%----%> @@ -246,7 +246,13 @@ - + + Aplica NC + + + + + <%----%>