diff --git a/B4A/ADM.b4a b/B4A/ADM.b4a index b918c86..d92e6a4 100644 --- a/B4A/ADM.b4a +++ b/B4A/ADM.b4a @@ -1121,7 +1121,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: ADM #VersionCode: 1 - #VersionName: 5.08.29 + #VersionName: 5.08.31 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/ADM.b4a.meta b/B4A/ADM.b4a.meta index ad57f59..5fc3f40 100644 --- a/B4A/ADM.b4a.meta +++ b/B4A/ADM.b4a.meta @@ -75,7 +75,7 @@ ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17= ModuleClosedNodes18= -ModuleClosedNodes19=15,18,19,21,22 +ModuleClosedNodes19= ModuleClosedNodes2= ModuleClosedNodes20= ModuleClosedNodes21= @@ -84,7 +84,7 @@ ModuleClosedNodes23= ModuleClosedNodes24= ModuleClosedNodes25= ModuleClosedNodes26= -ModuleClosedNodes27=3,4,8,9,10,11,12,13,14,15,16,17,18,20,21,24,25,27,28 +ModuleClosedNodes27= ModuleClosedNodes28= ModuleClosedNodes29= ModuleClosedNodes3= @@ -93,10 +93,10 @@ ModuleClosedNodes31= ModuleClosedNodes32=15,16,17,18,19 ModuleClosedNodes4= ModuleClosedNodes5= -ModuleClosedNodes6=4,6,7,8,9,10,11,12,13,15,19,21 +ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Main,Process_Globals,20,0,B4XMainPage,Class_Globals,69,0,Diseñador Visual,principal.bal,-100,6,C_Principal,resdia_Click,2419,6,C_Principal,B4XPage_Created,316,0,Diseñador Visual,login.bal,-100,1,C_Principal,B4XPage_Appear,374,5,MAPA_RUTAS,Activity_Resume,197,0,CameraExClass,FindCamera,48,0,MAPA_RUTAS,MapFragment1_Ready,301,6 +NavigationStack=MAPA_RUTAS,MapFragment1_Ready,325,0,MAPA_RUTAS,Camera1_PictureTaken,621,0,MAPA_RUTAS,b_guardaNoVenta_Click,579,0,Diseñador Visual,mapa_rutas.bal,-100,2,C_TicketsDia,mandaPendientes,331,0,Diseñador Visual,ticketsdia.bal,-100,2,C_TicketsDia,b_guardaNoVenta_Click,288,0,B4XMainPage,Class_Globals,116,0,MAPA_RUTAS,p_guardarPeso_Click,527,0,MAPA_RUTAS,b_guardarPeso_Click,525,0,MAPA_RUTAS,Activity_KeyPress,505,0 SelectedBuild=0 -VisibleModules=30,2,14,5,6,19,31,27,18,21 +VisibleModules=30,2,14,5,6,19,31,27,18,11 diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 8a5c115..1007c77 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -4,10 +4,6 @@ ModulesStructureVersion=1 Type=Class Version=11.5 @EndOfDesignText@ -Sub MODS 'ignore - 'V3.04.10 - Se agregó código para el registro de abonos, en B4XMainPage se genera la tabla y aquí se agregó el panel p_abonos para ralizar el abono, y el codigo en el sub "mandaPendientes" para cambiar la bandera de enviado en el abono. -End Sub - Sub Class_Globals Private Root As B4XView 'ignore Private xui As XUI 'ignore @@ -845,7 +841,7 @@ Sub GuardaVenta2 ' LogColor($"actualizamos "${la_cuenta.text}, hora_final=${DateTime.now}"$,Colors.Red) Subs.actualizaTET(la_cuenta.text) DateTime.TimeFormat = "HH:mm:ss" - mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! + Subs.mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! mandapiezas B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize @@ -906,12 +902,12 @@ Sub GuardaVenta2 DateTime.TimeFormat = "HH:mm:ss" ' mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! ' mandapiezas - mandaPendientesrecarga - mandapiezasrecarga +' mandaPendientesrecarga +' mandapiezasrecarga B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize B4XPages.MainPage.promos.promosMap.Initialize - B4XPages.ShowPage("login") + B4XPages.ShowPage("principal") B4XPages.MainPage.recarga = "0" End If End Sub diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index d9c8b54..d9fc7b4 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -73,6 +73,7 @@ Sub Class_Globals Dim fotoCerrado As String = "" Private p_botonesCam As Panel Dim reqManager As DBRequestManager + Private p_clientesLista As Panel End Sub 'You can add more parameters here. @@ -114,6 +115,12 @@ End Sub Sub B4XPage_Appear l_baseodia.Text = "Clientes del día de visita" + p_clientes.Width = Root.Width : p_clientes.Height = Root.Height + p_clientes.Top = 0 : p_clientes.Left = 0 + Subs.centraPanel(p_clientesLista, p_clientes.Width) + p_clientesLista.Height = Root.Height * 0.65 + CustomListView1.AsView.Height = Root.Height * 0.6 + CustomListView1.Base_Resize(Root.Width, Root.Height * 0.6) CHECK = 0 busca.Text = "" entro ="2" @@ -186,7 +193,7 @@ Sub CreateListItem(nombre As String, direccion0 As String, cliente As String) As p.SetLayoutAnimated(0, 0, 0, 1, 220) ' p.LoadLayout("datoscliente") p.LoadLayout("datosclienteBotones") - p.Height= 100dip + p.Height = 90dip b_inicioVenta.Tag = cliente ' p.Width = clv_orden.GetBase.Width nombrecliente.Text = nombre @@ -654,7 +661,7 @@ Private Sub b_guardarPeso_Click ' b_inicioVenta.Enabled = True b_finVenta.Enabled = False B4XPages.MainPage.clientes.B4XPage_Appear - mandaPendientes + Subs.mandaPendientes End If End Sub @@ -718,7 +725,7 @@ Private Sub b_guardaNoVenta_Click p_guardarPeso.Visible = False p_transparenciaIniciaInicioFinVenta.Visible = False End If - mandaPendientes + Subs.mandaPendientes ' DateTime.DateFormat="yy-MM-dd HH:mm:ss" ' Dim fecha As String=DateTime.Date(DateTime.Now) @@ -888,37 +895,37 @@ Private Sub StopCamera End Sub Sub mandaPendientes -' PEDIDO_CLIENTE (Pendientes) - Log(">>>>>>> MANDA PENDIENTES") - Dim PCNoArts As String - Dim PCMonto As String - If Subs.traeUsuarioDeBD <> "KMTS1" Then - 'PESOS (Pendientes) - c = Starter.skmt.ExecQuery($"SELECT * FROM PESOS where PE_ENVIO_OK <> 1"$) - Log($"PESOS 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_pedido2_ADM" -' cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"),c.GetString("PE_CEDIS"),c.GetString("PE_IDALMACEN"),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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"),c.GetString("PE_TIPOPAGO"),c.GetString("PE_COMENTARIO")) -' 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}"$) -' 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),(?),(?),(?)) - - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insertPesos" -' Log(c.GetString("PE_IDALMACEN")&", "&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")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN) - cmd.Parameters = Array As Object(c.GetString("PE_IDALMACEN"),c.GetString("PE_RUTA"),c.GetString("PE_USUARIO"),c.GetString("PE_CLIENTE"),c.GetString("PE_PESO"),c.GetString("PE_FECHA"),c.GetString("PE_TIPO"),c.GetString("PE_COMENTARIO"),c.GetString("PE_FOTO_CERRADO")) -' Log($">>>> insertPesos= ${C.GetString("PE_IDALMACEN")},${c.GetString("PE_RUTA")},${C.GetString("PE_USUARIO")},${C.GetString("PE_CLIENTE")},${C.GetString("PE_PESO")}, ${C.GetString("PE_FECHA")}"$) - reqManager.ExecuteCommand(cmd , $"insertPesos_${c.GetString("PE_CLIENTE")}"$) - Next - End If - c.Close - End If +'' PEDIDO_CLIENTE (Pendientes) +' Log(">>>>>>> MANDA PENDIENTES") +' Dim PCNoArts As String +' Dim PCMonto As String +' If Subs.traeUsuarioDeBD <> "KMTS1" Then +' 'PESOS (Pendientes) +' c = Starter.skmt.ExecQuery($"SELECT * FROM PESOS where PE_ENVIO_OK <> 1"$) +' Log($"PESOS 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_pedido2_ADM" +'' cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"),c.GetString("PE_CEDIS"),c.GetString("PE_IDALMACEN"),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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"),c.GetString("PE_TIPOPAGO"),c.GetString("PE_COMENTARIO")) +'' 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}"$) +'' 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),(?),(?),(?)) +' +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insertPesos" +'' Log(c.GetString("PE_IDALMACEN")&", "&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")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN) +' cmd.Parameters = Array As Object(c.GetString("PE_IDALMACEN"),c.GetString("PE_RUTA"),c.GetString("PE_USUARIO"),c.GetString("PE_CLIENTE"),c.GetString("PE_PESO"),c.GetString("PE_FECHA"),c.GetString("PE_TIPO"),c.GetString("PE_COMENTARIO"),c.GetString("PE_FOTO_CERRADO")) +'' Log($">>>> insertPesos= ${C.GetString("PE_IDALMACEN")},${c.GetString("PE_RUTA")},${C.GetString("PE_USUARIO")},${C.GetString("PE_CLIENTE")},${C.GetString("PE_PESO")}, ${C.GetString("PE_FECHA")}"$) +' reqManager.ExecuteCommand(cmd , $"insertPesos_${c.GetString("PE_CLIENTE")}"$) +' Next +' End If +' c.Close +' End If End Sub diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 83fc35d..601fd90 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -2425,13 +2425,21 @@ Sub CARGA_Click End Sub Sub resdia_Click - + P_RESUMEN.Top = 0 : P_RESUMEN.Left = 0 + SCROLL_RESDIA.Top = 0 : SCROLL_RESDIA.Left = 0 + SCROLL_RESDIA.Height = Root.Height * 0.9 + SCROLL_RESDIA.Left = (Root.Width / 2) - (SCROLL_RESDIA.Width / 2) + p_transResumenDia.Top = 0 + p_transResumenDia.Left = 0 + p_transResumenDia.Width = Root.Width + p_transResumenDia.Height = Root.Height + p_transResumenDia.BringToFront Private totalPesoActual As String = 0 Private conVenta As String = 0 Private visitados As String = 0 Private totalAVisitar As String = 0 - Private utr As Cursor = Starter.skmt.ExecQuery($"select sum(pe_peso) as totalPesoActual, + Private utr As Cursor = Starter.skmt.ExecQuery($"select ifnull(sum(pe_peso),0) as totalPesoActual, (select count(pe_cliente) from pesos where pe_tipo = 'VENTA') as conVenta, (select count(distinct pe_cliente) from pesos) as visitados, (select count(cat_cl_codigo) from kmt_info) as totalAVisitar @@ -2848,15 +2856,19 @@ Private Sub iv_abordo_Click B4XPages.ShowPage("Productos") End Sub +' Revisa si hay pesos (venta) en la tabla "PESOS" y si hay, cambia "gestion" en "kmt_info" Sub checaPedido - Private c As Cursor = Starter.skmt.ExecQuery("SELECT PC_CLIENTE FROM PEDIDO_CLIENTE") +' Private c As Cursor = Starter.skmt.ExecQuery("SELECT PC_CLIENTE FROM PEDIDO_CLIENTE") + Private c As Cursor = Starter.skmt.ExecQuery("SELECT PE_CLIENTE FROM PESOS order by PE_FECHA") If c.RowCount > 0 Then - Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 2 WHERE CAT_CL_CODIGO IN (SELECT PC_CLIENTE FROM PEDIDO_CLIENTE)") - End If - Private c As Cursor = Starter.skmt.ExecQuery("SELECT NV_CLIENTE FROM NOVENTA") - If c.RowCount > 0 Then - Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 3 WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA)") +' Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 2 WHERE CAT_CL_CODIGO IN (SELECT PC_CLIENTE FROM PEDIDO_CLIENTE)") + Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 2 WHERE CAT_CL_CODIGO IN (SELECT PE_CLIENTE FROM PESOS where PE_TIPO = 'VENTA')") + Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 3 WHERE CAT_CL_CODIGO IN (SELECT PE_CLIENTE FROM PESOS where PE_TIPO = 'NO VENTA')") End If +' Private c As Cursor = Starter.skmt.ExecQuery("SELECT NV_CLIENTE FROM NOVENTA") +' If c.RowCount > 0 Then +' Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 3 WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA)") +' End If End Sub Private Sub p_transResumenDia_Click diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index 0d09c87..5c96e4b 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -71,23 +71,22 @@ Private Sub B4XPage_Created (Root1 As B4XView) If File.Exists(ruta, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If - c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE, PC_MONTO, PC_NOART FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") - - ListView1.Clear - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - Dim label1 As Label - label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 10 - label1.TextColor = Colors.Black - Dim label2 As Label - label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 13 - label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) - Next - End If +' c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE, PC_MONTO, PC_NOART FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") +' ListView1.Clear +' If c.RowCount>0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' Dim label1 As Label +' label1 = ListView1.TwoLinesLayout.Label +' label1.TextSize = 10 +' label1.TextColor = Colors.Black +' Dim label2 As Label +' label2 = ListView1.TwoLinesLayout.SecondLabel +' label2.TextSize = 13 +' label2.TextColor = Colors.Blue +' ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"SubTotal "& c.GetString("PC_MONTO") & " kgs.") +' Next +' End If p_transparenciaIniciaInicioFinVenta.top = 0 : p_transparenciaIniciaInicioFinVenta.Left = 0 p_transparenciaIniciaInicioFinVenta.Height = Root.Height : p_transparenciaIniciaInicioFinVenta.Width = Root.Width Subs.centraPanel(p_inicioFinVenta, Root.Width) @@ -100,11 +99,19 @@ End Sub Sub B4XPage_Appear nombre_boton = "NOVENTA" + p_transparenciaIniciaInicioFinVenta.Visible = False + p_ticketsdia.Height = Root.Height : p_ticketsdia.Width = Root.Width + p_ticketsdia.Top = 0 : p_ticketsdia.Left = 0 + ListView1.Left = (Root.Width / 2) - (ListView1.Width / 2) + ListView1.Width = Root.Width * 0.8 ' c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE, PC_MONTO, PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") c = B4XPages.MainPage.skmt.ExecQuery("select PE_CLIENTE as PC_CLIENTE, PE_PESO AS PC_MONTO, 1 as PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pe_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pe_cliente ) as NOMBRE FROM PESOS where PE_TIPO = 'VENTA' ORDER BY PE_FECHA asc") Dim noArticulos As Int = 0 fotoCerrado = "" ListView1.Clear + ListView1.Height = Root.Height * 0.8 + b_noventa0.Top = ListView1.Top + ListView1.Height + ListView1.TwoLinesLayout.ItemHeight = 90dip If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i @@ -118,12 +125,15 @@ Sub B4XPage_Appear Dim label1 As Label label1 = ListView1.TwoLinesLayout.Label label1.TextSize = 10 + label1.Visible = False label1.TextColor = Colors.Black Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 13 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& noArticulos & " SubTotal $"& c.GetString("PC_MONTO")) + label2.Height = 88dip + label2.Width = ListView1.Width - 10dip + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" SubTotal "& c.GetString("PC_MONTO") & " kgs.") Next End If c.Close @@ -149,6 +159,7 @@ End Sub Sub ListView1_ItemLongClick (Position As Int, Value As Object) Private cliente As String = Value + Log(Value) Starter.skmt.ExecNonQuery($"delete from cuentaa"$) Starter.skmt.ExecNonQuery($"insert into cuentaa (cuenta) values ('${cliente}')"$) Log($"insert into cuentaa (cuenta) values ('${cliente}')"$) @@ -202,7 +213,7 @@ End Sub Sub b_noventa0_Click If nombre_boton = "NOVENTA" Then nombre_boton = "VENTA" - b_noventa0.Text ="VENTA" + b_noventa0.Text ="Ir a Venta" ' c = B4XPages.MainPage.skmt.ExecQuery("select NV_CLIENTE,NV_MOTIVO,NV_COMM, (select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = NV_CLIENTE ) as NOMBRE FROM NOVENTA ORDER BY NV_CLIENTE asc") c = B4XPages.MainPage.skmt.ExecQuery("select PE_CLIENTE as NV_CLIENTE, PE_MOTIVO as NV_MOTIVO, PE_COMENTARIO as NV_COMM, (select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pe_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pe_cliente ) as NOMBRE FROM PESOS where PE_TIPO = 'NO VENTA' ORDER BY PE_FECHA asc") ListView1.Clear @@ -217,12 +228,12 @@ Sub b_noventa0_Click label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 10 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("NV_CLIENTE"),c.GetString("NOMBRE") &" Motivo #"& c.GetString("NV_MOTIVO")& " Comentario: "& c.GetString("NV_COMM")) + ListView1.AddTwoLines(c.GetString("NV_CLIENTE"),c.GetString("NOMBRE") &" Motivo: "& c.GetString("NV_MOTIVO")& " Comentario: "& c.GetString("NV_COMM")) Next End If Else nombre_boton = "NOVENTA" - b_noventa0.Text ="NO VENTA" + b_noventa0.Text ="Ir a No Venta" ' c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") c = B4XPages.MainPage.skmt.ExecQuery("select PE_CLIENTE as PC_CLIENTE, PE_PESO AS PC_MONTO, 1 as PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pe_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pe_cliente ) as NOMBRE FROM PESOS where PE_TIPO = 'VENTA' ORDER BY PE_FECHA asc") ListView1.Clear @@ -232,13 +243,13 @@ Sub b_noventa0_Click c.Position=i Dim label1 As Label label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 15 + label1.TextSize = 10 label1.TextColor = Colors.Black Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 10 + label2.TextSize = 13 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" SubTotal "& c.GetString("PC_MONTO") & " kgs.") Next End If c.Close @@ -281,6 +292,7 @@ Private Sub b_guardaNoVenta_Click p_guardarPeso.Visible = False p_transparenciaIniciaInicioFinVenta.Visible = False End If + Subs.mandaPendientes End Sub Private Sub b_cancelaNoVenta_Click @@ -302,7 +314,7 @@ Private Sub b_guardarPeso_Click ' b_inicioVenta.Enabled = True b_finVenta.Enabled = False B4XPages.MainPage.ticketsDia.B4XPage_Appear - mandaPendientes + Subs.mandaPendientes End If End Sub @@ -325,37 +337,37 @@ Private Sub et_guardarPeso_TextChanged (Old As String, New As String) End Sub Sub mandaPendientes -' PEDIDO_CLIENTE (Pendientes) - Log(">>>>>>> MANDA PENDIENTES") - Dim PCNoArts As String - Dim PCMonto As String - If Subs.traeUsuarioDeBD <> "KMTS1" Then - 'PESOS (Pendientes) - c = Starter.skmt.ExecQuery($"SELECT * FROM PESOS where PE_ENVIO_OK <> 1"$) - Log($"PESOS 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_pedido2_ADM" -' cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"),c.GetString("PE_CEDIS"),c.GetString("PE_IDALMACEN"),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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"),c.GetString("PE_TIPOPAGO"),c.GetString("PE_COMENTARIO")) -' 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}"$) -' 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),(?),(?),(?)) - - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insertPesos" -' Log(c.GetString("PE_IDALMACEN")&", "&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")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN) - cmd.Parameters = Array As Object(c.GetString("PE_IDALMACEN"),c.GetString("PE_RUTA"),c.GetString("PE_USUARIO"),c.GetString("PE_CLIENTE"),c.GetString("PE_PESO"),c.GetString("PE_FECHA"),c.GetString("PE_TIPO"),c.GetString("PE_COMENTARIO"),c.GetString("PE_FOTO_CERRADO")) -' Log($">>>> insertPesos= ${C.GetString("PE_IDALMACEN")},${c.GetString("PE_RUTA")},${C.GetString("PE_USUARIO")},${C.GetString("PE_CLIENTE")},${C.GetString("PE_PESO")}, ${C.GetString("PE_FECHA")}"$) - reqManager.ExecuteCommand(cmd , $"insertPesos_${c.GetString("PE_CLIENTE")}"$) - Next - End If - c.Close - End If +'' PEDIDO_CLIENTE (Pendientes) +' Log(">>>>>>> MANDA PENDIENTES") +' Dim PCNoArts As String +' Dim PCMonto As String +' If Subs.traeUsuarioDeBD <> "KMTS1" Then +' 'PESOS (Pendientes) +' c = Starter.skmt.ExecQuery($"SELECT * FROM PESOS where PE_ENVIO_OK <> 1"$) +' Log($"PESOS 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_pedido2_ADM" +'' cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"),c.GetString("PE_CEDIS"),c.GetString("PE_IDALMACEN"),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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"),c.GetString("PE_TIPOPAGO"),c.GetString("PE_COMENTARIO")) +'' 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}"$) +'' 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),(?),(?),(?)) +' +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insertPesos" +'' Log(c.GetString("PE_IDALMACEN")&", "&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")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN) +' cmd.Parameters = Array As Object(c.GetString("PE_IDALMACEN"),c.GetString("PE_RUTA"),c.GetString("PE_USUARIO"),c.GetString("PE_CLIENTE"),c.GetString("PE_PESO"),c.GetString("PE_FECHA"),c.GetString("PE_TIPO"),c.GetString("PE_COMENTARIO"),c.GetString("PE_FOTO_CERRADO")) +'' Log($">>>> insertPesos= ${C.GetString("PE_IDALMACEN")},${c.GetString("PE_RUTA")},${C.GetString("PE_USUARIO")},${C.GetString("PE_CLIENTE")},${C.GetString("PE_PESO")}, ${C.GetString("PE_FECHA")}"$) +' reqManager.ExecuteCommand(cmd , $"insertPesos_${c.GetString("PE_CLIENTE")}"$) +' Next +' End If +' c.Close +' End If End Sub Private Sub b_finVenta_Click diff --git a/B4A/Files/clientes.bal b/B4A/Files/clientes.bal index edfc177..8504015 100644 Binary files a/B4A/Files/clientes.bal and b/B4A/Files/clientes.bal differ diff --git a/B4A/Files/datosclientebotones.bal b/B4A/Files/datosclientebotones.bal index 73452a9..ad132f1 100644 Binary files a/B4A/Files/datosclientebotones.bal and b/B4A/Files/datosclientebotones.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 1a0dc12..3b2f0b5 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/ticketsdia.bal b/B4A/Files/ticketsdia.bal index 2eefcef..57b97ed 100644 Binary files a/B4A/Files/ticketsdia.bal and b/B4A/Files/ticketsdia.bal differ diff --git a/B4A/MAPA_RUTAS.bas b/B4A/MAPA_RUTAS.bas index ea095a5..b3862c2 100644 --- a/B4A/MAPA_RUTAS.bas +++ b/B4A/MAPA_RUTAS.bas @@ -529,6 +529,7 @@ Private Sub b_guardarPeso_Click gmap.Clear todos = 1 MapFragment1_Ready + Subs.mandaPendientes End Sub Private Sub p_guardarPeso_Click @@ -588,6 +589,7 @@ Private Sub b_guardaNoVenta_Click todos = 1 MapFragment1_Ready End If + Subs.mandaPendientes End Sub Private Sub b_cancelaNoVenta_Click diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 144bf9f..74cd551 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1650,4 +1650,38 @@ Sub nosQuedamosEnVenta As Boolean Return True End If Return False +End Sub + +Sub mandaPendientes + Log(">>>>>>> MANDA PENDIENTES <<<<<<<") +' Dim PCNoArts As String +' Dim PCMonto As String + Private c As Cursor + If traeUsuarioDeBD <> "KMTS1" Then + 'PESOS (Pendientes) + c = Starter.skmt.ExecQuery($"SELECT * FROM PESOS where PE_ENVIO_OK <> 1"$) + Log($"PESOS 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_pedido2_ADM" +' cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"),c.GetString("PE_CEDIS"),c.GetString("PE_IDALMACEN"),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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"),c.GetString("PE_TIPOPAGO"),c.GetString("PE_COMENTARIO")) +' 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}"$) +' 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),(?),(?),(?)) + + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insertPesos" +' Log(c.GetString("PE_IDALMACEN")&", "&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")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN) + cmd.Parameters = Array As Object(c.GetString("PE_IDALMACEN"),c.GetString("PE_RUTA"),c.GetString("PE_USUARIO"),c.GetString("PE_CLIENTE"),c.GetString("PE_PESO"),c.GetString("PE_FECHA"),c.GetString("PE_TIPO"),c.GetString("PE_COMENTARIO"),c.GetString("PE_FOTO_CERRADO")) +' Log($">>>> insertPesos= ${C.GetString("PE_IDALMACEN")},${c.GetString("PE_RUTA")},${C.GetString("PE_USUARIO")},${C.GetString("PE_CLIENTE")},${C.GetString("PE_PESO")}, ${C.GetString("PE_FECHA")}"$) + Starter.reqManager.ExecuteCommand(cmd , $"insertPesos_${c.GetString("PE_CLIENTE")}"$) + Next + End If + c.Close + End If End Sub \ No newline at end of file