diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index bf61075..16cc853 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -72,6 +72,8 @@ Sub Class_Globals Public checklist As C_Cheklist Public tabulador As C_tabulador Dim batt As Int + Dim monto_entregadoactual As String + Dim piezas_entregdas As String Dim porVisitar, entregas, rechazos, montoEntregado, montoRechazado As String Private p_appUpdate As Panel Private i_engrane As ImageView @@ -174,17 +176,23 @@ Private Sub B4XPage_Created (Root1 As B4XView) ' Starter.skmt.ExecNonQuery("DROP TABLE IF EXISTS PAGARES") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CHECADO_CHECK(CHECADO TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BLOCKENVIO(ENVIADO TEXT)") + Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_REPARTO_GEO(HIST_RG_MONTO TEXT, HIST_RG_CREDITO TEXT, HIST_RG_MONTO_CREDITO TEXT, HIST_RG_LAT TEXT, HIST_RG_LONG TEXT, HIST_RG_RECHAZO TEXT, HIST_RG_MOTIVO TEXT, HIST_RG_USUARIO_ENTREGO TEXT, HIST_RG_RUTA_REP TEXT, HIST_RG_ESTATUS_ENTREGA TEXT, HIST_RG_COMENTARIO_ENTREGA TEXT, HIST_RG_FORMA_PAGO TEXT, HIST_RG_GEOCERCA_MTS TEXT, HIST_RG_NO_ART TEXT, HIST_RG_CLIENTE TEXT, HIST_RG_FECHA TEXT, HIST_RG_ALMACEN TEXT, HIST_RG_RUTA_PRE TEXT)") + ' Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PAGARES(TMP_MONTO_PAGARE TEXT, TMP_CLIENTE TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CHECKLIST(USUARIO TEXT, PLACA TEXT, FECHA_CAPTURA TEXT, TARJETA_CIRCULACION TEXT , POLIZA_SEGURO TEXT, LICENCIA_CONDUCIR TEXT, LIMPIA_EXTERNA TEXT, LIMPIA_INTERNA TEXT, TRIANGULO TEXT, GATO TEXT, LLANTA_REFACCION TEXT, CARROCERIA_BUENESTADO TEXT, CARROCERIA_MALESTADO TEXT, CARROCERIA_COMENTARIOS TEXT, LUCES_CORRECTO TEXT, LUCES_INCORRECTO TEXT, LUCES_COMENTARIOS TEXT, CONDICION_PLACAS_CORRECTO TEXT, CONDICION_PLACAS_INCORRECTO TEXT, CONDICION_PLACAS_COMENTARIOS TEXT, CONDICION_LLANTAS_DEL_DER TEXT, CONDICION_LLANTAS_DEL_IZQ TEXT, CONDICION_LLANTAS_TRASERA_DER TEXT, CONDICION_LLANTAS_TRASERA_IZQ TEXT, ACEITE TEXT, ANTICONGELANTE TEXT, FRENOS TEXT, AIRE TEXT, FUGAS TEXT, COMETARIOS_FUGAS TEXT, FOTO1 BLOB, FOTO12 BLOB, FOTO3 BLOB, FOTO4 BLOB)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CHECKLIST2(USUARIO TEXT, PLACA TEXT, FECHA_CAPTURA TEXT, TARJETA_CIRCULACION TEXT, POLIZA_SEGURO TEXT, LICENCIA_CONDUCIR TEXT, LIMPIA_EXTERNA TEXT, LIMPIA_INTERNA TEXT, TRIANGULO TEXT, GATO TEXT, LLANTA_REFACCION TEXT, CARROCERIA TEXT, CARROCERIA_COMENTARIOS TEXT, LUCES TEXT, LUCES_COMENTARIOS TEXT, CONDICION_PLACAS TEXT, CONDICION_PLACAS_COMENTARIOS TEXT, CONDICION_LLANTAS_DEL_DER TEXT, CONDICION_LLANTAS_DEL_IZQ TEXT, CONDICION_LLANTAS_TRASERA_DER TEXT, CONDICION_LLANTAS_TRASERA_IZQ TEXT, ACEITE TEXT, ANTICONGELANTE TEXT, FRENOS TEXT, AIRE TEXT, FUGAS TEXT, COMETARIOS_FUGAS TEXT, FOTO1 BLOB, FOTO12 BLOB, FOTO3 BLOB, FOTO4 BLOB, KILIMETRAJE TEXT, RUTA TEXT)") Subs.agregaColumna("REPARTO", "REP_PRODREGISTRO", "TEXT") Subs.agregaColumna("NOVENTA", "NV_RUTA", "TEXT") + Subs.agregaColumna("ABONOS", "a_ticket", "TEXT") + Subs.agregaColumna("ABONOS", "a_tipoabono", "TEXT") + Subs.agregaColumna("PAGARES", "PA_CANCELADO", "TEXT") Subs.agregaColumna("ABONOSP", "NOMBRE", "TEXT") Subs.agregaColumna("kmt_info", "SECUENCIA", "INT") Subs.agregaColumna("kmt_info", "HORAENT", "TEXT") Subs.agregaColumna("REPARTO", "REP_PRODID", "TEXT") Subs.agregaColumna("PEDIDO", "PE_CLIENTEOR", "TEXT") + Subs.agregaColumna("PAGARES", "PA_TICKET", "TEXT") Subs.agregaColumna("PEDIDO", "PE_CAJAS", "TEXT") Subs.agregaColumna("PEDIDO", "PE_REGALO", "TEXT") Subs.agregaColumna("PEDIDO", "PE_BCAJAS", "TEXT") diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 6d8aaf9..7f3dccf 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -108,6 +108,12 @@ Sub Class_Globals Private b_confirmar As Button Dim NOTA As String Private p_qr As Panel + + Dim tipo_abonox As String + + Dim escreditoono As String + Dim m_lat, m_lon As String + Dim distance As Long End Sub 'You can add more parameters here. @@ -161,6 +167,7 @@ End Sub Sub B4XPage_Appear banderaimp = 0 + escreditoono = 0 Tipoentrega = "CONTADO" ' Subs.centraPanel(p_principal, Root.Width) Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) @@ -349,23 +356,68 @@ Sub B4XPage_Appear Else b_cancel_pagare.Visible = False End If + + CallSubDelayed(Tracker, "Track") + CallSubDelayed(Tracker, "StartFLPSmall") + If Tracker.FLP.IsInitialized And Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos. + B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude + B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude +' Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$) + GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation) + End If End Sub Sub Activity_Pause (UserClosed As Boolean) End Sub +'Sub GPS_LocationChanged (Location1 As Location) +'' lat_gps=Location1.ConvertToSeconds(Location1.Latitude) +'' lon_gps=Location1.ConvertToSeconds(Location1.Longitude) +' Dim sDate,sTime As String +' DateTime.DateFormat = "MM/dd/yyyy" +' sDate=DateTime.Date(DateTime.Now) +' sTime=DateTime.Time(DateTime.Now) +' Starter.skmt.ExecNonQuery("DELETE FROM HIST_GPS") +' Starter.skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) +'End Sub + Sub GPS_LocationChanged (Location1 As Location) -' lat_gps=Location1.ConvertToSeconds(Location1.Latitude) -' lon_gps=Location1.ConvertToSeconds(Location1.Longitude) +' LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red) + If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then + B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude + B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude + Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps) + End If + + If LATITUD.Length < 5 Then + + Else + + + Dim l1, l2 As Location + l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps) + Log($"Coordenadas de la tienda - lat:${LATITUD}, lon:${LONGITUD}"$) + l2.Initialize2(LATITUD, LONGITUD) + + + + 'now we need the distance between our location and the target location + distance = l1.DistanceTo(l2) 'the result is in meter + + Log("DISTANCIA "&distance) + End If + Dim sDate,sTime As String DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) Starter.skmt.ExecNonQuery("DELETE FROM HIST_GPS") Starter.skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) + CallSubDelayed(Tracker, "CreateLocationRequest") End Sub + Sub ListView1_ItemLongClick (Position As Int, Value As Object) End Sub @@ -408,12 +460,17 @@ Sub gest_Click End Sub Sub checacredito - Dim x1 As Cursor =Starter.skmt.ExecQuery("SELECT IFNULL(CAT_CL_LIMITECREDITO,0) AS CAT_CL_LIMITECREDITO FROM kmt_info where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - x1.Position = 0 - If CREDITO = 1 And x1.GetString("CAT_CL_LIMITECREDITO") <> 0 Then '''' se debe de cambiar a si acepta o no credito, aparte de tener la bandera a credito - Msgbox2Async("EL CLIENTE TIENE CREDITO DISPONIBLE, UNA VEZ SELECCIONADA UNA OPCION NO SE PODRA MODIFICAR!!!!!","Forma de pago","","Credito","Efectivo",LoadBitmap(File.DirAssets,"alert2.png"),False) - Wait For Msgbox_Result (Result As Int) - If Result= DialogResponse.POSITIVE Then + If l_total.Text = ".00" And L_CANT.Text = 1 Then + Guardado + Else + + + Dim x1 As Cursor =Starter.skmt.ExecQuery("SELECT IFNULL(CAT_CL_LIMITECREDITO,0) AS CAT_CL_LIMITECREDITO FROM kmt_info where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + x1.Position = 0 + If CREDITO = 1 And x1.GetString("CAT_CL_LIMITECREDITO") <> 0 Then '''' se debe de cambiar a si acepta o no credito, aparte de tener la bandera a credito + Msgbox2Async("EL CLIENTE TIENE CREDITO DISPONIBLE, UNA VEZ SELECCIONADA UNA OPCION NO SE PODRA MODIFICAR!!!!!","Forma de pago","","Credito","Efectivo",LoadBitmap(File.DirAssets,"alert2.png"),False) + Wait For Msgbox_Result (Result As Int) + If Result= DialogResponse.POSITIVE Then ' Log(1) ' p_credito.Visible = True ' 'monto @@ -422,84 +479,88 @@ Sub checacredito ' montopagare = c.GetString("MONTO") ' c.Close ' l_limite.Text = "Monto de la venta: $" & l_total.Text - Else If Result = DialogResponse.NEGATIVE Then - Log(2) - Tipoentrega = "CONTADO" - B_IMP_Click - banderaimp = 1 - Else If Result = DialogResponse.CANCEL Then - If l_total.Text.Replace(",","") <= NumberFormat2( x1.GetString("CAT_CL_LIMITECREDITO").Replace(",",""),0,2,2,False) Then - Private cliente As String = Subs.traeCliente - c = Starter.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where cat_cl_codigo = '${cliente}'"$) - If c.RowCount > 0 Then - c.Position = 0 - Private RUTA_PREVENTA = c.GetString("CAT_CL_RUTA") - End If - c = Starter.skmt.ExecQuery($"select distinct hvd_num_ticket from hist_ventas where hvd_cliente = '${cliente}'"$) - If c.RowCount > 0 Then - c.Position = 0 - NOTA = c.GetString("HVD_NUM_TICKET") - End If - DateTime.DateFormat = "MM/dd/yyyy" - sDate=DateTime.Date(DateTime.Now) - sTime=DateTime.Time(DateTime.Now) - ProgressDialogShow("Un momento por favor!!") - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insertaPagareGunaRep" - cmd.Parameters = Array As Object(Subs.traeAlmacen, RUTA_PREVENTA, Subs.traeRutaReparto, cliente, l_total.Text.Replace(",",""), NOTA, sDate & " " & sTime) - reqManager.ExecuteCommand(cmd, $"insertaPagare_${NOTA}"$) - Else - MsgboxAsync("El cliente debe de dar un pago de "& (l_total.Text.Replace(",","") - x1.GetString("CAT_CL_LIMITECREDITO")) &"","Atención") - Log(3) - Tipoentrega = "CREDITO" - DateTime.DateFormat = "dd/MM/yyyy" - DateTime.TimeFormat = "HH:mm:ss" - sDate=DateTime.Date(DateTime.Now) - sTime=DateTime.Time(DateTime.Now) - 'cliente - c=Starter.skmt.ExecQuery("select CUENTA from cuentaa") - c.Position = 0 - cuenta = c.GetString("CUENTA") - c.Close - 'usuario - c=Starter.skmt.ExecQuery("select usuario from usuarioa") - c.Position = 0 - usuario = c.GetString("USUARIO") - c.Close - 'Almacen - c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") - c.Position = 0 - almacen = c.GetString("ID_ALMACEN") - c.Close - 'FECHA PREVENTA - c=Starter.skmt.ExecQuery("select HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - c.Position = 0 - fechaprev = c.GetString("HVD_FECHA") - c.Close - 'RUTAPREVENTA - c=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - c.Position = 0 - rutaprev = c.GetString("CAT_CL_RUTA") - c.Close - 'RUTA rep - c=Starter.skmt.ExecQuery("select RUTAA from RUTAA") - c.Position = 0 - rutarep = c.GetString("RUTAA") - c.Close - 'monto - c=Starter.skmt.ExecQuery("select sum(HVD_COSTO_TOT) AS MONTO from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND HVD_RECHAZO = 0 AND HVD_PARCIAL = 0") - c.Position = 0 - montopagare = c.GetString("MONTO") - c.Close - Starter.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA_REP, PA_RUTAPREV, PA_FECHA_PREV, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?,?) ", Array As Object (almacen,rutarep,rutaprev,fechaprev,(sDate),l_total.Text,usuario,cuenta)) + Else If Result = DialogResponse.NEGATIVE Then + escreditoono = 0 + Log(2) + Tipoentrega = "CONTADO" B_IMP_Click banderaimp = 1 + Else If Result = DialogResponse.CANCEL Then + escreditoono = 1 + If l_total.Text.Replace(",","") <= NumberFormat2( x1.GetString("CAT_CL_LIMITECREDITO").Replace(",",""),0,2,2,False) Then + Private cliente As String = Subs.traeCliente + c = Starter.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where cat_cl_codigo = '${cliente}'"$) + If c.RowCount > 0 Then + c.Position = 0 + Private RUTA_PREVENTA = c.GetString("CAT_CL_RUTA") + End If + c = Starter.skmt.ExecQuery($"select distinct hvd_num_ticket from hist_ventas where hvd_cliente = '${cliente}'"$) + If c.RowCount > 0 Then + c.Position = 0 + NOTA = c.GetString("HVD_NUM_TICKET") + End If + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + ProgressDialogShow("Un momento por favor!!") + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insertaPagareGunaRep" + cmd.Parameters = Array As Object(Subs.traeAlmacen, RUTA_PREVENTA, Subs.traeRutaReparto, cliente, l_total.Text.Replace(",",""), NOTA, sDate & " " & sTime) + reqManager.ExecuteCommand(cmd, $"insertaPagare_${NOTA}"$) +' Else +' MsgboxAsync("El cliente debe de dar un pago de "& (l_total.Text.Replace(",","") - x1.GetString("CAT_CL_LIMITECREDITO")) &"","Atención") +' Log(3) +' Tipoentrega = "CREDITO" +' DateTime.DateFormat = "dd/MM/yyyy" +' DateTime.TimeFormat = "HH:mm:ss" +' sDate=DateTime.Date(DateTime.Now) +' sTime=DateTime.Time(DateTime.Now) +' 'cliente +' c=Starter.skmt.ExecQuery("select CUENTA from cuentaa") +' c.Position = 0 +' cuenta = c.GetString("CUENTA") +' c.Close +' 'usuario +' c=Starter.skmt.ExecQuery("select usuario from usuarioa") +' c.Position = 0 +' usuario = c.GetString("USUARIO") +' c.Close +' 'Almacen +' c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") +' c.Position = 0 +' almacen = c.GetString("ID_ALMACEN") +' c.Close +' 'FECHA PREVENTA +' c=Starter.skmt.ExecQuery("select HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") +' c.Position = 0 +' fechaprev = c.GetString("HVD_FECHA") +' c.Close +' 'RUTAPREVENTA +' c=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") +' c.Position = 0 +' rutaprev = c.GetString("CAT_CL_RUTA") +' c.Close +' 'RUTA rep +' c=Starter.skmt.ExecQuery("select RUTAA from RUTAA") +' c.Position = 0 +' rutarep = c.GetString("RUTAA") +' c.Close +' 'monto +' c=Starter.skmt.ExecQuery("select sum(HVD_COSTO_TOT) AS MONTO from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND HVD_RECHAZO = 0 AND HVD_PARCIAL = 0") +' c.Position = 0 +' montopagare = c.GetString("MONTO") +' c.Close +' Starter.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA_REP, PA_RUTAPREV, PA_FECHA_PREV, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?,?) ", Array As Object (almacen,rutarep,rutaprev,fechaprev,(sDate),l_total.Text,usuario,cuenta)) +' B_IMP_Click +' banderaimp = 1 + End If End If + Else + escreditoono = 0 + B_IMP_Click + banderaimp = 1 End If - Else - B_IMP_Click - banderaimp = 1 End If End Sub @@ -543,12 +604,20 @@ Sub esPagoACreditoGuardamosPagare c.Position = 0 montopagare = c.GetString("MONTO") c.Close - Starter.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA_REP, PA_RUTAPREV, PA_FECHA_PREV, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?,?) ", Array As Object (almacen,rutarep,rutaprev,fechaprev,(sDate),montopagare,usuario,cuenta)) + + c = Starter.skmt.ExecQuery($"select distinct hvd_num_ticket from hist_ventas where hvd_cliente = '${la_cuenta.Text}'"$) + If c.RowCount > 0 Then + c.Position = 0 + NOTA = c.GetString("HVD_NUM_TICKET") + End If + c.Close + Starter.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA_REP, PA_RUTAPREV, PA_FECHA_PREV, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE,PA_TICKET) VALUES(?,?,?,?,?,?,?,?,?) ", Array As Object (almacen,rutarep,rutaprev,fechaprev,(sDate),l_total.Text.Replace(",",""),usuario,cuenta,NOTA)) B_IMP_Click banderaimp = 1 End Sub Sub Guardado + Log(escreditoono) DateTime.DateFormat = "MM/dd/yyyy" DateTime.TimeFormat="HHmmss" sDate=DateTime.Date(DateTime.Now) @@ -587,6 +656,56 @@ Sub Guardado Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 2, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}' "$) Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_ESTATUS = 1 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") mandaPendientesreparto + + If escreditoono = "1" Then + + Dim g5 As Cursor = Starter.skmt.ExecQuery("SELECT SUM(HVD_COSTO_TOT) as HVD_COSTO_TOT FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + g5.Position = 0 + Dim totaltotal As String = NumberFormat2(g5.GetString("HVD_COSTO_TOT"),0,2,2,False) + g5.Close + LogColor(totaltotal,Colors.Red) + LogColor(l_total.Text.Replace(",",""),Colors.Red) + If totaltotal = l_total.Text.Replace(",","") Then + Dim entregatotaloparial As String = "ENTREGA TOTAL" + Else + Dim entregatotaloparial As String = "ENTREGA PARCIAL" + End If + + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "UPDATE_ACTUAL_GEO_GUNA_VN" +' cmd.Parameters = Array As String(l_total.Text,"1", l_total.Text,B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,"","",usuario,ruta,"ENTREGA", entregatotaloparial,"CREDITO", distance, L_CANT.text,la_cuenta.Text,fechaprev,almacen,Subs.traerUTAPREV) + cmd.Parameters = Array As String(l_total.Text.Replace(",",""),"1", l_total.Text.Replace(",",""),B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,"","",usuario,ruta,"ENTREGA", entregatotaloparial,"CREDITO", distance, L_CANT.text,la_cuenta.Text,fechaprev,almacen,Subs.traerUTAPREV) + reqManager.ExecuteCommand(cmd, "up_geo") + +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "UPDATE_ACTUAL_GEO_GUNA_VN" +' cmd.Parameters = Array As String(l_total.Text,"fue credito", "MONTO SI FUE A CREDITO",B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,"RECHAZO O NO",usuario,ruta,"entrega o rechazo", "parcial o total","efectivo o credito", "mts", L_CANT.text,la_cuenta.Text,fechaprev,almacen,rutaprev) +' reqManager.ExecuteCommand(cmd, "up_geo") + + Else + + Dim g5 As Cursor = Starter.skmt.ExecQuery("SELECT SUM(HVD_COSTO_TOT) as HVD_COSTO_TOT FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + g5.Position = 0 + Dim totaltotal As String = NumberFormat2(g5.GetString("HVD_COSTO_TOT"),0,2,2,False) + g5.Close + LogColor(totaltotal,Colors.Red) + LogColor(l_total.Text.Replace(",",""),Colors.Red) + If totaltotal = l_total.Text.Replace(",","") Then + Dim entregatotaloparial As String = "ENTREGA TOTAL" + Else + Dim entregatotaloparial As String = "ENTREGA PARCIAL" + End If + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "UPDATE_ACTUAL_GEO_GUNA_VN" + cmd.Parameters = Array As String(l_total.Text,"0", "",B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,"","",usuario,ruta,"ENTREGA", entregatotaloparial,"EFECTIVO", distance, L_CANT.text,la_cuenta.Text,fechaprev,almacen,Subs.traerUTAPREV) + reqManager.ExecuteCommand(cmd, "up_geo") + + End If + + Log("FECHA "& rutaprev) ' Dim mandamapa As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info WHERE gestion = 0 and CAT_CL_CODIGO <> 63403") ' If mandamapa.RowCount > 0 Then @@ -1205,6 +1324,7 @@ Private Sub p_credito_Click End Sub Private Sub b_cxc_Click + tipo_abonox = "cxc" h = Starter.skmt.ExecQuery("SELECT CUENTA from CUENTAA") h.Position = 0 Log(h.GetString("CUENTA")) @@ -1228,7 +1348,7 @@ Private Sub b_cxc_Click Log(total) Next d.Close - d = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ?", Array As String (f.GetString("CUENTA"))) + d = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ? and a_tipoabono is null", Array As String (f.GetString("CUENTA"))) If d.RowCount > 0 Then For i = 0 To d.RowCount - 1 d.Position = i @@ -1257,7 +1377,7 @@ Private Sub b_cxc_Click Log(total) Next d.Close - d = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ?", Array As String (f.GetString("CUENTA"))) + d = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ? and a_tipoabono is null", Array As String (f.GetString("CUENTA"))) If d.RowCount > 0 Then For i = 0 To d.RowCount - 1 d.Position = i @@ -1414,6 +1534,8 @@ Sub imprime_abonopagare telefono = c7.GetString("CAT_CL_TELEFONO") End If c7.Close + + Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) ' Printer1.WriteString(sucursal & CRLF) @@ -1428,23 +1550,56 @@ Sub imprime_abonopagare Printer1.WriteString(" " & CRLF) Dim notaabono As String Dim saldopendiente As Double - c = Starter.skmt.ExecQuery("SELECT NOTA, SUM(SALDO_PENDIENTE) AS SALDO_PENDIENTE FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - If c.RowCount > 0 Then - c.Position = 0 - notaabono = c.GetString("NOTA") - saldopendiente = c.GetString("SALDO_PENDIENTE") + + If tipo_abonox = "abono" Then + + + c = Starter.skmt.ExecQuery($"select distinct hvd_num_ticket from hist_ventas where hvd_cliente = '${la_cuenta.Text}'"$) + If c.RowCount > 0 Then + c.Position = 0 + notaabono = c.GetString("HVD_NUM_TICKET") + End If + c.Close + + c = Starter.skmt.ExecQuery($"select iFNULL(sum(PA_MONTO),0) AS SALDO_PENDIENTE from PAGARES where PA_CLIENTE = '${la_cuenta.Text}'"$) + If c.RowCount > 0 Then + c.Position = 0 + saldopendiente = c.GetString("SALDO_PENDIENTE") + Log(c.GetString("SALDO_PENDIENTE")) + End If + c.Close + + + Dim saldopendiente1 As Double = 0 + Dim c4 As Cursor= Starter.skmt.ExecQuery("SELECT Ifnull(SUM(a_abono),0) AS SALDO_PENDIENTE FROM ABONOS WHERE a_cliente IN (SELECT CUENTA FROM CUENTAA) and a_tipoabono is not null") + If c4.RowCount > 0 Then + c4.Position = 0 + Dim c5 As Cursor= Starter.skmt.ExecQuery("SELECT Ifnull(a_abono,0) AS SALDO_PENDIENTE FROM ABONOS WHERE a_cliente IN (SELECT CUENTA FROM CUENTAA) and a_tipoabono is not null") + saldopendiente1 = c4.GetString("SALDO_PENDIENTE") + End If + c4.Close + + Else If tipo_abonox = "cxc" Then + c = Starter.skmt.ExecQuery("SELECT NOTA, SUM(SALDO_PENDIENTE) AS SALDO_PENDIENTE FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + If c.RowCount > 0 Then + c.Position = 0 + notaabono = c.GetString("NOTA") + saldopendiente = c.GetString("SALDO_PENDIENTE") + End If + c.Close + + Dim saldopendiente1 As Double = 0 + Dim c4 As Cursor= Starter.skmt.ExecQuery("SELECT Ifnull(SUM(a_abono),0) AS SALDO_PENDIENTE FROM ABONOS WHERE a_cliente IN (SELECT CUENTA FROM CUENTAA) and a_tipoabono is null") + If c4.RowCount > 0 Then + c4.Position = 0 + Dim c5 As Cursor= Starter.skmt.ExecQuery("SELECT Ifnull(a_abono,0) AS SALDO_PENDIENTE FROM ABONOS WHERE a_cliente IN (SELECT CUENTA FROM CUENTAA) and a_tipoabono is null") + saldopendiente1 = c4.GetString("SALDO_PENDIENTE") + End If + c4.Close End If - c.Close - - Dim saldopendiente1 As Double = 0 - Dim c4 As Cursor= Starter.skmt.ExecQuery("SELECT Ifnull(SUM(a_abono),0) AS SALDO_PENDIENTE FROM ABONOS WHERE a_cliente IN (SELECT CUENTA FROM CUENTAA)") - If c4.RowCount > 0 Then - c4.Position = 0 - Dim c5 As Cursor= Starter.skmt.ExecQuery("SELECT Ifnull(a_abono,0) AS SALDO_PENDIENTE FROM ABONOS WHERE a_cliente IN (SELECT CUENTA FROM CUENTAA)") - saldopendiente1 = c4.GetString("SALDO_PENDIENTE") - End If - c4.Close - + + + ' c = Starter.skmt.ExecQuery("SELECT NOTA FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") ' If c.RowCount > 0 Then ' c.Position = 0 @@ -1479,175 +1634,146 @@ Sub imprime_abonopagare Sleep(1000) Printer1.DisConnect ProgressDialogHide - Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) - Wait For Msgbox_Result (resultado As Int) - If resultado = DialogResponse.POSITIVE Then - imprime_abonopagare - Else - h = Starter.skmt.ExecQuery("SELECT CUENTA from CUENTAA") - h.Position = 0 - Log(h.GetString("CUENTA")) - j = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ?", Array As String(h.GetString("CUENTA"))) - j.position = 0 - If j.RowCount = 0 Then - p_abono.Visible = False - Starter.skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) - ToastMessageShow("Abono guardado", False) - Dim rutaactualizar As String - Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If rut.RowCount > 0 Then - rut.Position = 0 - rutaactualizar = rut.GetString("CAT_CL_RUTA") - End If - Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 0, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) - Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) - Private c3 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO WHERE PE_CLIENTEOR IN (SELECT CUENTA FROM CUENTAA)") - If c3.RowCount = 0 Then - Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 0, HVD_RECHAZOCANT = 0, BCAJAS = BCAJAS_OR, CANTC = CANTC_OR WHERE HVD_cliente in (Select CUENTA from cuentaa)"$) - B4XPage_Appear - Else - MsgboxAsync("Hay productos que ya se vendieron, no se puede regresar la venta","Atención") - End If - Dim textedit As Double = et_abono.Text - Dim sumaresta As Double = saldopendiente-textedit-saldopendiente1 - Log(NumberFormat2(sumaresta,0,2,2,False)) - If NumberFormat2(sumaresta,0,2,2,False) <> "-.00" Then - If NumberFormat2(sumaresta,0,2,2,False) <> ".00" Then - Dim rutaactualizar As String - Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If rut.RowCount > 0 Then - rut.Position = 0 - rutaactualizar = rut.GetString("CAT_CL_RUTA") - End If - Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 3, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) - Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) - Starter.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON,NV_FOTO,NV_REPROGRAMAR) VALUES(?,?,?,?,?,?,?,?,?) ", Array As Object (la_cuenta.Text,sDate & sTime, usuario, "PAGO INCOMPLETO","PAGO INCOMPLETO", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,rutaactualizar,0)) - Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_RECHAZO = 1, HVD_RECHAZOCANT = HVD_CANT, HVD_RECHAZOCANTC = CANTC, BCAJAS = 0 , CANTC = 0 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 2, HVD_RECHAZOCANT = HVD_RECHAZOCANT WHERE HVD_PROID = HVD_CODPROMO and HVD_CLIENTE in (Select CUENTA from cuentaa)"$) - Starter.skmt.ExecNonQuery("DELETE FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") - d.Position = 0 - Dim ruta As String = d.GetString("RUTAA") - d.Close - d = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - d.Position = 0 - Dim rutapre As String = d.GetString("CAT_CL_RUTA") - d.Close - d = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - d.Position = 0 - Dim fechaprev As String = d.GetString("HVD_FECHA") - d.Close - d = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") - d.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO REPARTO_GEO (CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO,ENVIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String (cuenta, usuario, sDate &" "&sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,B4XPages.MainPage.almacen,ruta,rutapre,fechaprev, "PAGO INCOMPLETO", "PAGO INCOMPLETO","NO ENTREGADO")) - B4XPages.ShowPage("Principal") - End If - End If + + If tipo_abonox = "abono" Then + Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) + + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + imprime_abonopagare Else + p_abono.Visible = False + Starter.skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha,a_tipoabono) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}', 1)"$) + ToastMessageShow("Abono guardado", False) + End If + + Else If tipo_abonox = "cxc" Then + Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + imprime_abonopagare p_abono.Visible = False Starter.skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) ToastMessageShow("Abono guardado", False) - Dim rutaactualizar As String - Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If rut.RowCount > 0 Then - rut.Position = 0 - rutaactualizar = rut.GetString("CAT_CL_RUTA") - End If - Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 0, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) - Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) - Private c3 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO WHERE PE_CLIENTEOR IN (SELECT CUENTA FROM CUENTAA)") - If c3.RowCount = 0 Then - Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 0, HVD_RECHAZOCANT = 0, BCAJAS = BCAJAS_OR, CANTC = CANTC_OR WHERE HVD_cliente in (Select CUENTA from cuentaa)"$) - B4XPage_Appear - Else - MsgboxAsync("Hay productos que ya se vendieron, no se puede regresar la venta","Atención") - End If - Dim textedit As Double = et_abono.Text - Dim sumaresta As Double = saldopendiente-textedit-saldopendiente1 -' Log(NumberFormat2(sumaresta,0,2,2,False)) - If NumberFormat2(sumaresta,0,2,2,False) <> "-.00" Then - If NumberFormat2(sumaresta,0,2,2,False) <> ".00" Then - Dim rutaactualizar As String - Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If rut.RowCount > 0 Then - rut.Position = 0 - rutaactualizar = rut.GetString("CAT_CL_RUTA") - End If - Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 3, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) - Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) - Starter.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON,NV_FOTO,NV_REPROGRAMAR) VALUES(?,?,?,?,?,?,?,?,?) ", Array As Object (la_cuenta.Text,sDate & sTime, usuario, "PAGO INCOMPLETO","PAGO INCOMPLETO", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,rutaactualizar,0)) - Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_RECHAZO = 1, HVD_RECHAZOCANT = HVD_CANT, HVD_RECHAZOCANTC = CANTC, BCAJAS = 0 , CANTC = 0 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 2, HVD_RECHAZOCANT = HVD_RECHAZOCANT WHERE HVD_PROID = HVD_CODPROMO and HVD_CLIENTE in (Select CUENTA from cuentaa)"$) - Starter.skmt.ExecNonQuery("DELETE FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") - d.Position = 0 - Dim ruta As String = d.GetString("RUTAA") - d.Close - d = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - d.Position = 0 - Dim rutapre As String = d.GetString("CAT_CL_RUTA") - d.Close - d = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - d.Position = 0 - Dim fechaprev As String = d.GetString("HVD_FECHA") - d.Close - d = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") - d.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO REPARTO_GEO (CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO,ENVIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String (cuenta, usuario, sDate &" "&sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,B4XPages.MainPage.almacen,ruta,rutapre,fechaprev, "PAGO INCOMPLETO", "PAGO INCOMPLETO","NO ENTREGADO")) - B4XPages.ShowPage("Principal") + Else + + h = Starter.skmt.ExecQuery("SELECT CUENTA from CUENTAA") + h.Position = 0 + Log(h.GetString("CUENTA")) + j = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ?", Array As String(h.GetString("CUENTA"))) + j.position = 0 + If j.RowCount = 0 Then + p_abono.Visible = False + Starter.skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) + ToastMessageShow("Abono guardado", False) + Dim rutaactualizar As String + Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + If rut.RowCount > 0 Then + rut.Position = 0 + rutaactualizar = rut.GetString("CAT_CL_RUTA") End If + Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 0, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) + Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) + Private c3 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO WHERE PE_CLIENTEOR IN (SELECT CUENTA FROM CUENTAA)") + If c3.RowCount = 0 Then + Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 0, HVD_RECHAZOCANT = 0, BCAJAS = BCAJAS_OR, CANTC = CANTC_OR WHERE HVD_cliente in (Select CUENTA from cuentaa)"$) + B4XPage_Appear + Else + MsgboxAsync("Hay productos que ya se vendieron, no se puede regresar la venta","Atención") + End If + Dim textedit As Double = et_abono.Text + Dim sumaresta As Double = saldopendiente-textedit-saldopendiente1 + Log(NumberFormat2(sumaresta,0,2,2,False)) + If NumberFormat2(sumaresta,0,2,2,False) <> "-.00" Then + If NumberFormat2(sumaresta,0,2,2,False) <> ".00" Then + Dim rutaactualizar As String + Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + If rut.RowCount > 0 Then + rut.Position = 0 + rutaactualizar = rut.GetString("CAT_CL_RUTA") + End If + Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 3, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) + Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) + Starter.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON,NV_FOTO,NV_REPROGRAMAR) VALUES(?,?,?,?,?,?,?,?,?) ", Array As Object (la_cuenta.Text,sDate & sTime, usuario, "PAGO INCOMPLETO","PAGO INCOMPLETO", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,rutaactualizar,0)) + Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_RECHAZO = 1, HVD_RECHAZOCANT = HVD_CANT, HVD_RECHAZOCANTC = CANTC, BCAJAS = 0 , CANTC = 0 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 2, HVD_RECHAZOCANT = HVD_RECHAZOCANT WHERE HVD_PROID = HVD_CODPROMO and HVD_CLIENTE in (Select CUENTA from cuentaa)"$) + Starter.skmt.ExecNonQuery("DELETE FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") + d.Position = 0 + Dim ruta As String = d.GetString("RUTAA") + d.Close + d = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + d.Position = 0 + Dim rutapre As String = d.GetString("CAT_CL_RUTA") + d.Close + d = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + d.Position = 0 + Dim fechaprev As String = d.GetString("HVD_FECHA") + d.Close + d = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") + d.Position = 0 + Starter.skmt.ExecNonQuery2("INSERT INTO REPARTO_GEO (CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO,ENVIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String (cuenta, usuario, sDate &" "&sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,B4XPages.MainPage.almacen,ruta,rutapre,fechaprev, "PAGO INCOMPLETO", "PAGO INCOMPLETO","NO ENTREGADO")) + B4XPages.ShowPage("Principal") + End If + End If + Else + p_abono.Visible = False + Starter.skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) + ToastMessageShow("Abono guardado", False) + Dim rutaactualizar As String + Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + If rut.RowCount > 0 Then + rut.Position = 0 + rutaactualizar = rut.GetString("CAT_CL_RUTA") + End If + Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 0, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) + Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) + Private c3 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO WHERE PE_CLIENTEOR IN (SELECT CUENTA FROM CUENTAA)") + If c3.RowCount = 0 Then + Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 0, HVD_RECHAZOCANT = 0, BCAJAS = BCAJAS_OR, CANTC = CANTC_OR WHERE HVD_cliente in (Select CUENTA from cuentaa)"$) + B4XPage_Appear + Else + MsgboxAsync("Hay productos que ya se vendieron, no se puede regresar la venta","Atención") + End If + Dim textedit As Double = et_abono.Text + Dim sumaresta As Double = saldopendiente-textedit-saldopendiente1 +' Log(NumberFormat2(sumaresta,0,2,2,False)) + If NumberFormat2(sumaresta,0,2,2,False) <> "-.00" Then + If NumberFormat2(sumaresta,0,2,2,False) <> ".00" Then + Dim rutaactualizar As String + Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + If rut.RowCount > 0 Then + rut.Position = 0 + rutaactualizar = rut.GetString("CAT_CL_RUTA") + End If + Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 3, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) + Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) + Starter.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON,NV_FOTO,NV_REPROGRAMAR) VALUES(?,?,?,?,?,?,?,?,?) ", Array As Object (la_cuenta.Text,sDate & sTime, usuario, "PAGO INCOMPLETO","PAGO INCOMPLETO", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,rutaactualizar,0)) + Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_RECHAZO = 1, HVD_RECHAZOCANT = HVD_CANT, HVD_RECHAZOCANTC = CANTC, BCAJAS = 0 , CANTC = 0 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 2, HVD_RECHAZOCANT = HVD_RECHAZOCANT WHERE HVD_PROID = HVD_CODPROMO and HVD_CLIENTE in (Select CUENTA from cuentaa)"$) + Starter.skmt.ExecNonQuery("DELETE FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") + d.Position = 0 + Dim ruta As String = d.GetString("RUTAA") + d.Close + d = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + d.Position = 0 + Dim rutapre As String = d.GetString("CAT_CL_RUTA") + d.Close + d = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + d.Position = 0 + Dim fechaprev As String = d.GetString("HVD_FECHA") + d.Close + d = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") + d.Position = 0 + Starter.skmt.ExecNonQuery2("INSERT INTO REPARTO_GEO (CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO,ENVIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String (cuenta, usuario, sDate &" "&sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,B4XPages.MainPage.almacen,ruta,rutapre,fechaprev, "PAGO INCOMPLETO", "PAGO INCOMPLETO","NO ENTREGADO")) + B4XPages.ShowPage("Principal") + End If + End If + End If -' p_abono.Visible = False -' - '' skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) -' Starter.skmt.ExecNonQuery($"UPDATE ABONOS set a_abono = '${et_abono.text}' where a_usuario = '${Subs.traeUsuarioDeBD}' and a_ruta = '${Subs.traeRuta(Subs.traeCliente)}' and a_cliente In (select cuenta from cuentaa)"$) -' ToastMessageShow("Abono guardado", False) -' Dim rutaactualizar As String -' Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") -' If rut.RowCount > 0 Then -' rut.Position = 0 -' rutaactualizar = rut.GetString("CAT_CL_RUTA") -' End If -' Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 0, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) -' Starter.skmt.ExecNonQuery($"DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)"$) -' Private c3 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO WHERE PE_CLIENTEOR IN (SELECT CUENTA FROM CUENTAA)") -' If c3.RowCount = 0 Then -' Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 0, HVD_RECHAZOCANT = 0, BCAJAS = BCAJAS_OR, CANTC = CANTC_OR WHERE HVD_cliente in (Select CUENTA from cuentaa)"$) -' B4XPage_Appear -' Else -' MsgboxAsync("Hay productos que ya se vendieron, no se puede regresar la venta","Atención") -' End If -' If NumberFormat(saldopendiente-et_abono.Text,0,0) <> 0 Then -' -' Dim rutaactualizar As String -' Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") -' If rut.RowCount > 0 Then -' rut.Position = 0 -' rutaactualizar = rut.GetString("CAT_CL_RUTA") -' End If -' Starter.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON,NV_FOTO,NV_REPROGRAMAR) VALUES(?,?,?,?,?,?,?,?,?) ", Array As Object (la_cuenta.Text,sDate & sTime, usuario, "PAGO INCOMPLETO","PAGO INCOMPLETO", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,rutaactualizar,0)) -' Starter.skmt.ExecNonQuery($"UPDATE kmt_info set gestion = 3, HORAENT = '${sDate & " " & sTime}' where CAT_CL_CODIGO In (select cuenta from cuentaa) and CAT_CL_RUTA = '${rutaactualizar}'"$) -' Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_RECHAZO = 1, HVD_RECHAZOCANT = HVD_CANT, HVD_RECHAZOCANTC = CANTC, BCAJAS = 0 , CANTC = 0 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") -' Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 2, HVD_RECHAZOCANT = HVD_RECHAZOCANT WHERE HVD_PROID = HVD_CODPROMO and HVD_CLIENTE in (Select CUENTA from cuentaa)"$) -' Starter.skmt.ExecNonQuery("DELETE FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") -' d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") -' d.Position = 0 -' Dim ruta As String = d.GetString("RUTAA") -' d.Close -' d = Starter.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") -' d.Position = 0 -' Dim rutapre As String = d.GetString("CAT_CL_RUTA") -' d.Close -' d = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") -' d.Position = 0 -' Dim fechaprev As String = d.GetString("HVD_FECHA") -' d.Close -' d = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") -' d.Position = 0 -' Starter.skmt.ExecNonQuery2("INSERT INTO REPARTO_GEO (CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO,ENVIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String (cuenta, usuario, sDate &" "&sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,B4XPages.MainPage.almacen,ruta,rutapre,fechaprev, "PAGO INCOMPLETO", "PAGO INCOMPLETO","NO ENTREGADO")) -' B4XPages.ShowPage("Principal") -' End If End If + End If ' printer.Flush ' printer.Close @@ -1912,13 +2038,111 @@ Sub imprime_pagare End Sub Private Sub b_cancel_pagare_Click - Msgbox2Async($"¿Seguro que quieres cancelar el pagare con monto de $${l_total.Text} para este cliente?"$,"Atención", "Aceptar","Cancelar", "", Null, True) + tipo_abonox = "abono" + Msgbox2Async($"¿Que deseas realizar?"$,"Atención", "Cancelar pagare","", "Abono pagare", Null, True) Wait For Msgbox_Result (resultado As Int) If resultado = DialogResponse.POSITIVE Then - Starter.skmt.ExecNonQuery("update PAGARES SET PA_CANCELADO = 2 WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") - imprime_cancelarpagare - banderaimp = 1 + Msgbox2Async($"¿Seguro que quieres cancelar el pagare con monto de $${l_total.Text} para este cliente?"$,"Atención", "Aceptar","Cancelar", "", Null, True) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + Starter.skmt.ExecNonQuery("update PAGARES SET PA_CANCELADO = 2 WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + imprime_cancelarpagare + + d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") + d.Position = 0 + Dim ruta As String = d.GetString("RUTAA") + d.Close + + Dim g5 As Cursor = Starter.skmt.ExecQuery("SELECT SUM(HVD_COSTO_TOT) as HVD_COSTO_TOT FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + g5.Position = 0 + Dim totaltotal As String = g5.GetString("HVD_COSTO_TOT") + g5.Close + If totaltotal = l_total.Text.Replace(",","") Then + Dim entregatotaloparial As String = "ENTREGA TOTAL" + Else + Dim entregatotaloparial As String = "ENTREGA PARCIAL" + End If + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "UPDATE_ACTUAL_GEO_GUNA_VN" + cmd.Parameters = Array As String(l_total.Text,"0", "",B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,"",usuario,ruta,"ENTREGA", entregatotaloparial,"EFECTIVO", distance, L_CANT.text,la_cuenta.Text,fechaprev,almacen,rutaprev) + reqManager.ExecuteCommand(cmd, "up_geo") + banderaimp = 1 + End If + Else + + h = Starter.skmt.ExecQuery("SELECT CUENTA from CUENTAA") + h.Position = 0 + Log(h.GetString("CUENTA")) + j = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ? and a_tipoabono is null", Array As String(h.GetString("CUENTA"))) + j.position = 0 + Log(j.RowCount) + If j.RowCount = 0 Then + p_abono.Visible = True + et_abono.text = "" + Dim total As Double = 0 + f = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") + f.Position = 0 + d = Starter.skmt.ExecQuery2("SELECT distinct PA_TICKET, PA_MONTO FROM PAGARES WHERE PA_CLIENTE = ? AND PA_CANCELADO IS NULL", Array As String (f.GetString("CUENTA"))) + clv_abonos.Clear + For i = 0 To d.RowCount - 1 + d.Position = i + clv_abonos.Add(CreateListItem(d.GetString("PA_TICKET"),"$ " & d.GetString("PA_MONTO")),i) + + total = total + d.GetString("PA_MONTO") + Log(total) + Next + d.Close + d = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ? and a_tipoabono is not null ", Array As String (f.GetString("CUENTA"))) + If d.RowCount > 0 Then + For i = 0 To d.RowCount - 1 + d.Position = i + clv_abonos.Add(CreateListItem("ABONO","$ " & d.GetString("a_abono")),i) + total = total - d.GetString("a_abono") + Log(total) + Next + End If + l_montoabonostotal.Text = NumberFormat2(total,0,2,2,False) + d.Close + f.Close + Else If j.RowCount > 0 Then + p_abono.Visible = True + et_abono.text = "" + Dim total As Double = 0 + f = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") + f.Position = 0 + d = Starter.skmt.ExecQuery2("SELECT distinct PA_TICKET, PA_MONTO FROM PAGARES WHERE PA_CLIENTE = ? AND PA_CANCELADO IS NULL", Array As String (f.GetString("CUENTA"))) + clv_abonos.Clear + For i = 0 To d.RowCount - 1 + d.Position = i + clv_abonos.Add(CreateListItem(d.GetString("PA_TICKET"),"$ " & d.GetString("PA_MONTO")),i) + + total = total + d.GetString("PA_MONTO").Replace(",","") + Log(total) + Next + d.Close + d = Starter.skmt.ExecQuery2("SELECT a_abono FROM ABONOS WHERE a_cliente = ? and a_tipoabono is not null ", Array As String (f.GetString("CUENTA"))) + If d.RowCount > 0 Then + For i = 0 To d.RowCount - 1 + d.Position = i + clv_abonos.Add(CreateListItem("ABONO","$ " & d.GetString("a_abono")),i) + total = total - d.GetString("a_abono") + Log(total) + Next + End If + l_montoabonostotal.Text = NumberFormat2(total,0,2,2,False) + d.Close + f.Close +' MsgboxAsync("Este cliente ya tiene un pago capturado","Atención") + End If + h.Close + j.Close + End If + + + + End Sub Sub imprime_cancelarpagare @@ -2039,7 +2263,7 @@ End Sub Private Sub CrearQR(NOTA2 As String) ' Private texto As String = $"https://wa.me/5215637241894?text=PAGARE ${NOTA2}"$ 'Bow 2.0 G - Private texto As String = $"https://wa.me/5215611769317?text=PAGARE ${NOTA2}"$ 'Bow2024 + Private texto As String = $"https://wa.me/5215611769317?text=PAGARE_${NOTA2}"$ 'Bow2024 i_qr.Clear If texto.Length>0 Then i_qr.SetBitmap(qr.Create(texto)) diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index f1ebb3b..e560fcd 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -32,6 +32,15 @@ Sub Class_Globals Dim rutaGenerada As Boolean = False Dim rutaacambiar As String Dim mostrarProgressDialog As Boolean + Private nombrecliente As Label + Private numerocliente As Label + Private p_datosclie As Panel + Private CREDITO As Label + Private cxc As Label + Private direccion As Label + Dim d As Cursor + + Private CustomListView1 As CustomListView End Sub 'You can add more parameters here. @@ -74,6 +83,25 @@ Sub B4XPage_Appear ListView1.Top = lv1Top + 100 End If c=Starter.skmt.ExecQuery("select codigo, indice, CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_NOEXT from waypoints inner join kmt_info on waypoints.codigo = kmt_info.CAT_CL_CODIGO where gestion = 0 AND CAT_CL_RUTA <> 1000 order by indice") + + + + +' d = Starter.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info WHERE CAT_CL_CODIGO = '${c.GetString("CAT_CL_CODIGO")}'"$) +'' LogColor(d.RowCount,Colors.Blue) +' If d.RowCount > 0 Then +' d.Position = 0 +' If d.GetString("CAT_CL_BCREDITO") = "1" Then +' CREDITO.Visible = False +' Else +' CREDITO.Visible = False +' End If +' d.Close +' Else +' CREDITO.Visible = False +' End If + + If c.RowCount > 0 Then 'Ya hay waypoints en la base de datos c.Position = 0 ' Log("Ya hay waypoints.") @@ -90,7 +118,16 @@ Sub B4XPage_Appear ' t1 = Starter.waypointsOrdered.Get(k) ' c.GetString("codigo") ' Log(c.GetString("indice")) - ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + d = Starter.skmt.ExecQuery($"select CLIENTE FROM ABONOSP WHERE CLIENTE = '${c.GetString("codigo")}'"$) + If d.RowCount = 0 Then +' cxc.Visible = False + ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + Else +' cxc.Visible = False + ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")&" CXC").PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + + End If + Next Else generaListViewRutas @@ -190,7 +227,17 @@ Sub ListView1_ItemClick (Position As Int, Value As Object) m1 = distOrderedMap.Get(k) m1.Get("codigo") ' Log(m1.Get("nomDirDist")) - ListView1.AddTwoLines(m1.Get("codigo"), m1.Get("nomDirDist")) + + d = Starter.skmt.ExecQuery($"select CLIENTE FROM ABONOSP WHERE CLIENTE = '${m1.Get("codigo")}'"$) + If d.RowCount = 0 Then +' cxc.Visible = False + ListView1.AddTwoLines(m1.Get("codigo"), m1.Get("nomDirDist")) + Else +' cxc.Visible = False + ListView1.AddTwoLines(m1.Get("codigo")&" CXC", m1.Get("nomDirDist")) + End If + + Next End If c2.Close @@ -198,7 +245,9 @@ Sub ListView1_ItemClick (Position As Int, Value As Object) Else If entro = "3" Then ' LogColor("Guardamos CLIENTE " & Value, Colors.red) Starter.skmt.ExecNonQuery("delete from CUENTAA") - Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(Value)) + Dim sValue As String = Value + + Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(sValue.Replace(" CXC",""))) B4XPages.ShowPage("Cliente") End If End Sub @@ -249,6 +298,25 @@ End Sub Sub BUSCA_TextChanged (Old As String, New As String) q_buscar = "%" & busca.Text & "%" c2=Starter.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where CAT_CL_NOMBRE like ? and gestion = 0 AND CAT_CL_RUTA <> 1000 order by CAT_CL_CODIGO ", Array As String(q_buscar)) + + + +' d = Starter.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info WHERE CAT_CL_CODIGO = '${c2.GetString("CAT_CL_CODIGO")}'"$) +'' LogColor(d.RowCount,Colors.Blue) +' If d.RowCount > 0 Then +' d.Position = 0 +'' LogColor(d.GetString("CAT_CL_BCREDITO"),Colors.Blue) +' If d.GetString("CAT_CL_BCREDITO") = "1" Then +' CREDITO.Visible = False +' Else +' CREDITO.Visible = False +' End If +' d.Close +' Else +' CREDITO.Visible = False +' End If + + ListView1.Clear lfila.text = "Nombre y Calle" Subs.SetDivider(ListView1, Colors.Blue, 2) @@ -265,7 +333,19 @@ Sub BUSCA_TextChanged (Old As String, New As String) label2.TextSize = 20 label2.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD) label2.TextColor = Colors.White - ListView1.AddTwoLines(c2.GetString("CAT_CL_CODIGO"), c2.GetString("CAT_CL_NOMBRE") &" CALLE: "& c2.GetString("CAT_CL_CALLE")) + + d = Starter.skmt.ExecQuery($"select CLIENTE FROM ABONOSP WHERE CLIENTE = '${c2.GetString("CAT_CL_CODIGO")}'"$) + If d.RowCount = 0 Then +' cxc.Visible = False + ListView1.AddTwoLines(c2.GetString("CAT_CL_CODIGO")&"cxc", c2.GetString("CAT_CL_NOMBRE") &" CALLE: "& c2.GetString("CAT_CL_CALLE")) + Else +' cxc.Visible = False + ListView1.AddTwoLines(c2.GetString("CAT_CL_CODIGO")&" CXC", c2.GetString("CAT_CL_NOMBRE") &" CALLE: "& c2.GetString("CAT_CL_CALLE")) +' ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + + End If + + Next End If entro = "3" @@ -473,7 +553,18 @@ Sub traeRutaDia(aVisitar As B4XOrderedMap) c.Position=i cs.Initialize cs2.Initialize - ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + + d = Starter.skmt.ExecQuery($"select CLIENTE FROM ABONOSP WHERE CLIENTE = '${c.GetString("codigo")}'"$) + If d.RowCount = 0 Then +' cxc.Visible = False + ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + Else +' cxc.Visible = False + ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")&" CXC").PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + + End If + +' ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")&"cxc").PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) Next End If c.Close @@ -669,7 +760,18 @@ Sub caculaRutaGPS(coords As List, agregarActual As Boolean) c.Position = i cs.Initialize cs2.Initialize - ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + + d = Starter.skmt.ExecQuery($"select CLIENTE FROM ABONOSP WHERE CLIENTE = '${c.GetString("codigo")}'"$) + If d.RowCount = 0 Then +' cxc.Visible = False + ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) +' ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")).PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + Else +' cxc.Visible = False + ListView1.AddTwoLines(cs.Color(Colors.RGB(100,149,237)).Append(c.GetString("codigo")&" CXC").PopAll, cs2.append(c.GetString("CAT_CL_NOMBRE")).Color(Colors.RGB(100,149,237)).Append(" Calle: ").Pop.Append(c.GetString("CAT_CL_CALLE").Trim & " " & c.GetString("CAT_CL_NOEXT")).PopAll ) + + End If + ultimaLat = c.GetString("CAT_CL_LAT") 'Obtenemos las coordenadas de la ultima tienda. ultimaLon = c.GetString("CAT_CL_LONG") Next @@ -726,3 +828,19 @@ Sub todosAVisitar As List Log(aVisitar) Return aVisitar End Sub + + +Sub CreateListItem(mostrar As String, mostrar1 As String, mostrar2 As String) As Panel + Dim p As B4XView = xui.CreatePanel("") + p.SetLayoutAnimated(0, 0, 0, 1, 220) + p.LoadLayout("datoscliente") + p.Height= 60dip +' p.Width = clv_orden.GetBase.Width + nombrecliente.Text = mostrar + direccion.Text = mostrar1 + numerocliente.Text = mostrar2 + p_datosclie.Tag = mostrar2 +' cxc.Text = mostrar3 +' Log(p.Width) + Return p +End Sub \ No newline at end of file diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index 2d2a5e7..0a42d10 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -51,11 +51,50 @@ Sub B4XPage_Appear r_3.Checked = False r_4.Checked = False cb_reprogramar.Checked = False + + CallSubDelayed(Tracker, "Track") + CallSubDelayed(Tracker, "StartFLPSmall") + If Tracker.FLP.IsInitialized And Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos. + B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude + B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude +' Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$) + GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation) + End If End Sub Sub GPS_LocationChanged (Location1 As Location) -' lat_gps=Location1.ConvertToSeconds(Location1.Latitude) -' lon_gps=Location1.ConvertToSeconds(Location1.Longitude) +' LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red) + If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then + B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude + B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude + Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps) + End If + + If B4XPages.MainPage.cliente.LATITUD.Length < 5 Then + + Else + + + Dim l1, l2 As Location + l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps) + Log($"Coordenadas de la tienda - lat:${B4XPages.MainPage.cliente.LATITUD}, lon:${B4XPages.MainPage.cliente.LONGITUD}"$) + l2.Initialize2(B4XPages.MainPage.cliente.LATITUD, B4XPages.MainPage.cliente.LONGITUD) + + + + 'now we need the distance between our location and the target location + B4XPages.MainPage.cliente.distance = l1.DistanceTo(l2) 'the result is in meter + + Log("DISTANCIA "&B4XPages.MainPage.cliente.distance) + End If + + Dim sDate,sTime As String + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + Starter.skmt.ExecNonQuery("DELETE FROM HIST_GPS") + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) + CallSubDelayed(Tracker, "CreateLocationRequest") End Sub Sub CANCELA_Click @@ -146,6 +185,23 @@ Sub GUARDA_Click ' If mandamapa.RowCount > 0 Then ' StartActivity(MAPA_RUTAS) ' Else If mandamapa.RowCount = 0 Then + + Dim g5 As Cursor = Starter.skmt.ExecQuery("SELECT SUM(HVD_COSTO_TOT) AS HVD_COSTO_TOT, SUM(HVD_CANT) AS HVD_CANT FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + g5.Position = 0 + + + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "UPDATE_ACTUAL_GEO_GUNA_VN" + + +' cmd.Parameters = Array As String(l_total.Text,"0", "",B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,"","",usuario,ruta,"ENTREGA", entregatotaloparial,"EFECTIVO", distance, L_CANT.text,la_cuenta.Text,fechaprev,almacen,Subs.traerUTAPREV) + Log(g5.GetString("HVD_COSTO_TOT")) + Log(g5.GetString("HVD_CANT")) + + cmd.Parameters = Array As String(g5.GetString("HVD_COSTO_TOT"),"0", "",B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,1,motivo,usuario,ruta,"RECHAZO", "RECHAZO TOTAL","", B4XPages.MainPage.cliente.distance, g5.GetString("HVD_CANT"),cuenta,fechaprev,B4XPages.MainPage.almacen,Subs.traerUTAPREV) + reqManager.ExecuteCommand(cmd, "up_geo") + g5.Close B4XPages.ShowPage("Principal") ' End If Else diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 7cd1485..6c04346 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -97,6 +97,8 @@ Sub Class_Globals Private ListView2 As ListView Private Button1 As Button Private P_PAGARES As Panel + + Private l_montopagares As Label End Sub 'You can add more parameters here. @@ -168,6 +170,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + reqManager.Initialize(Me, B4XPages.MainPage.server) + p_principal.Width = Root.Width p_principal.Height = Root.Height *.80 Private c As Cursor = Starter.skmt.ExecQuery("SELECT * FROM NOVENTA") @@ -268,6 +272,7 @@ Sub B4XPage_Appear e.Close Else c=Starter.skmt.ExecQuery("select sum(hvd_costo_tot) as MONTO_DIA from hist_ventas where hvd_cliente in (select cat_cl_codigo from kmt_info ) AND HVD_ESTATUS = 1 ") + f1=Starter.skmt.ExecQuery("select sum(hvd_costo_tot) as MONTO_TOTAL_DIA from hist_ventas2 where hvd_cliente in (select cat_cl_codigo from kmt_info )") f1=Starter.skmt.ExecQuery("select sum(hvd_costo_tot) as MONTO_TOTAL_DIA from hist_ventas2 where hvd_cliente in (select cat_cl_codigo from kmt_info ) AND HVD_RECHAZO = 0") f2=Starter.skmt.ExecQuery("select sum(REP_COSTO_TOT) as MONTO_REC_DIA FROM REPARTO where REP_cliente in (Select cat_cl_codigo from kmt_info)") ' b=Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa where nv_cliente in (select cat_cl_codigo from kmt_info where gestion = 3)") @@ -378,7 +383,7 @@ Sub B4XPage_Appear Starter.skmt.ExecNonQuery($"insert into VENTAS(V_FECHA, V_CLIENTE, V_CLI_ORIG, V_PRODID, V_CANT, V_RECHAZO, V_PRECIO) select REP_FECHA, REP_CLIENTE, REP_CLI_ORIG, REP_PRODID, REP_CANT, REP_RECHAZO, REP_PRECIO from REPARTO where REP_CLIENTE = '${vc.GetString("REP_CLIENTE")}' and REP_CLI_ORIG = '${vc.GetString("REP_CLI_ORIG")}' and REP_PRODID = '${vc.GetString("REP_PRODID")}' and REP_RECHAZO = '0' and REP_CANT > 0"$) Next End If - Starter.ENVIA_ULTIMA_GPS + ' Log($"ENTREGADOS: ${Subs.traeEntregados}"$) ' Log($"RECHAZADOS: ${Subs.traeRechazados}"$) @@ -560,18 +565,108 @@ Sub B4XPage_Appear r5.Close l_rechazo.text = NumberFormat2((rescant + rescant2),0,2,2,False) L_MONTOE.Text = NumberFormat2((rescant3 + rescant4 + rescant5 + rescant6 + rescant7),0,2,2,False) + + + + Private r55 As Cursor = Starter.skmt.ExecQuery($"select HVD_COSTO_TOT, HVD_CANT from HIST_VENTAS where HVD_RECHAZO = '0' and BCAJAS = '0' AND HVD_CLIENTE IN (SELECT CAT_CL_CODIGO from kmt_info WHERE gestion = 2)"$) + Private rescant10 As Double + Private pztotal As Int + If r55.RowCount > 0 Then + For r75 = 0 To r55.RowCount -1 + r55.Position = r75 + rescant10 = rescant10 + r55.GetString("HVD_COSTO_TOT") + rescant10 = NumberFormat2(rescant10, 0, 2, 2, False) + pztotal = pztotal + r55.GetString("HVD_CANT") + Next + End If + Log(rescant10) + r55.Close + +' Private r5 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(HVD_COSTO_TOT),0) AS HVD_COSTO_TOT, HVD_CANT from HIST_VENTAS where HVD_RECHAZO = '0' and BCAJAS = '1' AND HVD_CLIENTE IN (SELECT CAT_CL_CODIGO from kmt_info WHERE gestion = 2) "$) +' Private pztotal1 As Int +' Private rescant11 As Double +' If r5.RowCount > 0 Then +' r5.Position = 0 +' rescant11 = r5.GetString("HVD_COSTO_TOT") +' pztotal1 = pztotal1 + r55.GetString("HVD_CANT") +' End If +' Log(rescant11) +' r5.Close + + Private r5 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_COSTO_TOT),0) AS PE_COSTO_TOT, IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO "$) + Private pztotal2 As Int + Private rescant11 As Double + If r5.RowCount > 0 Then + r5.Position = 0 + rescant11 = r5.GetString("PE_COSTO_TOT") + pztotal2 = pztotal2 + r5.GetString("PE_CANT") + End If + Log(rescant11) + r5.Close + '' + Private r5 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(HVD_COSTO_TOT,0) AS HVD_COSTO_TOT, IFNULL(HVD_CANT,0) AS HVD_CANT, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_PROID, HVD_CLIENTE, CONSECUTIVO from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '0' AND HVD_CLIENTE IN (SELECT CAT_CL_CODIGO from kmt_info WHERE gestion = 2) "$) + Private pztotal3 As Int + Private rescant12 As Double + If r5.RowCount > 0 Then + For j4 = 0 To r5.RowCount -1 + r5.Position = j4 + Private r6 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO where PE_CLIENTEOR = '${r5.GetString("HVD_CLIENTE")}' AND PE_PROID = '${r5.GetString("HVD_PROID")}' AND CONSECUTIVO = '${r5.GetString("CONSECUTIVO")}' "$) + r6.Position = 0 + LogColor(r5.GetString("HVD_COSTO_TOT")&" / "& r5.GetString("HVD_CANT")&" * "&r5.GetString("HVD_RECHAZOCANT")&" - "&r6.GetString("PE_CANT"),Colors.Blue) + LogColor(r6.GetString("PE_CANT"),Colors.Blue) + rescant12 = rescant12 + ((r5.GetString("HVD_COSTO_TOT")/(r5.GetString("HVD_CANT")))*(r5.GetString("HVD_CANT")- r5.GetString("HVD_RECHAZOCANT"))) + pztotal3 = pztotal3 + (r5.GetString("HVD_CANT")- r5.GetString("HVD_RECHAZOCANT")) + Log(rescant12) + r6.Close + Next + End If + If rescant12 = "NaN" Then rescant12 = 0 + LogColor(rescant12,Colors.Red) + r5.Close + +' Private r5 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(HVD_COSTO_TOT,0) AS HVD_COSTO_TOT, IFNULL(HVD_CANT,0) AS HVD_CANT,IFNULL(CANTC,0) AS CANTC, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_PROID, HVD_CLIENTE, CONSECUTIVO from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '1' AND HVD_CLIENTE IN (SELECT CAT_CL_CODIGO from kmt_info WHERE gestion = 2)"$) +' Private rescant7 As Double +' If r5.RowCount > 0 Then +' For j5 = 0 To r5.RowCount -1 +' r5.Position = j5 +' Private r6 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO where PE_CLIENTEOR = '${r5.GetString("HVD_CLIENTE")}' AND PE_PROID = '${r5.GetString("HVD_PROID")}' AND CONSECUTIVO = '${r5.GetString("CONSECUTIVO")}'"$) +' r6.Position = 0 +' ' Log(r6.GetString("PE_CANT")) +' rescant7 = rescant7 + ((r5.GetString("HVD_COSTO_TOT")/(r5.GetString("CANTC")))*((r5.GetString("HVD_CANT") - r5.GetString("HVD_RECHAZOCANT") )/Subs.traeConversion(r5.GetString("HVD_PROID")))) +' pztotal3 = pztotal3 + (r5.GetString("HVD_CANT")- r5.GetString("HVD_RECHAZOCANT")) +' r6.Close +' Next +' End If +' If rescant7 = "NaN" Then rescant7 = 0 +' Log(rescant7) +' r5.Close + + + l_rechazo.text = NumberFormat2((rescant + rescant2),0,2,2,False) + B4XPages.MainPage.piezas_entregdas = NumberFormat2((pztotal + pztotal2 + pztotal3 ),0,2,2,False) + B4XPages.MainPage.monto_entregadoactual= NumberFormat2((rescant10 + rescant11 + rescant12 ),0,2,2,False) +' +' B4XPages.MainPage.piezas_entregdas = "0" +' B4XPages.MainPage.monto_entregadoactual= "0" + + Dim g8 As Cursor = Starter.skmt.ExecQuery("SELECT IFNULL(SUM(HVD_COSTO_TOT),0) AS HVD_COSTO_TOT FROM HIST_VENTAS") + g8.Position = 0 + + B4XPages.MainPage.clientesVisitados = L_MONTOE.Text B4XPages.MainPage.clientesVenta = l_cuantosc.Text B4XPages.MainPage.clientesRechazo = l_cuantosn.Text B4XPages.MainPage.clientestotal = l_porvisitar.Text - B4XPages.MainPage.montoActual = Round2(l_montoSalida.Text - rechMap.Get("monto"), 2) +' B4XPages.MainPage.montoActual = Round2(l_montoSalida.Text - rechMap.Get("monto"), 2) + B4XPages.MainPage.montoActual = Round2(g8.GetString("HVD_COSTO_TOT"), 2) B4XPages.MainPage.porVisitar = l_ctast.text B4XPages.MainPage.entregas = l_cuantosc.text B4XPages.MainPage.rechazos = l_cuantosn.text B4XPages.MainPage.montoEntregado = L_MONTOE.text B4XPages.MainPage.montoRechazado = l_rechazo.text - reqManager.Initialize(Me, B4XPages.MainPage.server) + g8.Close ' LogColor($"ReqServer = ${B4XPages.MainPage.server}"$, Colors.red) + Starter.ENVIA_ULTIMA_GPS If l_ctast.Text = 0 And l_porvisitar.Text <> 0 Then Label9.Visible = True @@ -596,6 +691,7 @@ Sub B4XPage_Appear ' StartActivity(MAPA_RUTAS) ' End If ' checachek +'cuanto End Sub Sub checachek @@ -932,14 +1028,14 @@ Sub cargar_Click cmd.Initialize cmd.Name = "select_cliente_re_REPG_GUNA_VN" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") Log($"Pedimos kmt_datos"$) reqs.Add("kmt_datos") cmd.Initialize cmd.Name = "select_ventad2_re_REPG_GUNA_VN" - cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN) reqManager.ExecuteQuery(cmd , 0, "hist_datos") Log($"Pedimos hist_datos"$) reqs.Add("hist_datos") @@ -1535,6 +1631,8 @@ Private Sub B4XPage_CloseRequest As ResumableSub If Panel1.visible Then Log("PANEL1 VISIBLE") B_REGRESA_Click + Else If P_PAGARES.Visible Then + P_PAGARES.Visible = False Else If p_prod.Visible Then p_prod.Visible = False Else @@ -1977,32 +2075,49 @@ End Sub Private Sub B_PAGARES_Click P_PAGARES.Visible = True ListView2.Width = Root.Width - (Root.Width * .10) - ListView2.Height = Root.Height - (2 * (Button1.Height)) + ListView2.Height = Root.Height - (4 * (Button1.Height)) P_PAGARES.BringToFront P_PAGARES.Height = Root.Height P_PAGARES.Width = Root.Width ' Dim LABEL1 As Label ' LABEL1.TextSize = 20 ' LABEL1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD) + Private label1 As Label + + label1 = ListView2.TwoLinesAndBitmap.Label + label1.TextSize = 20 + label1.TextColor = Colors.White + label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD) + + label1.Height = 120dip Button1.Left = (P_PAGARES.Width - Button1.Width) / 2 Button1.Top = P_PAGARES.Height - Button1.Height Subs.centraListView(ListView2,Root.Width) Subs.SetDivider(ListView2, Colors.LightGray, 5) - Private c As Cursor = Starter.skmt.ExecQuery("select * from ABONOSP") + Private g5 As Cursor = Starter.skmt.ExecQuery("SELECT SUM(SALDO_PENDIENTE) as SALDO_PENDIENTE FROM ABONOSP") + If g5.RowCount > 0 Then + g5.Position = 0 + l_montopagares.Text = g5.GetString("SALDO_PENDIENTE") + Else + l_montopagares.Text = 0 + End If + g5.Close + + Private g6 As Cursor = Starter.skmt.ExecQuery("select NOTA,NOMBRE,SALDO_PENDIENTE from ABONOSP") ListView2.SingleLineLayout.Label.TextColor = Colors.White ListView2.Clear - If c.RowCount > 0 Then - For i = 0 To c.RowCount - 1 - c.Position = i + If g6.RowCount > 0 Then + For i = 0 To g6.RowCount - 1 + g6.Position = i Dim itemText As String - itemText = $"NOMBRE.: ${c.GetString("NOMBRE")} ${CRLF}FOLIO: ${(c.GetInt("NOTA"))}, MONTO: $ ${(c.GetInt("SALDO_PENDIENTE"))}"$ + itemText = $"NOMBRE.: ${g6.GetString("NOMBRE")} ${CRLF}FOLIO: ${(g6.GetString("NOTA"))}, MONTO: $ ${(NumberFormat2(g6.GetString("SALDO_PENDIENTE"),0,2,2,False))}"$ ListView2.AddSingleLine(itemText) Next Else ListView2.AddSingleLine("No hay datos disponibles.") End If - c.Close + g6.Close End Sub Private Sub Button1_Click @@ -2011,4 +2126,117 @@ End Sub Private Sub P_PAGARES_Click +End Sub + + +Sub cuanto + ''' RECHAZO - VENTA + Private r5 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(HVD_COSTO_TOT,0) AS HVD_COSTO_TOT, IFNULL(HVD_CANT,0) AS HVD_CANT, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_PROID, HVD_CLIENTE, CONSECUTIVO from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '0' ORDER BY HVD_PROID "$) + + Private rescant As String = 0 + If r5.RowCount > 0 Then + For j4 = 0 To r5.RowCount -1 + r5.Position = j4 + Private r6 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO where PE_CLIENTEOR = '${r5.GetString("HVD_CLIENTE")}' AND PE_PROID = '${r5.GetString("HVD_PROID")}' AND CONSECUTIVO = '${r5.GetString("CONSECUTIVO")}' "$) + Dim totalcantped As String + If r6.RowCount > 0 Then + r6.Position = 0 + totalcantped = r6.GetString("PE_CANT") + Else + totalcantped = 0 + End If + Log(r5.GetString("HVD_RECHAZOCANT") &" - "& totalcantped) + rescant = rescant + ((r5.GetString("HVD_COSTO_TOT")/(r5.GetString("HVD_CANT")))*((r5.GetString("HVD_RECHAZOCANT") - totalcantped))) +' Log(rescant) + r6.Close + Next + End If + If rescant = "NaN" Then rescant = 0 +' LogColor(rescant,Colors.Red) + r5.Close + + Private r5 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(HVD_COSTO_TOT,0) AS HVD_COSTO_TOT, IFNULL(HVD_CANT,0) AS HVD_CANT,IFNULL(CANTC,0) AS CANTC, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_PROID, HVD_CLIENTE, CONSECUTIVO from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '1' "$) +' Private r5 As Cursor = Starter.skmt.ExecQuery($"select * from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '1' "$) + + Private rescant2 As Double = 0 + If r5.RowCount > 0 Then + For j5 = 0 To r5.RowCount -1 + r5.Position = j5 + Private r6 As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO where PE_CLIENTEOR = '${r5.GetString("HVD_CLIENTE")}' AND PE_PROID = '${r5.GetString("HVD_PROID")}' AND CONSECUTIVO = '${r5.GetString("CONSECUTIVO")}'"$) + r6.Position = 0 +' Log(r6.GetString("PE_CANT")) + rescant2 = rescant2 + ((r5.GetString("HVD_COSTO_TOT")/(r5.GetString("CANTC")))*((r5.GetString("HVD_RECHAZOCANT") - r6.GetString("PE_CANT"))/Subs.traeConversion(r5.GetString("HVD_PROID")))) + rescant2 = NumberFormat2(rescant2, 0, 2, 2, False) + r6.Close + Next + End If + If rescant2 = "NaN" Then rescant2 = 0 + Log(rescant2) + r5.Close + '''FIN RECHAZO - VENTA + + '''RECHAZO + Private r5r As Cursor = Starter.skmt.ExecQuery($"select IFNULL(HVD_COSTO_TOT,0) AS HVD_COSTO_TOT, IFNULL(HVD_CANT,0) AS HVD_CANT, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_PROID, HVD_CLIENTE, CONSECUTIVO from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '0' "$) + Private rescantr As String = 0 + If r5r.RowCount > 0 Then + For j4r = 0 To r5r.RowCount -1 + r5r.Position = j4r + Private r6r As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO where PE_CLIENTEOR = '${r5r.GetString("HVD_CLIENTE")}' AND PE_PROID = '${r5r.GetString("HVD_PROID")}' AND CONSECUTIVO = '${r5r.GetString("CONSECUTIVO")}' "$) + r6r.Position = 0 +' LogColor(r5.GetString("HVD_COSTO_TOT")&" / "& r5.GetString("HVD_CANT")&" * "&r5.GetString("HVD_RECHAZOCANT")&" - "&r6.GetString("PE_CANT"),Colors.Blue) +' LogColor(r6.GetString("PE_CANT"),Colors.Blue) + rescantr = rescantr + ((r5r.GetString("HVD_COSTO_TOT")/(r5r.GetString("HVD_CANT")))*(r5r.GetString("HVD_RECHAZOCANT"))) + r6r.Close + Next + End If + If rescantr = "NaN" Then rescantr = 0 +' LogColor(rescant,Colors.Red) + r5r.Close + +' Log(rescantr) + + Private r5r As Cursor = Starter.skmt.ExecQuery($"select IFNULL(HVD_COSTO_TOT,0) AS HVD_COSTO_TOT, IFNULL(HVD_CANT,0) AS HVD_CANT,IFNULL(CANTC,0) AS CANTC, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_PROID, HVD_CLIENTE, CONSECUTIVO from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '1' "$) + +' Private r5 As Cursor = Starter.skmt.ExecQuery($"select * from HIST_VENTAS where HVD_RECHAZO = '1' and BCAJAS = '1' "$) + Private rescant2r As String = 0 + If r5r.RowCount > 0 Then + For j5r = 0 To r5r.RowCount -1 + r5r.Position = j5r + Private r6r As Cursor = Starter.skmt.ExecQuery($"select IFNULL(SUM(PE_CANT),0) AS PE_CANT from PEDIDO where PE_CLIENTEOR = '${r5r.GetString("HVD_CLIENTE")}' AND PE_PROID = '${r5r.GetString("HVD_PROID")}' AND CONSECUTIVO = '${r5r.GetString("CONSECUTIVO")}'"$) + r6r.Position = 0 +' Log(r6.GetString("PE_CANT")) + rescant2r = rescant2r + ((r5r.GetString("HVD_COSTO_TOT")/(r5r.GetString("CANTC")))*((r5r.GetString("HVD_RECHAZOCANT"))/Subs.traeConversion(r5r.GetString("HVD_PROID")))) + r6r.Close + Next + End If + If rescant2r = "NaN" Then rescant2r = 0 +' Log(rescant2) + r5r.Close + Log(rescant2r) + Log(rescant2r+rescantr) + + '''' FIN RECHAZO + + ''''' + + + +End Sub + +Private Sub ListView2_ItemClick (Position As Int, Value As Object) + Log(Value) + Dim compara As String = Value + Log(compara.Replace("NOMBRE.: ","")) + Dim compara1() As String = Regex.Split(CRLF,compara) + Log(compara1(0)) + Log(compara1(0).Replace("NOMBRE.: ","")) + Dim g7 As Cursor = Starter.skmt.ExecQuery2("SELECT CAT_CL_CODIGO from kmt_info WHERE CAT_CL_NOMBRE = ?", Array As String (compara1(0).Replace("NOMBRE.: ","").Trim)) + If g7.RowCount > 0 Then + g7.Position = 0 + Starter.skmt.ExecNonQuery("delete from CUENTAA") + + Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(g7.GetString("CAT_CL_CODIGO"))) + P_PAGARES.Visible = False + B4XPages.ShowPage("Cliente") + End If End Sub \ No newline at end of file diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 4229e4c..a515567 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/clientes.bal b/B4A/Files/clientes.bal index 1ad4ed7..562c5fa 100644 Binary files a/B4A/Files/clientes.bal and b/B4A/Files/clientes.bal differ diff --git a/B4A/Files/datoscliente.bal b/B4A/Files/datoscliente.bal new file mode 100644 index 0000000..81e7a6e Binary files /dev/null and b/B4A/Files/datoscliente.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 1f34acf..f53d9d2 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 31e0e43..1156149 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -122,10 +122,11 @@ Sub ENVIA_ULTIMA_GPS Dim cmd As DBCommand cmd.Initialize cmd.Name = "UPDATE_ACTUAL_GPS_GUNA_VN" - cmd.Parameters = Array As Object(B4XPages.MainPage.clientesvisitados, B4XPages.MainPage.clientestotal, B4XPages.MainPage.clientesventa, B4XPages.MainPage.montoRechazado, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.batt, B4XPages.MainPage.montoEntregado, B4XPages.MainPage.montoRechazado,B4XPages.MainPage.clientestotal, B4XPages.MainPage.porVisitar, B4XPages.MainPage.entregas, B4XPages.MainPage.rechazos, B4XPages.MainPage.ALMACEN, B4XPages.MainPage.rutapreventa ) - If B4XPages.MainPage.logger Then Log($"montoActual: ${B4XPages.MainPage.montoActual}, cTotal: ${B4XPages.MainPage.clientestotal}, cVenta: ${B4XPages.MainPage.clientesventa}, cVisitados: ${B4XPages.MainPage.clientesvisitados}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}, Batt: ${B4XPages.MainPage.batt}, montoRechazado: ${B4XPages.MainPage.montoRechazado}, montoEntregado: ${B4XPages.MainPage.montoEntregado}, porVisitar: ${B4XPages.MainPage.porVisitar}, entregas: ${B4XPages.MainPage.entregas}, rechazos: ${B4XPages.MainPage.rechazos}, Almacen: ${B4XPages.MainPage.ALMACEN}, Ruta: ${B4XPages.MainPage.rutapreventa}"$) - - reqManager.ExecuteCommand(cmd, "inst_visitas") +' cmd.Parameters = Array As Object(B4XPages.MainPage.clientesvisitados, B4XPages.MainPage.clientestotal, B4XPages.MainPage.clientesventa, B4XPages.MainPage.montoRechazado, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.batt, B4XPages.MainPage.montoEntregado, B4XPages.MainPage.montoRechazado,B4XPages.MainPage.clientestotal, B4XPages.MainPage.porVisitar, B4XPages.MainPage.entregas, B4XPages.MainPage.rechazos, B4XPages.MainPage.ALMACEN, B4XPages.MainPage.rutapreventa ) + cmd.Parameters = Array As String(B4XPages.MainPage.montoActual,B4XPages.MainPage.montoRechazado,B4XPages.MainPage.monto_entregadoactual,B4XPages.MainPage.piezas_entregdas, B4XPages.MainPage.clientestotal,B4XPages.MainPage.entregas, B4XPages.MainPage.rechazos, (B4XPages.MainPage.rechazos + B4XPages.MainPage.entregas), B4XPages.MainPage.porVisitar, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.batt,Application.VersionName,B4XPages.MainPage.ALMACEN, B4XPages.MainPage.rutapreventa) + Log(B4XPages.MainPage.montoActual) +' If B4XPages.MainPage.logger Then Log($"montoActual: ${B4XPages.MainPage.montoActual}, cTotal: ${B4XPages.MainPage.clientestotal}, cVenta: ${B4XPages.MainPage.clientesventa}, cVisitados: ${B4XPages.MainPage.clientesvisitados}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}, Batt: ${B4XPages.MainPage.batt}, montoRechazado: ${B4XPages.MainPage.montoRechazado}, montoEntregado: ${B4XPages.MainPage.montoEntregado}, porVisitar: ${B4XPages.MainPage.porVisitar}, entregas: ${B4XPages.MainPage.entregas}, rechazos: ${B4XPages.MainPage.rechazos}, Almacen: ${B4XPages.MainPage.ALMACEN}, Ruta: ${B4XPages.MainPage.rutapreventa}"$) + reqManager.ExecuteCommand(cmd, "up_geolocalizacion") skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ? WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso")) 'Reiniciamos el timer para cuando llamamos el Sub desde otra actividad diff --git a/B4A/Tracker.bas b/B4A/Tracker.bas index 2da03c5..c4042e3 100644 --- a/B4A/Tracker.bas +++ b/B4A/Tracker.bas @@ -34,7 +34,7 @@ Version=10.2 Sub Process_Globals Private nid As Int = 1 - dim Tracking As Boolean + Dim Tracking As Boolean Private lock As PhoneWakeState 'Para FusedLocationProvider (2 lineas) Public FLP As FusedLocationProvider @@ -45,6 +45,32 @@ Sub Process_Globals Dim trackerActividad, pushServiceActividad As String End Sub +Public Sub StartFLPSmall +' Log("StartFLPSmall - flpStarted="&flpStarted) + Do While FLP.IsConnected = False + Sleep(500) + Log("sleeping") + Loop + dameUltimaUbicacionConocida 'Regresamos ultima ubicacion conocida + FLP.RequestLocationUpdates(CreateLocationRequestSmallD) 'Buscamos ubicacion 2 peticiones +' Log("Buscamos ubicacion Small displacement") +' Log("GPSSmallestDisplacement = " & actualLR.GetSmallestDisplacement) +End Sub + +Private Sub CreateLocationRequestSmallD As LocationRequest +' Log("Iniciamos CreateLocationRequestSmallD") + Dim lr As LocationRequest + lr.Initialize + lr.SetInterval(2000) 'Intervalo deseado para actualizaciones de ubicacion + lr.SetFastestInterval(lr.GetInterval / 2) 'Intervalo minimo para actualizaciones de ubicacion + lr.setNumUpdates(2) 'Solicitamos solo 2 actualizaciones con estos parametros + lr.SetSmallestDisplacement(1) 'Solo registra cambio de ubicacion si es mayor a XX mts + lr.SetPriority(lr.Priority.PRIORITY_HIGH_ACCURACY) + actualLR=lr + Return lr +End Sub + + Sub Service_Create Service.AutomaticForegroundMode = Service.AUTOMATIC_FOREGROUND_NEVER 'we are handling it ourselves UUGCoords.Initialize diff --git a/B4A/guna_reparto.b4a b/B4A/guna_reparto.b4a index 842d1d9..0977a12 100644 --- a/B4A/guna_reparto.b4a +++ b/B4A/guna_reparto.b4a @@ -6,90 +6,91 @@ File12=clientes.bal File13=Clientes_visitados.jpg File14=Clientes_VISITADOS.png File15=contrasena.png -File16=dbc.png -File17=derecha.png -File18=derecha1.png -File19=detalle_promo.bal +File16=datoscliente.bal +File17=dbc.png +File18=derecha.png +File19=derecha1.png File2=alert2.png -File20=detalleVenta.bal -File21=DULCE.png -File22=durakelo1.png -File23=engrane.jpg -File24=engrane1.png -File25=folioabono.bal -File26=fondo_kmt.jpg -File27=foto.bal -File28=frintal.png -File29=frontal1.gif +File20=detalle_promo.bal +File21=detalleVenta.bal +File22=DULCE.png +File23=durakelo1.png +File24=engrane.jpg +File25=engrane1.png +File26=folioabono.bal +File27=fondo_kmt.jpg +File28=foto.bal +File29=frintal.png File3=alerta.jpg -File30=frontal1.png -File31=guardagestion.bal -File32=guna_viejo.png -File33=guna_viejo2.png -File34=historico.bal -File35=infonavit1.jpg -File36=intmex_logo_192x192.jpg -File37=intmex_logo_192x192.png -File38=itembuttonblue.png -File39=izquierda.png +File30=frontal1.gif +File31=frontal1.png +File32=guardagestion.bal +File33=guna_viejo.png +File34=guna_viejo2.png +File35=historico.bal +File36=infonavit1.jpg +File37=intmex_logo_192x192.jpg +File38=intmex_logo_192x192.png +File39=itembuttonblue.png File4=atras.png -File40=izquierda1.png -File41=kelloggs.png -File42=keymon_logo.png -File43=kmt.db -File44=kmt2.db -File45=kmt3.db -File46=login.bal -File47=logo sanfer.jpg -File48=logo_exitus1.jpg -File49=logo_mariana.jpg +File40=izquierda.png +File41=izquierda1.png +File42=kelloggs.png +File43=keymon_logo.png +File44=kmt.db +File45=kmt2.db +File46=kmt3.db +File47=login.bal +File48=logo sanfer.jpg +File49=logo_exitus1.jpg File5=atras1.png -File50=logo-guna-18.jpg -File51=logo-guna-18.png -File52=logo-guna-blanco.png -File53=logo-guna-contorno.png -File54=MainPage.bal -File55=malo.jpg -File56=mapa.bal -File57=mapa_cliente.bal -File58=mapa_rutas.bal -File59=mariana.jpg +File50=logo_mariana.jpg +File51=logo-guna-18.jpg +File52=logo-guna-18.png +File53=logo-guna-blanco.png +File54=logo-guna-contorno.png +File55=MainPage.bal +File56=malo.jpg +File57=mapa.bal +File58=mapa_cliente.bal +File59=mapa_rutas.bal File6=buscar.bal -File60=mariana_logo_192x192.jpg -File61=MARQUEZ_logo_192x192.jpg -File62=no_venta.bal -File63=nuevocliente.bal -File64=panel_pick_ciego.bal -File65=pedido.bal -File66=planfia_logo.png -File67=planfia_logo_old.png -File68=planfia_logo_old2.png -File69=principal.bal +File60=mariana.jpg +File61=mariana_logo_192x192.jpg +File62=MARQUEZ_logo_192x192.jpg +File63=no_venta.bal +File64=nuevocliente.bal +File65=panel_pick_ciego.bal +File66=pedido.bal +File67=planfia_logo.png +File68=planfia_logo_old.png +File69=planfia_logo_old2.png File7=CALIFICARCLIENTE.png -File70=proditem.bal -File71=proditem2.bal -File72=productos.bal -File73=profina.jpg -File74=PROFINA.png -File75=rechazos.jpg -File76=RECHAZOS.png -File77=rechazosblanco.png -File78=sync.png -File79=tabulador.bal +File70=principal.bal +File71=proditem.bal +File72=proditem2.bal +File73=productos.bal +File74=profina.jpg +File75=PROFINA.png +File76=rechazos.jpg +File77=RECHAZOS.png +File78=rechazosblanco.png +File79=sync.png File8=check.bal -File80=Tabulador.jpg -File81=TABULADOR.png -File82=tabuladorblanco.png -File83=telefonos.bal -File84=ubicacionblanco.png -File85=Ubicar_clientes.jpg -File86=UBICARCLIENTE.png -File87=usuario.png -File88=vecteezy_abstract-color-polygon-background-design-abstract-geometric_22231666.jpg -File89=visitaazul.png +File80=tabulador.bal +File81=Tabulador.jpg +File82=TABULADOR.png +File83=tabuladorblanco.png +File84=telefonos.bal +File85=ubicacionblanco.png +File86=Ubicar_clientes.jpg +File87=UBICARCLIENTE.png +File88=usuario.png +File89=vecteezy_abstract-color-polygon-background-design-abstract-geometric_22231666.jpg File9=checklist.bal -File90=visitaazul1.png -File91=visitadosblanco.png +File90=visitaazul.png +File91=visitaazul1.png +File92=visitadosblanco.png FileGroup1=Default Group FileGroup10=Default Group FileGroup11=Default Group @@ -181,6 +182,7 @@ FileGroup89=Default Group FileGroup9=Default Group FileGroup90=Default Group FileGroup91=Default Group +FileGroup92=Default Group Group=Default Group Library1=appupdating Library10=googlemaps @@ -241,7 +243,7 @@ Module6=C_Cliente Module7=C_Clientes Module8=C_Detalle_Promo Module9=C_DetalleVenta -NumberOfFiles=91 +NumberOfFiles=92 NumberOfLibraries=27 NumberOfModules=31 Version=12.8 @@ -249,7 +251,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Reparto #VersionCode: 1 - #VersionName: 5.03.08 + #VersionName: 5.03.09 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/guna_reparto.b4a.meta b/B4A/guna_reparto.b4a.meta index 17ed592..fc9ff20 100644 --- a/B4A/guna_reparto.b4a.meta +++ b/B4A/guna_reparto.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_DetalleVenta,Class_Globals,0,0,C_DetalleVenta,B_IMP_Click,1262,0,C_Clientes,B4XPage_Appear,73,0,C_Clientes,Class_Globals,0,0,C_Clientes,caculaRutaGPS,647,0,C_Cliente,CrearQR,2042,0,C_Cliente,Class_Globals,3,0,Subs,CreateBitmapWithNumber,1079,0,Subs,traeConversion,719,0,Subs,InstallAPK,528,0,B4XMainPage,p_appUpdate_Click,1010,0 +NavigationStack=C_Cliente,B4XPage_Created,128,0,Diseñador Visual,principal.bal,-100,6,C_Principal,B4XPage_Created,165,0,Starter,ENVIA_ULTIMA_GPS,120,3,C_Cliente,Class_Globals,107,0,C_Cliente,Guardado,671,6,B4XMainPage,Class_Globals,47,0,C_Principal,ListView2_ItemClick,2225,6,C_Principal,cuanto,2207,0,C_Principal,B4XPage_Appear,677,6 SelectedBuild=0 VisibleModules=2,4,5,6,7,9,30,29,16,27