From 0213f3025dd1677c8100449c548223a93612ceb2 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 5 Sep 2025 21:22:09 -0600 Subject: [PATCH] =?UTF-8?q?-=20VERSION=205.09.03=20-=20Cambios=20en=20el?= =?UTF-8?q?=20validador,=20para=20que=20no=20mande=20cantidades=20y=20mont?= =?UTF-8?q?os=20totales=20en=20nulo.=20-=20Se=20agreg=C3=B3=20que=20mande?= =?UTF-8?q?=20a=20la=20tabla=20pedido=20la=20version=20de=20la=20aplicacio?= =?UTF-8?q?n.=20-=20Se=20agreg=C3=B3=20que=20mande=20a=20la=20tabla=20de?= =?UTF-8?q?=20pedido=20un=20"folio"=20con=20cada=20envio=20de=20pedido,=20?= =?UTF-8?q?asi,=20cuando=20se=20manda=20varias=20veces=20el=20pedido,se=20?= =?UTF-8?q?puede=20"agrupar"=20por=20el=20folio=20para=20saber=20que=20pro?= =?UTF-8?q?ductos=20pertenecen=20a=20cada=20envio.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 1 - B4A/C_Cliente.bas | 196 ++++++++++++++++++++++---------------------- B4A/C_Principal.bas | 22 ++--- B4A/C_Productos.bas | 2 +- B4A/C_Validador.bas | 32 +++++--- B4A/INTMEX.b4a | 2 +- B4A/INTMEX.b4a.meta | 6 +- 7 files changed, 134 insertions(+), 127 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index c0d557f..16b2fe6 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -771,7 +771,6 @@ Private Sub b_importarBD_Click ToastMessageShow("¡BD importada!", False) End Sub - Private Sub b_guardar_Click Starter.reinicializaReqManager(et_server.Text.Trim) p_appUpdate.Visible = False diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index d624afe..bca8afc 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1155,113 +1155,113 @@ Private Sub cb_factura_CheckedChange(Checked As Boolean) End Sub Sub mandaPendientes -' PEDIDO_CLIENTE (Pendientes) - Log(">>>>>>> MANDA PENDIENTES") - Dim PCNoArts As String - Dim PCMonto As String - If usuario <> "KMTS1" Then - c = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK = 0") - Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) - If c.RowCount > 0 Then - For i = 0 To c.RowCount - 1 - c.Position = i - Log($"${c.GetString("PC_CLIENTE")}|${c.GetString("PC_FECHA")}|${c.GetString("PC_ENVIO_OK")}|"$) - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_pedidos_INTMEX" - cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), Subs.traeAlmacen, B4XPages.MainPage.principal.l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) - PCNoArts = c.GetString("PC_NOART") - PCMonto = c.GetString("PC_MONTO") -' sql.insert_pedidos_INTMEX=INSERT INTO INTMEX.PEDIDO_CLIENTE(PC_FECHA_SINC,PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_IDALMACEN, PC_RUTA, PC_COSTO_SIN, PC_FACTURA) VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?)) - reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) - Next - End If +'' PEDIDO_CLIENTE (Pendientes) +' Log(">>>>>>> MANDA PENDIENTES") +' Dim PCNoArts As String +' Dim PCMonto As String +' If usuario <> "KMTS1" Then +' c = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK = 0") +' Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) +' If c.RowCount > 0 Then +' For i = 0 To c.RowCount - 1 +' c.Position = i +' Log($"${c.GetString("PC_CLIENTE")}|${c.GetString("PC_FECHA")}|${c.GetString("PC_ENVIO_OK")}|"$) +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_pedidos_INTMEX" +' cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), Subs.traeAlmacen, B4XPages.MainPage.principal.l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) +' PCNoArts = c.GetString("PC_NOART") +' PCMonto = c.GetString("PC_MONTO") +'' sql.insert_pedidos_INTMEX=INSERT INTO INTMEX.PEDIDO_CLIENTE(PC_FECHA_SINC,PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_IDALMACEN, PC_RUTA, PC_COSTO_SIN, PC_FACTURA) VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?)) +' reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) +' Next +' End If - 'PEDIDO (Pendientes) - c = skmt.ExecQuery($"SELECT PE_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_TICKET FROM PEDIDO where PE_ENVIO_OK <> 1"$) - Log($"Pedido PENDIENTE: ${c.RowCount}"$) - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_pedido4_INTMEX" - cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto,c.GetString("PE_TICKET")) - reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$) - Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}, ${PCMonto}, ${c.GetString("PE_TICKET")}"$) -' sql.insert_pedido_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?)) -' sql.insert_pedido2_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO, PE_CANT_TOTAL, PE_VENTA_TOTAL) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?),(?),(?)) - Next - End If - - 'ABONOS - Dim ab As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) - Log(ab.RowCount) - If ab.RowCount > 0 Then - For i=0 To ab.RowCount -1 - ab.Position = i - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_abono_INTMEX" - cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha"),ALMACEN ) - reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) - Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) - Next - End If - ab.Close - - 'CLIENTES NUEVOS - Dim bb As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from CLIENTE_NUEVO where CN_enviado is null"$) - Dim cb As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT ID_ALMACEN from CAT_ALMACEN") - cb.Position = 0 - If bb.RowCount > 0 Then - For i=0 To bb.RowCount -1 - bb.Position = i - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_cliente_INTMEX" - cmd.Parameters = Array As Object( bb.GetString("CN_ID_CLIENTE"), bb.GetString("CN_NOMBRE"),B4XPages.MainPage.principal.l_ruta.Text,cb.GetString("ID_ALMACEN")) - reqManager.ExecuteCommand(cmd , $"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$) - Log($"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$) - Next - Log("si lo hice") - End If - bb.Close - cb.Close - -' BANDERA FACTURA (Pendientes) -' c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_FACTURA, PC_CLIENTE FROM pedido_cliente where PC_CLIENTE IN (Select CUENTA from cuentaa)") -' Log($"BANDERA FACTURA PENDIENTE: ${c.RowCount}"$) +' 'PEDIDO (Pendientes) +' c = skmt.ExecQuery($"SELECT PE_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_TICKET FROM PEDIDO where PE_ENVIO_OK <> 1"$) +' Log($"Pedido PENDIENTE: ${c.RowCount}"$) ' If c.RowCount>0 Then ' For i=0 To c.RowCount -1 ' c.Position=i ' Dim cmd As DBCommand ' cmd.Initialize -' cmd.Name = "update_factura_INTMEX" -' cmd.Parameters = Array As Object(C.GetString("PC_FACTURA"), C.GetString("PC_CLIENTE"), ALMACEN) -' reqManager.ExecuteCommand(cmd , "upd_facturasPendientes") +' cmd.Name = "insert_pedido4_INTMEX" +' cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto,c.GetString("PE_TICKET")) +' reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$) +' Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}, ${PCMonto}, ${c.GetString("PE_TICKET")}"$) +'' sql.insert_pedido_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?)) +'' sql.insert_pedido2_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO, PE_CANT_TOTAL, PE_VENTA_TOTAL) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?),(?),(?)) +' Next +' End If + +' 'ABONOS +' Dim ab As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) +' Log(ab.RowCount) +' If ab.RowCount > 0 Then +' For i=0 To ab.RowCount -1 +' ab.Position = i +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_abono_INTMEX" +' cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha"),ALMACEN ) +' reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) +' Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) +' Next +' End If +' ab.Close + +' 'CLIENTES NUEVOS +' Dim bb As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from CLIENTE_NUEVO where CN_enviado is null"$) +' Dim cb As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT ID_ALMACEN from CAT_ALMACEN") +' cb.Position = 0 +' If bb.RowCount > 0 Then +' For i=0 To bb.RowCount -1 +' bb.Position = i +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_cliente_INTMEX" +' cmd.Parameters = Array As Object( bb.GetString("CN_ID_CLIENTE"), bb.GetString("CN_NOMBRE"),B4XPages.MainPage.principal.l_ruta.Text,cb.GetString("ID_ALMACEN")) +' reqManager.ExecuteCommand(cmd , $"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$) +' Log($"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$) +' Next +' Log("si lo hice") +' End If +' bb.Close +' cb.Close + +'' BANDERA FACTURA (Pendientes) +'' c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_FACTURA, PC_CLIENTE FROM pedido_cliente where PC_CLIENTE IN (Select CUENTA from cuentaa)") +'' Log($"BANDERA FACTURA PENDIENTE: ${c.RowCount}"$) +'' If c.RowCount>0 Then +'' For i=0 To c.RowCount -1 +'' c.Position=i +'' Dim cmd As DBCommand +'' cmd.Initialize +'' cmd.Name = "update_factura_INTMEX" +'' cmd.Parameters = Array As Object(C.GetString("PC_FACTURA"), C.GetString("PC_CLIENTE"), ALMACEN) +'' reqManager.ExecuteCommand(cmd , "upd_facturasPendientes") +'' Next +'' ' sql.update_factura_INTMEX=UPDATE INTMEX.HIST_VENTAS SET HV_FACTURA = (?) WHERE HV_CLIENTE = (?) And HV_ALMACEN = (?) +'' End If +'' c.Close + +'' CUESTIONARIO (Pendientes) +' c = B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM CUESTIONARIO where ifnull(Q_ENVIO_OK, 0) = 0 order by Q_IDCLIENTE, Q_IDPREGUNTA; Q_IDRESPUESTA") +' Private rutaActual As String = Subs.traeRuta +' Log("CUEST PENDIENTES: " & c.RowCount) +' If c.RowCount > 0 Then +' For x = 0 To c.RowCount - 1 +' c.Position = x +' Log($"insert_cuestionario_${c.GetString("Q_IDCLIENTE")}_${c.GetString("Q_IDPREGUNTA")}_${c.GetString("Q_IDRESPUESTA")}"$) +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_CUESTIONARIO_INTMEX" +' cmd.Parameters = Array As Object(c.GetString("Q_IDCLIENTE"), rutaActual, ALMACEN, c.GetString("Q_FECHA"), c.GetString("Q_IDPREGUNTA"), c.GetString("Q_PREGUNTA"), c.GetString("Q_IDRESPUESTA"), C.GetString("Q_RESPUESTA")) +' reqManager.ExecuteCommand(cmd , $"insert_cuestionario_${c.GetString("Q_IDCLIENTE")}_${c.GetString("Q_IDPREGUNTA")}_${c.GetString("Q_IDRESPUESTA")}"$) ' Next -' ' sql.update_factura_INTMEX=UPDATE INTMEX.HIST_VENTAS SET HV_FACTURA = (?) WHERE HV_CLIENTE = (?) And HV_ALMACEN = (?) ' End If ' c.Close - -' CUESTIONARIO (Pendientes) - c = B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM CUESTIONARIO where ifnull(Q_ENVIO_OK, 0) = 0 order by Q_IDCLIENTE, Q_IDPREGUNTA; Q_IDRESPUESTA") - Private rutaActual As String = Subs.traeRuta - Log("CUEST PENDIENTES: " & c.RowCount) - If c.RowCount > 0 Then - For x = 0 To c.RowCount - 1 - c.Position = x - Log($"insert_cuestionario_${c.GetString("Q_IDCLIENTE")}_${c.GetString("Q_IDPREGUNTA")}_${c.GetString("Q_IDRESPUESTA")}"$) - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_CUESTIONARIO_INTMEX" - cmd.Parameters = Array As Object(c.GetString("Q_IDCLIENTE"), rutaActual, ALMACEN, c.GetString("Q_FECHA"), c.GetString("Q_IDPREGUNTA"), c.GetString("Q_PREGUNTA"), c.GetString("Q_IDRESPUESTA"), C.GetString("Q_RESPUESTA")) - reqManager.ExecuteCommand(cmd , $"insert_cuestionario_${c.GetString("Q_IDCLIENTE")}_${c.GetString("Q_IDPREGUNTA")}_${c.GetString("Q_IDRESPUESTA")}"$) - Next - End If - c.Close - End If +' End If End Sub Sub mandapiezas diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 66c40a2..c3928dc 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -652,6 +652,9 @@ Sub Subir_Click ' Next ' End If ' c.Close + + DateTime.TimeFormat = "HHmmss" + Private elFolio As String = DateTime.Time(DateTime.Now) ' PEDIDO_CLIENTE Dim PCNoArts As String @@ -663,10 +666,10 @@ Sub Subir_Click c.Position = i Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_pedidos_INTMEX" + cmd.Name = "insert_pedidos5_INTMEX" PCNoArts = c.GetString("PC_NOART") PCMonto = c.GetString("PC_MONTO") - cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) + cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"), $"${Application.VersionName}|${elFolio}"$) reqManager.ExecuteCommand(cmd , "ins_pedidos") Log(">>>>>> INSERT PEDIDO_CLIENTE") Next @@ -677,15 +680,16 @@ Sub Subir_Click d.Close ' PEDIDO - c = B4XPages.MainPage.skmt.ExecQuery("SELECT PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_TICKET FROM PEDIDO") +' c = B4XPages.MainPage.skmt.ExecQuery("SELECT PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_TICKET FROM PEDIDO") + c = B4XPages.MainPage.skmt.ExecQuery($"Select (Select PC_NOART from pedido_cliente where pe_cliente = pc_cliente) As PCNoArts, (Select PC_MONTO from pedido_cliente where pe_cliente = pc_cliente) As PCMonto, * FROM PEDIDO"$) d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO") If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 c.Position = i Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_pedido4_INTMEX" 'CON TOTALES INCLUIDOS - cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto,c.GetString("PE_TICKET")) + cmd.Name = "insert_pedido5_INTMEX" 'CON TOTALES INCLUIDOS + cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), c.GetString("PCNoArts"), c.GetString("PCMonto"), c.GetString("PE_TICKET"), Application.VersionName, elFolio) reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$) ' Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}, ${c.GetString("PE_TICKET")}"$) ' cmd.Name = "insert_pedido_INTMEX" ' SIN TOTALES INCLUIDOS @@ -1080,11 +1084,9 @@ Sub JobDone(Job As HttpJob) LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue) End If If Job.Success = False Then - Log("ERROR") -' LogColor("Error: " & reqManager.HandleJob(Job).tag & " : " & Job.ErrorMessage, Colors.red) - Log("ex") - Log(2) -' Job.Release + LogColor("############################################", Colors.red) + LogColor("###### JobError: " & Job.Tag & CRLF & Job.ErrorMessage, Colors.red) + LogColor("############################################", Colors.red) Else 'If Job Success then ... Log(3) LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.RGB(0,160,0)) 'Mod por CHV - 211027 diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 672a889..36b0b7f 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1115,7 +1115,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In b_prodMenos.Enabled = False End If End If - Log(clv_prods_ll.GetValue(i)) +' Log(clv_prods_ll.GetValue(i)) Private precio As String=NumberFormat2(clv_prods_ll.GetValue(i).As(Map).Get("precio").As(Double),1,2,2,False) If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null Then et_pCant.Text = clv_prods_ll.GetValue(i).As(Map).Get("cant") l_prodX.Text = cs.Color(Colors.red).append(clv_prods_ll.GetValue(i).As(Map).Get("prod")).pop.append(CRLF).Append("Existencias: " & clv_prods_ll.GetValue(i).As(Map).Get("almacen")).Color(0xFF017F01).Append($" $${precio}"$).Popall diff --git a/B4A/C_Validador.bas b/B4A/C_Validador.bas index ae9cea8..87587ff 100644 --- a/B4A/C_Validador.bas +++ b/B4A/C_Validador.bas @@ -15,7 +15,7 @@ Sub Class_Globals Dim skmt As SQL Dim c As Cursor Dim sDate, sTime As String - dim totalAValidar as int = 0 + Dim totalAValidar As Int = 0 End Sub 'You can add more parameters here. @@ -77,9 +77,11 @@ End Sub Sub mandaGuardados Log(">>>>>>> MANDA GUARDADOS") ' PEDIDO_CLIENTE (Pendientes) - Dim PCNoArts As String - Dim PCMonto As String +' Dim PCNoArts As String +' Dim PCMonto As String Private almacen As String = Subs.traeAlmacen + DateTime.TimeFormat = "HHmmss" + Private elFolio As String = DateTime.Time(DateTime.Now) c = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK < 2 and PC_GUARDADO = 1") Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) If c.RowCount > 0 Then @@ -89,26 +91,27 @@ Sub mandaGuardados Log($"${c.GetString("PC_CLIENTE")}|${c.GetString("PC_FECHA")}|${c.GetString("PC_ENVIO_OK")}|"$) Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_pedidos_INTMEX" - cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), almacen, B4XPages.MainPage.principal.l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) - PCNoArts = c.GetString("PC_NOART") - PCMonto = c.GetString("PC_MONTO") + cmd.Name = "insert_pedidos5_INTMEX" + cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), almacen, B4XPages.MainPage.principal.l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"), $"${Application.VersionName}|${elFolio}"$) +' PCNoArts = c.GetString("PC_NOART") +' PCMonto = c.GetString("PC_MONTO") reqManager.ExecuteCommand(cmd , $"ins_mandaGuardados_head_${c.GetString("PC_CLIENTE")}"$) Next End If 'PEDIDO (Pendientes) - c = skmt.ExecQuery($"SELECT * FROM PEDIDO where PE_ENVIO_OK < 2 and PE_GUARDADO = 1"$) +' c = skmt.ExecQuery($"SELECT * FROM PEDIDO where PE_ENVIO_OK < 2 and PE_GUARDADO = 1"$) + c = skmt.ExecQuery($"Select (Select PC_NOART from pedido_cliente where pe_cliente = pc_cliente) As PCNoArts, (Select PC_MONTO from pedido_cliente where pe_cliente = pc_cliente) As PCMonto, * FROM PEDIDO where PE_ENVIO_OK < 2 And PE_GUARDADO = 1"$) Log($"Pedido PENDIENTE: ${c.RowCount}"$) If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_pedido4_INTMEX" - cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),almacen,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto,c.GetString("PE_TICKET")) + cmd.Name = "insert_pedido5_INTMEX" + cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"), almacen, c.GetString("PE_COSTO_TOT"), c.GetString("PE_COSTOU"), c.GetString("PE_CANT"), c.GetString("PE_PRONOMBRE"), c.GetString("PE_PROID"), c.GetString("PE_CLIENTE"), c.GetString("PE_FECHA"), c.GetString("PE_USUARIO"), c.GetString("PE_RUTA"), c.GetString("PE_COSTO_SIN"), c.GetString("PE_DESC"), c.GetString("PE_FOLIO"), c.GetString("PCNoArts"), c.GetString("PCMonto"), c.GetString("PE_TICKET"), Application.VersionName, elFolio) reqManager.ExecuteCommand(cmd, $"ins_mandaGuardados_prods_${c.GetString("PE_CLIENTE")}|${c.GetString("PE_PROID")}|${c.GetString("PE_CEDIS")}"$) - Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${almacen},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}, ${PCMonto}, ${c.GetString("PE_TICKET")}"$) + Log($">>>> INS_PEDIDO= ${C.GetString("PE_CEDIS")},${almacen},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${c.GetString("PCNoArts")}, ${c.GetString("PCMonto")}, ${c.GetString("PE_TICKET")}, ${Application.VersionName}, ${elFolio}"$) Next End If c.Close @@ -200,7 +203,10 @@ End Sub Sub JobDone(Job As HttpJob) ' Log(Job.Success) If Job.Success = False Then - ToastMessageShow("Validador JobDone Error: " & Job.ErrorMessage, True) +' ToastMessageShow("Validador JobDone Error: " & Job.ErrorMessage, True) + LogColor("############################################", Colors.red) + LogColor("###### Validador JobError: " & Job.Tag & CRLF & Job.ErrorMessage, Colors.red) + LogColor("############################################", Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) If Job.JobName = "DBRequest" Then @@ -255,7 +261,7 @@ Sub JobDone(Job As HttpJob) If records(resultado.Columns.Get("AffectedRows")).As(Int) > 0 Then Private pars() As String = Regex.Split("\|", cliente) skmt.ExecNonQuery($"update PEDIDO set PE_ENVIO_OK = 2 where PE_CLIENTE = '${pars(0)}' and PE_PROID = '${pars(1)}' and PE_CEDIS = '${pars(2)}' and PE_ENVIO_OK = 1"$) - LogColor($"update PEDIDO set PE_ENVIO_OK = 2 where PE_CLIENTE = '${pars(0)}' and PE_PROID = '${pars(1)}' and PE_CEDIS = '${pars(2)}' and PE_ENVIO_OK = 1"$, Colors.red) +' LogColor($"update PEDIDO set PE_ENVIO_OK = 2 where PE_CLIENTE = '${pars(0)}' and PE_PROID = '${pars(1)}' and PE_CEDIS = '${pars(2)}' and PE_ENVIO_OK = 1"$, Colors.red) End If Next End If diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index 6ffd546..4b09099 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -164,7 +164,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 5.09.02 + #VersionName: 5.09.03 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 8a02ca8..d6a7055 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -65,7 +65,7 @@ ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= ModuleClosedNodes12= -ModuleClosedNodes13=4,5,6 +ModuleClosedNodes13=4,5 ModuleClosedNodes14=11 ModuleClosedNodes15= ModuleClosedNodes16= @@ -85,12 +85,12 @@ ModuleClosedNodes28= ModuleClosedNodes29= ModuleClosedNodes3= ModuleClosedNodes30= -ModuleClosedNodes4=4 +ModuleClosedNodes4=4,36 ModuleClosedNodes5=3 ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,et_pCant_TextChanged,745,6,C_Cuestionario,agregaPregunta,60,0,C_Cliente,gest_Click,491,0,C_Cliente,cuest_preguntaContestada,1534,0,C_Principal,Class_Globals,0,0,C_Principal,val_Terminado,2708,0,C_Principal,checaPedido,2709,0,C_Principal,Subir_Click,550,0,C_Principal,JobDone,1708,0,C_Principal,B_OK_PAS_Click,2214,0,C_Productos,Class_Globals,0,0 +NavigationStack=C_Principal,B4XPage_CloseRequest,1969,0,C_Validador,buscaSinEnviar,68,0,C_Validador,mandaGuardados,105,6,C_Principal,Subir_Click,697,0,C_Validador,JobDone,257,0,Starter,tConexion_Tick,83,0,B4XMainPage,JobDone,459,0,C_Principal,B4XPage_Appear,546,0,C_Principal,connecta_LongClick,1975,0,C_Principal,b_muestraPendientes_Click,2683,0,C_Principal,b_abordo_Click,2679,0 SelectedBuild=0 VisibleModules=28,2,13,20,14,29,17,15,9,4