diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 3303ddc..37ef329 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -175,7 +175,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA_CLIENTE (HEC_CLIENTE TEXT, HEC_MODULO TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA_AVISO_GIRO (HEAV_CLIENTE TEXT, HEAV_MODULO TEXT, HEAV_AVISO TEXT, HEAV_GIRO TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT, HE_LAT TEXT, HE_LON TEXT)") - skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS kmt_info2(CAT_CL_FOTO BLOB, CAT_CL_NUM_SERIEFISICO TEXT, CAT_CL_MTOCOMPRA TEXT, CAT_CL_CEDIS TEXT, CAT_CL_LAT TEXT, CAT_CL_LONG TEXT, CAT_CL_FBAJA TEXT, CAT_CL_FALTA TEXT, CAT_CL_CP TEXT, CAT_CL_EDO TEXT, CAT_CL_MUNI TEXT, CAT_CL_COLONIA TEXT, CAT_CL_CALLE2 TEXT, CAT_CL_CALLE1 TEXT, CAT_CL_NOINT TEXT, CAT_CL_NOEXT TEXT, CAT_CL_CALLE TEXT, CAT_CL_EMAIL TEXT, CAT_CL_TELEFONO TEXT, CAT_CL_ATIENTE2 TEXT, CAT_CL_ATIENDE1 TEXT, CAT_CL_NOMBRE TEXT, CAT_CL_GIRO TEXT, CAT_CL_DIAS_VISITA TEXT, CAT_CL_TIPO_RUTA TEXT, CAT_CL_RUTA TEXT, CAT_CL_CODIGO TEXT, gestion NUMERIC)") + skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS kmt_info3(CAT_CL_FOTO BLOB, CAT_CL_NUM_SERIEFISICO TEXT, CAT_CL_MTOCOMPRA TEXT, CAT_CL_CEDIS TEXT, CAT_CL_LAT TEXT, CAT_CL_LONG TEXT, CAT_CL_FBAJA TEXT, CAT_CL_FALTA TEXT, CAT_CL_CP TEXT, CAT_CL_EDO TEXT, CAT_CL_MUNI TEXT, CAT_CL_COLONIA TEXT, CAT_CL_CALLE2 TEXT, CAT_CL_CALLE1 TEXT, CAT_CL_NOINT TEXT, CAT_CL_NOEXT TEXT, CAT_CL_CALLE TEXT, CAT_CL_EMAIL TEXT, CAT_CL_TELEFONO TEXT, CAT_CL_ATIENTE2 TEXT, CAT_CL_ATIENDE1 TEXT, CAT_CL_NOMBRE TEXT, CAT_CL_GIRO TEXT, CAT_CL_DIAS_VISITA TEXT, CAT_CL_TIPO_RUTA TEXT, CAT_CL_RUTA TEXT, CAT_CL_CODIGO TEXT, gestion NUMERIC)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO2265(H_IDCLIENTE TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO3054(H_IDCLIENTE TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO3055(H_IDCLIENTE TEXT)") @@ -188,7 +188,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("PEDIDO", "PE_RECALCULO", "TEXT") Subs.agregaColumna("PEDIDO", "PE_RECALCULOTOT", "TEXT") Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "TEXT") - Subs.agregaColumna("kmt_info2", "encuesta", "TEXT") + Subs.agregaColumna("kmt_info3", "encuesta", "TEXT") Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna "P10" en la tabla c=skmt.ExecQuery("SELECT COUNT(*) AS fCol FROM pragma_table_info('ENCUESTA_MODULO3') WHERE name='P10'") c.Position = 0 @@ -610,7 +610,7 @@ Sub JobDone(Job As HttpJob) B4XSwitch2.Value = True skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(1)) et_codigo.Text = "" - Private c2 As Cursor = skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") + Private c2 As Cursor = skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info3 where CAT_CL_RUTA not in (select * from ruta_suplencia)") c2.Position = 0 Private rutades As String = c2.GetString("CAT_CL_RUTA") c2.Close @@ -913,7 +913,7 @@ End Sub Private Sub b_aceptar_Click If et_codigo.Text <> "" Then - Private c2 As Cursor = skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") + Private c2 As Cursor = skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info3 where CAT_CL_RUTA not in (select * from ruta_suplencia)") c2.Position = 0 Private rutades As String = c2.GetString("CAT_CL_RUTA") c2.Close diff --git a/B4A/C_Bitacora.bas b/B4A/C_Bitacora.bas index 0b4ae55..6eb3dfe 100644 --- a/B4A/C_Bitacora.bas +++ b/B4A/C_Bitacora.bas @@ -86,7 +86,7 @@ End Sub 'Regresa el nombre del cliente del id dado. Sub traeNombreCliente(id As String) As String - Private c As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_NOMBRE from kmt_info2 where CAT_CL_CODIGO = '${id}'"$) + Private c As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_NOMBRE from kmt_info3 where CAT_CL_CODIGO = '${id}'"$) Private n As String = "N/A" Do While c.NextRow n = c.GetString("CAT_CL_NOMBRE") @@ -100,7 +100,7 @@ Sub traeRutasSup As String Dim rutas As String rutas = "" - c = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info2") + c = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info3") If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 5a0c22f..7ce5e51 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -461,7 +461,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If skmt.Initialize(ruta,"kmt.db", True) - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") s=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") s.Position=0 If c.RowCount>0 Then @@ -504,6 +504,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) l_version.Left = Root.Width - (l_version.Width + 10) cuest.Initialize(Me, "cuest", Root, B4XPages.MainPage.skmt) bitacora.Initialize("bitacora", "bitacora", Root, B4XPages.MainPage.skmt, reqManager) + l_version.Left = Root.Width - l_version.Width ' bitacora.cargamosPanel End Sub @@ -917,7 +918,7 @@ Sub B4XPage_Appear Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null")) ' LogColor(s3.RowCount,Colors.Yellow) If s3.RowCount > 0 Then - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") s=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null")) s.Position=0 Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null")) @@ -964,7 +965,7 @@ Sub B4XPage_Appear c.Close s.Close Else If s3.RowCount = 0 Then - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") s=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") s.Position=0 If c.RowCount > 0 Then @@ -1036,6 +1037,13 @@ Sub B4XPage_Appear If la_cuenta.Text.trim = "0" Then gest.Text = "Carga Abordo" ' Log($"ALMACEN: ${ALMACEN}${CRLF}RUTA:${LA_RUTA}"$) Log(Subs.traeRuta) + If Subs.hayPedido Then + B_IMP.Enabled = True + b_enviarTicket.Enabled = True + Else + B_IMP.Enabled = False + b_enviarTicket.Enabled = False + End If End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -1267,7 +1275,7 @@ Private Sub b_geopass_Click m_lat = B4XPages.MainPage.lat_gps m_lon = B4XPages.MainPage.lon_gps GPS_LocationChanged(Starter.ubicacionActual) - skmt.ExecNonQuery($"update kmt_info2 set CAT_CL_LAT = '${B4XPages.MainPage.lat_gps}', CAT_CL_LONG = '${B4XPages.MainPage.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) + skmt.ExecNonQuery($"update kmt_info3 set CAT_CL_LAT = '${B4XPages.MainPage.lat_gps}', CAT_CL_LONG = '${B4XPages.MainPage.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) et_geopass.Text = "" Else Dim cmd As DBCommand @@ -1284,7 +1292,7 @@ Private Sub b_geopass_Click ' LATITUD = Starter.lat_gps ' LONGITUD = Starter.lon_gps ' GPS_LocationChanged(Starter.ubicacionActual) -' Starter.skmt.ExecNonQuery($b_geopass"update kmt_info2 set CAT_CL_LAT = '${Starter.lat_gps}', CAT_CL_LONG = '${Starter.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) +' Starter.skmt.ExecNonQuery($b_geopass"update kmt_info3 set CAT_CL_LAT = '${Starter.lat_gps}', CAT_CL_LONG = '${Starter.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) End Sub Private Sub LA_GEO_LongClick @@ -1320,7 +1328,7 @@ Sub JobDone(Job As HttpJob) m_lat = B4XPages.MainPage.lat_gps m_lon = B4XPages.MainPage.lon_gps GPS_LocationChanged(Starter.ubicacionActual) - skmt.ExecNonQuery($"update kmt_info2 set CAT_CL_LAT = '${B4XPages.MainPage.lat_gps}', CAT_CL_LONG = '${B4XPages.MainPage.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) + skmt.ExecNonQuery($"update kmt_info3 set CAT_CL_LAT = '${B4XPages.MainPage.lat_gps}', CAT_CL_LONG = '${B4XPages.MainPage.lon_gps}' where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) Dim cmd As DBCommand cmd.Initialize cmd.Name = "delete_geoPass_GUNA" @@ -1403,7 +1411,7 @@ End Sub Sub gest_Click If B_IMP.Visible = True Then If Not(Subs.revisaImpreso) Then - c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info2 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info3 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") c.Position = 0 If c.GetString("encuesta") = "0" Then Dim Intent1 As Intent @@ -1413,13 +1421,13 @@ Sub gest_Click Try Starter.encuesta = 1 Dim cmd As DBCommand - skmt.ExecNonQuery2("UPDATE kmt_info2 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) + skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) StartActivity(Intent1) compra Catch Starter.encuesta = 0 Dim cmd As DBCommand - skmt.ExecNonQuery2("UPDATE kmt_info2 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2)) + skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2)) ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True) compra End Try @@ -1434,7 +1442,7 @@ Sub gest_Click p_transparenteTicketImpreso.Visible = True End If Else - c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info2 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info3 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") c.Position = 0 If c.GetString("encuesta") = "0" Then Dim Intent1 As Intent @@ -1444,13 +1452,13 @@ Sub gest_Click Try Starter.encuesta = 1 Dim cmd As DBCommand - skmt.ExecNonQuery2("UPDATE kmt_info2 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) + skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) StartActivity(Intent1) compra Catch Starter.encuesta = 0 Dim cmd As DBCommand - skmt.ExecNonQuery2("UPDATE kmt_info2 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2)) + skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2)) ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True) compra End Try @@ -1646,7 +1654,7 @@ Private Sub cb_pregunta_SelectedIndexChanged (Index As Int) End Sub Private Sub b_preguntag_Click - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info2 SET CAT_CL_GIRO = ? WHERE CAT_CL_CODIGO = ? And CAT_CL_NOMBRE = ?", Array As Object (girotienda, la_cuenta.text,La_nombre.Text)) + B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info3 SET CAT_CL_GIRO = ? WHERE CAT_CL_CODIGO = ? And CAT_CL_NOMBRE = ?", Array As Object (girotienda, la_cuenta.text,La_nombre.Text)) skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA_AVISO_GIRO(HEAV_CLIENTE , HEAV_MODULO , HEAV_AVISO ,HEAV_GIRO ) VALUES (?,?,?,?) ", Array As Object( clie_id, ENCUESTA, "ACEPTA",girotienda)) If girotienda <> "Selecciona una opcion" Then If girotienda = "Tienda de Abarrotes (Abarrotes, Misceláneas, Minisupers, Particulares con Venta y Cremerías)" Then @@ -2253,9 +2261,9 @@ Sub Guardar_Click B4XPages.MainPage.skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),NumberFormat2(suma,0,2,2,False), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("delete from TICKET_IMPRESO where idCliente In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery($"insert into TICKET_IMPRESO (idCliente) values ('${Subs.traeCliente}')"$) + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("delete from TICKET_IMPRESO where idCliente In (select cuenta from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery($"insert into TICKET_IMPRESO (idCliente) values ('${Subs.traeCliente}')"$) End If c.Close DateTime.TimeFormat = "HHmmss" @@ -2314,7 +2322,7 @@ Sub sc_result(atype As String,Values As String, image As Bitmap) 'Log("Type : " & atype) 'Log("Value : " & Values) CODIGO = Values - DD=B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM kmt_info2 WHERE CAT_CL_NUM_SERIEFISICO = ?", Array As String(CODIGO)) + DD=B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM kmt_info3 WHERE CAT_CL_NUM_SERIEFISICO = ?", Array As String(CODIGO)) DD.Position =0 If DD.GetString("CUANTOS") > 0 Then MsgboxAsync("Código ya asignado", "AVISO") @@ -2323,7 +2331,7 @@ Sub sc_result(atype As String,Values As String, image As Bitmap) Msgbox2Async("El código "& CODIGO & " es correcto?" , "Title", "Yes", "Cancel", "No", Null, False) Wait For Msgbox_Result (resultado As Int) If resultado = DialogResponse.POSITIVE Then - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info2 set CAT_CL_NUM_SERIEFISICO = ?, CAT_CL_LONG = ?, CAT_CL_LAT =? where CAT_CL_CODIGO In (select cuenta from cuentaa)", Array As Object(CODIGO, B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) + B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info3 set CAT_CL_NUM_SERIEFISICO = ?, CAT_CL_LONG = ?, CAT_CL_LAT =? where CAT_CL_CODIGO In (select cuenta from cuentaa)", Array As Object(CODIGO, B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) L_QR.TEXT =CODIGO L_QR.TextColor = Colors.Blue B4XPages.MainPage.skmt.ExecNonQuery2("insert into HIST_CODIGO_BARRAS(CODIGOKMTS, CODIGOB, LAT, LON) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text,CODIGO, B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) @@ -2409,7 +2417,8 @@ Sub B_IMP_Click Else Impresion End If - + B4XPages.MainPage.skmt.ExecNonQuery("delete from TICKET_IMPRESO where idCliente In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery($"insert into TICKET_IMPRESO (idCliente) values ('${Subs.traeCliente}')"$) End Sub Sub Impresion2 @@ -3005,7 +3014,7 @@ Sub B_GPS_Click Dim result As Int result = Msgbox2("Esta seguro de cambiar las coordenadas de este cliente", "Aviso GPS", "SI", "", "NO", LoadBitmap(File.DirAssets, "alerta.jpg")) 'Ignore If result = DialogResponse.Positive Then - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info2 SET CAT_CL_LAT = ?, CAT_CL_LONG = ? where CAT_CL_CODIGO In (Select cuenta from cuentaa)", Array As Object(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) + B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info3 SET CAT_CL_LAT = ?, CAT_CL_LONG = ? where CAT_CL_CODIGO In (Select cuenta from cuentaa)", Array As Object(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) B4XPage_Appear End If End Sub @@ -3773,7 +3782,7 @@ Private Sub B_ACEPTA_GALLINA_Click c.Position=0 skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps,ALMACEN,LA_RUTA,c.GetString("TOTAL_CLIE_SIN"))) - skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") 'Panel5.Visible = False @@ -5063,6 +5072,7 @@ Private Sub b_codigoAutorizacion_Click p_transparenteTicketImpreso.Visible = False et_codigoAutorizacion.Text = "" End If + teclado.HideKeyboard ' p_transparenteTicketImpreso.Visible = False End Sub @@ -5404,6 +5414,8 @@ End Sub Private Sub b_envioPDF_Click PDFGENERAR EnviarPDFWhatsAppNumero(et_numeroPDF.Text) + B4XPages.MainPage.skmt.ExecNonQuery("delete from TICKET_IMPRESO where idCliente In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery($"insert into TICKET_IMPRESO (idCliente) values ('${Subs.traeCliente}')"$) DateTime.DateFormat = "YYYY/MM/dd HH:mm:ss" Dim cmd As DBCommand diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index b6de754..1e48481 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -67,7 +67,7 @@ Sub B4XPage_Appear busca.Text = "" entro = "2" colonia = 0 - c = B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info2 where gestion = 0 ORDER BY CAT_CL_CODIGO") + c = B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info3 where gestion = 0 ORDER BY CAT_CL_CODIGO") ListView1.Clear lfila.Text = "NOMBRE" If c.RowCount>0 Then @@ -97,7 +97,7 @@ Sub ListView1_ItemClick (Position As Int, Value As Object) colonia = Value End If If entro = "2" Then - c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_CALLE, CAT_CL_COLONIA, count(*) as cuantos from kmt_info2 where gestion = 0 and CAT_CL_COLONIA = ? GROUP BY CAT_CL_CALLE, CAT_CL_COLONIA order by CAT_CL_CALLE ", Array As String(Value)) + c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_CALLE, CAT_CL_COLONIA, count(*) as cuantos from kmt_info3 where gestion = 0 and CAT_CL_COLONIA = ? GROUP BY CAT_CL_CALLE, CAT_CL_COLONIA order by CAT_CL_CALLE ", Array As String(Value)) ListView1.Clear lfila.text = "Calle" If c2.RowCount>0 Then @@ -108,7 +108,7 @@ Sub ListView1_ItemClick (Position As Int, Value As Object) End If entro = "3" Else If entro = "3" Then - c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info2 where gestion = 0 and CAT_CL_CALLE = ? AND CAT_CL_COLONIA = ? order by CAT_CL_NOMBRE ", Array As String(Value, colonia)) + c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info3 where gestion = 0 and CAT_CL_CALLE = ? AND CAT_CL_COLONIA = ? order by CAT_CL_NOMBRE ", Array As String(Value, colonia)) ListView1.Clear lfila.text = "Nombre" If c2.RowCount>0 Then @@ -157,7 +157,7 @@ End Sub Sub BUSCA_TextChanged (Old As String, New As String) q_buscar = "%" & busca.Text & "%" - c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info2 where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar,q_buscar)) + c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info3 where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar,q_buscar)) ListView1.Clear lfila.text = "Nombre y Calle" If c2.RowCount>0 Then @@ -187,10 +187,10 @@ End Sub Sub sc_result(atype As String,Values As String) CODIGO = Values - c2=B4XPages.MainPage.skmt.ExecQuery2("select COUNT(*) AS ENCONTRADO from kmt_info2 where CAT_CL_NUM_SERIEFISICO = ? order by CAT_CL_NOMBRE ", Array As String(CODIGO)) + c2=B4XPages.MainPage.skmt.ExecQuery2("select COUNT(*) AS ENCONTRADO from kmt_info3 where CAT_CL_NUM_SERIEFISICO = ? order by CAT_CL_NOMBRE ", Array As String(CODIGO)) c2.Position =0 If c2.GetString("ENCONTRADO") > 0 Then - s=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_CODIGO from kmt_info2 where CAT_CL_NUM_SERIEFISICO = ? order by CAT_CL_NOMBRE ", Array As String(CODIGO)) + s=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_CODIGO from kmt_info3 where CAT_CL_NUM_SERIEFISICO = ? order by CAT_CL_NOMBRE ", Array As String(CODIGO)) s.Position =0 B4XPages.MainPage.skmt.ExecNonQuery("delete from CUENTAA") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(s.GetString("CAT_CL_CODIGO"))) diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index ea23783..2f8b37c 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -113,7 +113,7 @@ Sub GUARDA_Click B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta,sDate & sTime, usuario, motivo,e_comm.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)") DateTime.TimeFormat = "HHmmss" sTime=DateTime.Time(DateTime.Now) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_OUT = ? where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(sTime)) diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 20ee72f..457d66f 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -88,6 +88,7 @@ Sub B4XPage_Appear label1.color = Colors.White Private textColor As Int = Colors.black If c.GetString("PE_CEDIS").Contains("PRO") Then textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto. + If not(IsNumber(c.GetString("PE_CEDIS"))) Then textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto. Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 10 @@ -159,10 +160,10 @@ Private Sub B4XPage_CloseRequest As ResumableSub End Sub Sub borra_Click - c = B4XPages.MainPage.skmt.ExecQuery("SELECT HABILITADA FROM IMPRESORA") - If c.RowCount > 0 Then - c.Position = 0 - If c.GetString("HABILITADA") = 1 Then +' c = B4XPages.MainPage.skmt.ExecQuery("SELECT HABILITADA FROM IMPRESORA") +' If c.RowCount > 0 Then +' c.Position = 0 +' If c.GetString("HABILITADA") = 1 Then If Not(Subs.revisaImpreso) Then If folio <> "" Then result = Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore @@ -177,7 +178,7 @@ Sub borra_Click End If B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") B4XPage_Appear End If Else @@ -188,49 +189,48 @@ Sub borra_Click B4XPages.MainPage.cliente.p_transparenteTicketImpreso.Visible = True B4XPages.ShowPage("cliente") End If - Else If c.GetString("HABILITADA") = 0 Then - If folio <> "" Then - result = Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore - If result = DialogResponse.POSITIVE Then - c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) - Next - End If - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - B4XPage_Appear - End If - Else - Msgbox("CLIENTE YA SE TRANSMITIO, FAVOR DE LLAMAR A SOPORTE PARA ASISTENCIA","AVISO") 'ignore - End If - End If - Else If c.RowCount = 0 Then - If folio <> "" Then - result = Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore - If result = DialogResponse.POSITIVE Then - c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) - Next - End If - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - B4XPage_Appear - End If - Else - Msgbox("CLIENTE YA SE TRANSMITIO, FAVOR DE LLAMAR A SOPORTE PARA ASISTENCIA","AVISO") 'ignore - End If - End If - +' Else If c.GetString("HABILITADA") = 0 Then +' If folio <> "" Then +' result = Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore +' If result = DialogResponse.POSITIVE Then +' c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") +' If c.RowCount>0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) +' B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) +' Next +' End If +' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") +' B4XPage_Appear +' End If +' Else +' Msgbox("CLIENTE YA SE TRANSMITIO, FAVOR DE LLAMAR A SOPORTE PARA ASISTENCIA","AVISO") 'ignore +' End If +' End If +' Else If c.RowCount = 0 Then +' If folio <> "" Then +' result = Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore +' If result = DialogResponse.POSITIVE Then +' c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") +' If c.RowCount>0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) +' B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) +' Next +' End If +' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") +' B4XPage_Appear +' End If +' Else +' Msgbox("CLIENTE YA SE TRANSMITIO, FAVOR DE LLAMAR A SOPORTE PARA ASISTENCIA","AVISO") 'ignore +' End If +' End If End Sub Sub ListView1_ItemLongClick (Position As Int, Value As Object) @@ -306,10 +306,10 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) If c.GetString("CUANTOS") > 0 Then B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Else B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End If B4XPage_Appear End If @@ -387,10 +387,10 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) If c.GetString("CUANTOS") > 0 Then B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Else B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End If B4XPage_Appear End If @@ -469,10 +469,10 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) If c.GetString("CUANTOS") > 0 Then B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Else B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End If B4XPage_Appear End If diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index 03d8135..bcdc4cd 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -95,13 +95,13 @@ Sub GUARDA_Click Private segs As String = sTime.SubString(4) sTime = hora&":"&mins&":"&segs Log("////////////// sTime: "&sTime&" ////////////////") -' c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA FROM kmt_info2") +' c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA FROM kmt_info3") ' c.Position=0 no_ruta= Subs.traeRuta no_cliente= "N" & sTime & no_ruta Log("++ ++ no_cliente = "&no_cliente) ' c.Close - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info2(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object (no_cliente,no_ruta, E_NOMBRE.Text,"null","null","null","null","null","null","null","null","null","null","null","null","null",B4XPages.MainPage.lon_gps,B4XPages.MainPage.lat_gps)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object (no_cliente,no_ruta, E_NOMBRE.Text,"null","null","null","null","null","null","null","null","null","null","null","null","null",B4XPages.MainPage.lon_gps,B4XPages.MainPage.lat_gps)) B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO, HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (no_cliente)) B4XPages.MainPage.skmt.ExecNonQuery("delete from CUENTAA") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(no_cliente)) diff --git a/B4A/C_Pedidos.bas b/B4A/C_Pedidos.bas index d82e5a6..0375a2f 100644 --- a/B4A/C_Pedidos.bas +++ b/B4A/C_Pedidos.bas @@ -257,7 +257,7 @@ Sub guardar_Click c.Position=0 clie_id = c.GetString("CUENTA") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") c.Position=0 cl_ruta = c.GetString("CAT_CL_RUTA") c.Close @@ -303,7 +303,7 @@ Sub guardar_Click DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") c.Position=0 cl_ruta = c.GetString("CAT_CL_RUTA") c.Close @@ -334,7 +334,7 @@ Sub guardar_Click c.Position=0 B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps,ALMACEN,cl_ruta,c.GetString("TOTAL_CLIE_SIN"))) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") B4XPages.ShowPage("Productos") Else DateTime.DateFormat = "MM/dd/yyyy" @@ -344,7 +344,7 @@ Sub guardar_Click c.Position=0 clie_id = c.GetString("CUENTA") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") c.Position=0 cl_ruta = c.GetString("CAT_CL_RUTA") c.Close @@ -357,7 +357,7 @@ Sub guardar_Click c.Position=0 B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps,ALMACEN,cl_ruta,c.GetString("TOTAL_CLIE_SIN"))) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (ALMACEN,L_PROID.Text,cantidad.text)) B4XPages.ShowPage("Productos") End If @@ -426,7 +426,7 @@ Sub Terminar_Click c.Position=0 clie_id = c.GetString("CUENTA") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") c.Position=0 cl_ruta = c.GetString("CAT_CL_RUTA") c.Close @@ -474,7 +474,7 @@ Sub Terminar_Click DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") c.Position=0 cl_ruta = c.GetString("CAT_CL_RUTA") c.Close @@ -505,7 +505,7 @@ Sub Terminar_Click c.Position=0 B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps,ALMACEN,cl_ruta,c.GetString("TOTAL_CLIE_SIN"))) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") B4XPages.ShowPage("Cliente") Else DateTime.DateFormat = "MM/dd/yyyy" @@ -515,7 +515,7 @@ Sub Terminar_Click c.Position=0 clie_id = c.GetString("CUENTA") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)") c.Position=0 cl_ruta = c.GetString("CAT_CL_RUTA") c.Close @@ -529,7 +529,7 @@ Sub Terminar_Click c.Position=0 B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps,ALMACEN,cl_ruta,c.GetString("TOTAL_CLIE_SIN"))) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (ALMACEN,L_PROID.Text,cantidad.text)) B4XPages.ShowPage("Cliente") End If diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 24a5d55..c5470fe 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -257,6 +257,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) SCROLL_RESDIA.Height = Root.Height B_OK_RES.color = Colors.Red B_OK_RES.TextColor = Colors.White + l_version.Left = Root.Width - l_version.Width l_version.Text = Application.VersionName EJECUTANDO=1 Dim ruta As String @@ -272,17 +273,17 @@ Private Sub B4XPage_Created (Root1 As B4XView) b.Position=0 Cuantos = b.GetString("CUANTOS") b.Close - d=B4XPages.MainPage.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info2 where gestion = 0") + d=B4XPages.MainPage.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info3 where gestion = 0") d.Position=0 - e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info2") + e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info3") e.Position=0 - f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info2") + f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info3") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close b_abordo.Left = (Root.Width / 2) - (b_abordo.Width / 2) p_principal.Width = Root.Width : p_principal.Height = Root.Height -' ro = B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info2") +' ro = B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info3") ' ro.Position = 0 ' l_ru_pri.Text = ro.GetString("CAT_CL_RUTA") ' ro.Close @@ -292,7 +293,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) If l_ruta.Text = 0 Then l_ruta.Text = 0 Else If l_ruta.Text > 0 Then - f=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") + f=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info3 where CAT_CL_RUTA not in (select * from ruta_suplencia)") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close @@ -356,6 +357,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) p_transparenteActualizacion.Width = Root.Width p_transparenteActualizacion.Height = Root.Height Subs.centraPanel(p_forzarActualizacion, p_transparenteActualizacion.Width) +' Subs.centraPanel(Panel4, Root.Width) End Sub 'Descargar: GP_https://keymon.lat/movil/guna/GP_4.10.10.EP_d.apk @@ -367,7 +369,7 @@ Sub B4XPage_Appear p_ruta2.Visible = False Subs.validaPromoProcterPRO3009 HORAINGRESO ="000000" - Btn_Ubicar.Left = (Root.Width/2) - (Btn_Ubicar.Width/2) + Btn_Ubicar.Left = (Panel4.Width/2) - (Btn_Ubicar.Width/2) ' B4XPages.MainPage.reqManager.Initialize(Me, B4XPages.MainPage.SERVER) PASO = 0 If Not(Starter.gps.GPSEnabled) Then @@ -412,18 +414,18 @@ Sub B4XPage_Appear Cuantos = b.GetString("CUANTOS") b.Close If Starter.marcaCel <> "Sony" Then ToastMessageShow(Cuantos , True) - d=B4XPages.MainPage.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info2 where gestion = 0") + d=B4XPages.MainPage.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info3 where gestion = 0") d.Position=0 - e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info2") + e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info3") e.Position=0 - f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info2") + f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info3") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close If l_ruta.Text = 0 Then l_ruta.Text =0 Else - f=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") + f=B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info3 where CAT_CL_RUTA not in (select * from ruta_suplencia)") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close @@ -550,6 +552,7 @@ Sub Subir_Click L_P_3.Text = "Envio de Pedidos" S_CH.Text = "EN PROCESO" S_CP.Text = "EN PROCESO" + B_OK_PAS.Text = "ENVIANDO" PB1.Progress = 0 PB2.Progress = 0 'c=skmt.ExecQuery("SELECT sum(IFNULL(PE_DESC,0)) as DESCUENTO FROM PEDIDO") @@ -597,7 +600,7 @@ Sub Subir_Click d.Close ' ENVIO DE LOS CODIGOS QR - 'c=skmt.ExecQuery2("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info2 where CAT_CL_NUM_SERIEFISICO = ?", Array As String("OK")) + 'c=skmt.ExecQuery2("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info3 where CAT_CL_NUM_SERIEFISICO = ?", Array As String("OK")) c=B4XPages.MainPage.skmt.ExecQuery("SELECT CODIGOKMTS, CODIGOB, LAT, LON FROM HIST_CODIGO_BARRAS" ) If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -606,12 +609,12 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_QR_2_GV2" cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"),C.GetString("CODIGOB"),C.GetString("LON"),C.GetString("LAT"),ALMACEN,l_ruta.text ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR") + B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR2") Next End If c.Close - c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info2 where CAT_CL_NUM_SERIEFISICO IS NOT NULL and gestion <> '0'") + c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info3 where CAT_CL_NUM_SERIEFISICO IS NOT NULL and gestion <> '0'") If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i @@ -737,19 +740,19 @@ Sub Subir_Click d.Close ' DATOS DE KMTS PARA EL TIPO DE ABARROTE. - '''CAT_CL_GIRO = ? WHERE CAT_CL_CODIGO = ? And CAT_CL_NOMBRE = ? kmt_info2 - c=B4XPages.MainPage.skmt.ExecQuery("Select CAT_CL_GIRO, CAT_CL_CODIGO from kmt_info2") - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_GIROS_ENC" - cmd.Parameters = Array As Object(C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_GIRO")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_abarrote") - Next - End If - c.Close + '''CAT_CL_GIRO = ? WHERE CAT_CL_CODIGO = ? And CAT_CL_NOMBRE = ? kmt_info3 +' c=B4XPages.MainPage.skmt.ExecQuery("Select CAT_CL_GIRO, CAT_CL_CODIGO from kmt_info3") +' If c.RowCount>0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_GIROS_ENC" +' cmd.Parameters = Array As Object(C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_GIRO")) +' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_abarrote") +' Next +' End If +' c.Close ' GEO CERCA c=B4XPages.MainPage.skmt.ExecQuery("Select HGCLIENTE, HGDATE, HGLAT, HGLON from HIST_GEOCERCA") @@ -863,6 +866,14 @@ End Sub Sub cargar_Click Private i As Int = Regex.Replace("[^0-9.]", e_ruta.text,"") 'Quitamos alfanumericos y convertimos en entero. e_ruta.text = i + + Private sup As Cursor = Starter.skmt.ExecQuery("SELECT RS_RUTA FROM RUTA_SUPLENCIA") + If E_RUTA2.Visible = False And E_RUTA2.text = "" And sup.RowCount > 0 Then 'Si hay ruta de suplencia, LA USAMOS. + sup.Position = 0 + E_RUTA2.text = sup.GetString("RS_RUTA") + E_RUTA2.Visible = True + End If + If E_RUTA2.Visible = True Then Private i2 As Int = Regex.Replace("[^0-9.]", E_RUTA2.text,"") 'Quitamos alfanumericos y convertimos en entero. E_RUTA2.text = i2 @@ -907,11 +918,11 @@ Sub cargar_Click PB2.Progress = 0 EJECUTANDO = 1 - 'c=skmt.ExecQuery("CREATE TABLE kmt_info2 (pr_cd_credito NUMERIC,pr_cd_nombre TEXT,pr_cd_calle TEXT,pr_cd_numero TEXT,pr_cd_num_int TEXT,pr_cd_entrecalle1 TEXT,pr_cd_entrecalle2 TEXT,pr_cd_colonia TEXT,pr_cd_poblacion TEXT,pr_cd_edo TEXT,pr_cd_cp TEXT,pr_cd_zona TEXT,pr_cf_credito NUMERIC,pr_cf_saldotot NUMERIC,pr_cf_saldooper NUMERIC,pr_cf_saldof1 NUMERIC, pr_cf_penalizacion NUMERIC)") + 'c=skmt.ExecQuery("CREATE TABLE kmt_info3 (pr_cd_credito NUMERIC,pr_cd_nombre TEXT,pr_cd_calle TEXT,pr_cd_numero TEXT,pr_cd_num_int TEXT,pr_cd_entrecalle1 TEXT,pr_cd_entrecalle2 TEXT,pr_cd_colonia TEXT,pr_cd_poblacion TEXT,pr_cd_edo TEXT,pr_cd_cp TEXT,pr_cd_zona TEXT,pr_cf_credito NUMERIC,pr_cf_saldotot NUMERIC,pr_cf_saldooper NUMERIC,pr_cf_saldof1 NUMERIC, pr_cf_penalizacion NUMERIC)") TOPE = 0 ' NUEVOS CLIENTE - B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2") + B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info3") B4XPages.MainPage.skmt.ExecNonQuery("delete from PROMO_ESP") B4XPages.MainPage.skmt.ExecNonQuery("delete from cod_result") B4XPages.MainPage.skmt.ExecNonQuery("delete from hist_gest") @@ -1211,7 +1222,7 @@ Sub JobDone(Job As HttpJob) If n = "OKActivo" Then Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_ruta_GV2_70_9" + cmd.Name = "select_ruta_GV2_70_10" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") 'Log("Usuario guardado en BD es 'Valido'") @@ -1269,10 +1280,10 @@ Sub JobDone(Job As HttpJob) Dim CAT_CL_LAT As String = records(RESULT.Columns.Get("CAT_CL_LAT")) Dim CAT_CL_MTOCOMPRA As String = records(RESULT.Columns.Get("CAT_CL_MTOCOMPRA")) Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO")) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info2(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,e_ruta.Text,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO, HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO)) Next - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info2(CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_NUM_SERIEFISICO) VALUES (?,?,?,0,0,0)", Array As Object ("0", e_ruta.Text, "ABORDO")) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_NUM_SERIEFISICO) VALUES (?,?,?,0,0,0)", Array As Object ("0", e_ruta.Text, "ABORDO")) Listo1 = 1 S_CC.Text = "LISTO" ' If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True) @@ -1309,7 +1320,7 @@ Sub JobDone(Job As HttpJob) Dim CAT_CL_LAT As String = records(RESULT.Columns.Get("CAT_CL_LAT")) Dim CAT_CL_MTOCOMPRA As String = records(RESULT.Columns.Get("CAT_CL_MTOCOMPRA")) Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO")) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info2(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,E_RUTA2.Text,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,E_RUTA2.Text,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO)) ' Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario,Subs.traeAlmacen, e_ruta.Text, "Suplencia", "",Subs.fechanormal(DateTime.Now),Subs.fechanormal(DateTime.Now),B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,"2","","") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO, HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO)) Next @@ -1896,18 +1907,19 @@ Sub JobDone(Job As HttpJob) Next End If End If - + If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) If RESULT.Tag = "valida_pedido" Then 'query tag For Each records() As Object In RESULT.Rows Dim CUANTOSP As Int = records(RESULT.Columns.Get("CUANTOSP")) - Log(cuantos_pedido) - Log(CUANTOSP) +' Log(cuantos_pedido) +' Log(CUANTOSP) If cuantos_pedido < = CUANTOSP Then ' ToastMessageShow("rojo val ok 1 cuantosp." , True) datos_iguales = "ok" S_CP.Text = "INFO OK" + B_OK_PAS.Text = "OK" Else If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info P. Sync Nuevamente" & CUANTOSP & " " & cuantos_pedido, True) S_CP.Text = "ENVIAR DATOS (K-2)" @@ -1915,7 +1927,7 @@ Sub JobDone(Job As HttpJob) Next End If End If - + If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) If RESULT.Tag = "valida_pedidoc" Then 'query tag @@ -2078,11 +2090,11 @@ Sub JobDone(Job As HttpJob) End If If B4XPages.MainPage.reqManager.reqsList.IsInitialized Then LogColor($"REQUESTS: ${B4XPages.MainPage.reqManager.reqsList.Size}"$, Colors.red) - Log($"CARGA=${CARGA}"$) +' Log($"CARGA=${CARGA}"$) If B4XPages.MainPage.reqManager.reqsList.Size = 0 And CARGA = "SUBIR" Then t1.Enabled = False t1.Initialize("T1", 3000) ' 1000 = 1 second - Log(999) +' Log(999) Log("TIMER ENABLED") t1.Enabled = True End If @@ -2205,13 +2217,13 @@ Sub b_mapa_Click End Sub Sub t2_tick - e_ruta.Text = "" +' e_ruta.Text = "" If B4XPages.MainPage.productos.lv_catalogos.IsInitialized Then B4XPages.MainPage.productos.lv_catalogos.Clear B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente") B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido") B4XPages.MainPage.skmt.ExecNonQuery("delete from noventa") B4XPages.MainPage.skmt.ExecNonQuery("delete from clie_act") - B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2") + B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info3") B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod") B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod2") B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ") @@ -2243,7 +2255,7 @@ Sub t2_tick Subs.deleteFolder(Starter.fFileProvider.SharedFolder) ' B4XPage_Appear E_RUTA2.Visible = False - E_RUTA2.Text = "" +' E_RUTA2.Text = "" b_abordo.Visible = False cargar.Visible = False Subir.Visible = False @@ -2362,6 +2374,8 @@ Sub B_OK_PAS_Click img2.Visible=False CARGA = "" Subs.panelVisible(p_principal, 0, 0) + E_RUTA2.Text = "" + e_ruta.Text = "" Else If CARGA = "SUBIR" And S_CP.Text = "ERROR" Then Msgbox("Tiene que subir de nuevo la información","Atención") 'ignore P1.Visible = False @@ -2416,7 +2430,7 @@ Sub B_OK_PAS_Click Resumen.Visible= True img2.Visible=False Subs.panelVisible(p_principal, 0, 0) - B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2") + B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info3") B4XPages.MainPage.skmt.ExecNonQuery("delete from cod_result") B4XPages.MainPage.skmt.ExecNonQuery("delete from hist_gest") B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod") @@ -2915,3 +2929,6 @@ Private Sub b_abordo_Click B4XPages.ShowPage("Cliente") End Sub +Private Sub P1_Click + +End Sub \ No newline at end of file diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index dc50468..5430749 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -55,7 +55,7 @@ End Sub Sub B4XPage_Appear nombre_boton = "NOVENTA" - c=B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(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 PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info3 where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") ListView1.Clear If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 @@ -127,7 +127,7 @@ Sub b_noventa_Click If nombre_boton = "NOVENTA" Then nombre_boton = "VENTA" b_noventa.Text ="VENTA" - c=B4XPages.MainPage.skmt.ExecQuery("select NV_CLIENTE,NV_MOTIVO,NV_COMM, (select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = NV_CLIENTE ) as NOMBRE FROM NOVENTA ORDER BY NV_CLIENTE asc") + c=B4XPages.MainPage.skmt.ExecQuery("select NV_CLIENTE,NV_MOTIVO,NV_COMM, (select CAT_CL_NOMBRE from kmt_info3 where cat_cl_codigo = NV_CLIENTE ) as NOMBRE FROM NOVENTA ORDER BY NV_CLIENTE asc") ListView1.Clear If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -146,7 +146,7 @@ Sub b_noventa_Click Else nombre_boton = "NOVENTA" b_noventa.Text ="NO VENTA" - c=B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(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 PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info3 where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") ListView1.Clear If c.RowCount>0 Then diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 69cd75d..729196a 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/noventa.bal b/B4A/Files/noventa.bal index 489e5ad..051be98 100644 Binary files a/B4A/Files/noventa.bal and b/B4A/Files/noventa.bal differ diff --git a/B4A/Files/nuevocliente.bal b/B4A/Files/nuevocliente.bal index 345cfbe..62f33c0 100644 Binary files a/B4A/Files/nuevocliente.bal and b/B4A/Files/nuevocliente.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 62c4071..88380ce 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/resdia.bal b/B4A/Files/resdia.bal index cef1c81..db10d68 100644 Binary files a/B4A/Files/resdia.bal and b/B4A/Files/resdia.bal differ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index c3b4411..562f104 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -24,75 +24,77 @@ File29=gps20.png File3=alerta_amarilla.png File30=guardagestion.bal File31=guna.png -File32=guna_viejo.png -File33=guna18.png -File34=guna-fondo.png -File35=Hacer pedido.jpg -File36=hacerpedido30.png -File37=ic_cloud_download_white_24dp.png -File38=infonavit1.jpg -File39=inicioFinVenta.bal +File32=guna_192x192.jpg +File33=guna_viejo.png +File34=guna18.png +File35=guna-fondo.jpg +File36=guna-fondo.png +File37=Hacer pedido.jpg +File38=hacerpedido30.png +File39=ic_cloud_download_white_24dp.png File4=amarillo.png -File40=itembuttonblue.png -File41=keymon_logo.png -File42=kmt.db -File43=login.bal -File44=Logo Guna_192x192.png -File45=Logo Guna-01.png -File46=logo sanfer.jpg -File47=logo_exitus1.jpg -File48=logo-guna-18.png -File49=MainPage.bal +File40=infonavit1.jpg +File41=inicioFinVenta.bal +File42=itembuttonblue.png +File43=keymon_logo.png +File44=kmt.db +File45=login.bal +File46=Logo Guna_192x192.png +File47=Logo Guna-01.png +File48=logo sanfer.jpg +File49=logo_exitus1.jpg File5=anterior.jpg -File50=Malo.jpg -File51=mapa.bal -File52=mapa_rutas.bal -File53=maparutas.bal -File54=mas-azul.png -File55=mas-azul-red.png -File56=mas-azul-red1.png -File57=menos.png -File58=menosred.png -File59=menos-red.png +File50=logo-guna-18.png +File51=MainPage.bal +File52=Malo.jpg +File53=mapa.bal +File54=mapa_rutas.bal +File55=maparutas.bal +File56=mas-azul.png +File57=mas-azul-red.png +File58=mas-azul-red1.png +File59=menos.png File6=bus-ar.png -File60=nota (conflict 2022-07-08-00-16-40).bal -File61=nota.bal -File62=noventa.bal -File63=nuevocliente.bal -File64=nuevo-cliente20.png -File65=Nvo Cliente.jpg -File66=p&g.png -File67=palomita_verde.png -File68=pedido.bal -File69=planfia_logo.png +File60=menosred.png +File61=menos-red.png +File62=nota (conflict 2022-07-08-00-16-40).bal +File63=nota.bal +File64=noventa.bal +File65=nuevocliente.bal +File66=nuevo-cliente20.png +File67=Nvo Cliente.jpg +File68=p&g.png +File69=palomita_verde.png File7=carrito.png -File70=planfia_logo_old.png -File71=planfia_logo_old2.png -File72=principal.bal -File73=proditem.bal -File74=proditem2.bal -File75=productos.bal -File76=promociones.bal -File77=qr.bal -File78=qr_gallina.jpg -File79=resdia.bal +File70=pedido.bal +File71=planfia_logo.png +File72=planfia_logo_old.png +File73=planfia_logo_old2.png +File74=principal.bal +File75=proditem.bal +File76=proditem2.bal +File77=productos.bal +File78=promociones.bal +File79=qr.bal File8=celltitle.bal -File80=ResDia.jpg -File81=resdia20.png -File82=rojo.png -File83=salma.jpg -File84=salma.png -File85=seleccion.bal -File86=senial.jpg -File87=sync.png -File88=tache_rojo.png -File89=telefonos.bal +File80=qr_gallina.jpg +File81=resdia.bal +File82=ResDia.jpg +File83=resdia20.png +File84=rojo.png +File85=salma.jpg +File86=salma.png +File87=seleccion.bal +File88=senial.jpg +File89=sync.png File9=cliente.bal -File90=Ticket dia.jpg -File91=ticketdia20.png -File92=ticketsdia.bal -File93=Tiendita.jpg -File94=verde.png +File90=tache_rojo.png +File91=telefonos.bal +File92=Ticket dia.jpg +File93=ticketdia20.png +File94=ticketsdia.bal +File95=Tiendita.jpg +File96=verde.png FileGroup1=Default Group FileGroup10=Default Group FileGroup11=Default Group @@ -187,6 +189,8 @@ FileGroup91=Default Group FileGroup92=Default Group FileGroup93=Default Group FileGroup94=Default Group +FileGroup95=Default Group +FileGroup96=Default Group Group=Default Group Library1=appupdating Library10=fileprovider @@ -249,7 +253,7 @@ Module6=C_Clientes Module7=C_Cuestionario Module8=C_Historico Module9=C_Mapas -NumberOfFiles=94 +NumberOfFiles=96 NumberOfLibraries=33 NumberOfModules=27 Version=12.8 @@ -257,7 +261,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 5.02.16 + #VersionName: 5.02.18 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 71d6037..397cc04 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -59,7 +59,7 @@ ModuleClosedNodes1=11,13,14 ModuleClosedNodes10= ModuleClosedNodes11= ModuleClosedNodes12= -ModuleClosedNodes13=6 +ModuleClosedNodes13= ModuleClosedNodes14= ModuleClosedNodes15=3,17 ModuleClosedNodes16= @@ -71,17 +71,17 @@ ModuleClosedNodes20= ModuleClosedNodes21= ModuleClosedNodes22= ModuleClosedNodes23= -ModuleClosedNodes24=3,4 +ModuleClosedNodes24= ModuleClosedNodes25=4,6,7,8,9 ModuleClosedNodes26= ModuleClosedNodes27= ModuleClosedNodes3= -ModuleClosedNodes4=5,8,9,10,11,12,13 -ModuleClosedNodes5=175,176,177,180 +ModuleClosedNodes4= +ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7=5,6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=B4XMainPage,B4XPage_Created,144,0,C_Cliente,B4XPage_Appear,876,6,C_Cliente,GPS_LocationChanged,1078,0,C_Cliente,gest_Click,1397,0,B4XMainPage,Class_Globals,24,0,C_Cliente,compra,1491,0,Main,Activity_ActionBarHomeClick,34,0,C_Nota,p_nota_Click,530,0,C_Nota,Class_Globals,6,0,C_Nota,ListView1_ItemLongClick,439,6 +NavigationStack=Diseñador Visual,cliente.bal,-100,2,C_Cliente,B4XPage_Appear,1032,6,C_Principal,JobDone,1222,0,C_Principal,Subir_Click,736,0,Subs,TraeMontoProd,1236,0,Subs,TraeMontoProd2,1244,0,B4XMainPage,B4XPage_Created,131,0,DBRequestManager,HandleJob,237,0,Diseñador Visual,principal.bal,-100,2,C_Principal,B4XPage_Created,293,0 SelectedBuild=0 -VisibleModules=25,2,14,26,5,10,15,20,4 +VisibleModules=25,2,14,26,5,10,15,20,4,21 diff --git a/B4A/MAPA_RUTAS.bas b/B4A/MAPA_RUTAS.bas index 443b4f7..ff7939d 100644 --- a/B4A/MAPA_RUTAS.bas +++ b/B4A/MAPA_RUTAS.bas @@ -131,7 +131,7 @@ Sub MapFragment1_Ready '''''''----------------------------MARKER AZUL - POR VISITAR If azul = 1 Or todos = 1 Then c.IsInitialized - c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_NOMBRE,CAT_CL_LAT,CAT_CL_LONG from kmt_info2 where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_LAT <> ' ' and CAT_CL_LONG <> ' ' ") + c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_NOMBRE,CAT_CL_LAT,CAT_CL_LONG from kmt_info3 where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_LAT <> ' ' and CAT_CL_LONG <> ' ' ") skmt.Initialize(ruta,"kmt.db", True) If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 @@ -155,7 +155,7 @@ Sub MapFragment1_Ready '''''''----------------------------MARKER VERDE - VENTA If verde =1 Or todos = 1 Then c2.IsInitialized - c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info2 where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") + c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info3 where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") For i = 0 To c2.RowCount -1 c2.Position = i LongitudRU = c2.GetString("CAT_CL_LONG") @@ -168,7 +168,7 @@ Sub MapFragment1_Ready Else If verde =1 Or todos = 1 Then c2.IsInitialized - c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info2 where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") + c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info3 where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") For i = 0 To c2.RowCount -1 c2.Position = i LongitudRU = c2.GetString("CAT_CL_LONG") @@ -186,7 +186,7 @@ Sub MapFragment1_Ready If rojo =1 Or todos = 1 Then c3.IsInitialized - c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info2 where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") + c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info3 where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") For i = 0 To c3.RowCount -1 c3.Position = i LongitudRU = c3.GetDouble("CAT_CL_LONG") @@ -199,7 +199,7 @@ Sub MapFragment1_Ready Else If rojo =1 Or todos = 1 Then c3.IsInitialized - c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info2 where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") + c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info3 where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0") For i = 0 To c3.RowCount -1 c3.Position = i LongitudRU = c3.GetDouble("CAT_CL_LONG") diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 956248b..1da72ac 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -627,7 +627,7 @@ Sub guardaProductoSin(cedis As String, costoTot As String, costoU As String, can ' c.Position=0 ' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") ' B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clienteId, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, cedis, rutaV, c.GetString("TOTAL_CLIE_SIN"))) -' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") +' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") ' c.Close ToastMessageShow("guardaProdSin", False) End Sub @@ -662,7 +662,7 @@ Sub traeProdNombre(id As String) As String End Sub ''Regresa la ruta actual de la base de datos, de acuerdo al cliente actual en CUENTAA. -'Si hay cliente definido (en CUENTAA), trae la ruta de ese cliente, si no, trae la primera ruta de kmt_info2. (esto es por las suplencias) +'Si hay cliente definido (en CUENTAA), trae la ruta de ese cliente, si no, trae la primera ruta de kmt_info3. (esto es por las suplencias) Sub traeRuta As String 'ignore Private c As Cursor Private r As String = "0" @@ -677,12 +677,12 @@ Sub traeRuta As String 'ignore ' Log($"#########################${CRLF}HAY USUARIO EN CUENTAA: ${elCc.RowCount}${CRLF}#########################"$) If idCliente <> "" Then ' Log(1) - c = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO = '${idCliente}'"$) + c = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO = '${idCliente}'"$) Else ' Log(2) - c = B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia)") + c = B4XPages.MainPage.skmt.ExecQuery("select distinct CAT_CL_RUTA from kmt_info3 where CAT_CL_RUTA not in (select * from ruta_suplencia)") End If -' Log($"#########################${CRLF}ENCONTRAMOS RUTA EN KMT_INFO2: ${c.RowCount}${CRLF}#########################"$) +' Log($"#########################${CRLF}ENCONTRAMOS RUTA EN kmt_info3: ${c.RowCount}${CRLF}#########################"$) If c.RowCount > 0 Then ' Log(3) c.Position=0 @@ -699,7 +699,7 @@ End Sub Sub traeRutaBitacora As String 'ignore Private c As Cursor Private r As String - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info2 WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info3 WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") r = "0" If c.RowCount > 0 Then c.Position=0 @@ -715,7 +715,7 @@ Sub traeRutasSup As String Dim rutas As String rutas = "" - c = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info2") + c = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_RUTA FROM kmt_info3") If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 @@ -777,7 +777,7 @@ Sub guardaProducto(cedis As String, costoU As String, cant As String, nombre As c.Position=0 B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clienteId, fecha, usuario, c.GetString("CANT_CLIE"), c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, cedis, c.GetString("TOTAL_CLIE_SIN"))) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End Sub @@ -1242,23 +1242,34 @@ Sub TraeMontoProd As Boolean End Sub Sub TraeMontoProd2 As Boolean + 'This subrutine checks if the total cost of a product is between 350 and 499.99 Private x As Boolean = False + 'Declares a boolean variable Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT ifnull( SUM (PE_COSTO_TOT),0) As suma FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA)") + 'Executes a query to get the sum of PE_COSTO_TOT from the PEDIDO table, joined with CAT_PROMO_ESP table on CAT_PE_ID = PE_PROID where PE_CLIENTE is in the CUENTA column from CUENTAA table If c.RowCount > 0 Then + 'Checks if the query returned any rows c.Position = 0 + 'Sets the cursor position to the first row Private c2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT DISTINCT CAT_PE_MONTO FROM CAT_PROMO_ESP") + 'Executes a query to get distinct values of CAT_PE_MONTO from CAT_PROMO_ESP table If c2.RowCount > 0 Then + 'Checks if the query returned any rows c2.Position = 0 - If c.GetString("suma") >= 300 and c.GetString("suma") <= 499.99 Then + 'Sets the cursor position to the first row + If c.GetString("suma") >= 350 And c.GetString("suma") <= 499.99 Then + 'Checks if the sum is between 350 and 499.99 x = True + 'Sets x to true if the condition is met Else x = False + 'Sets x to false if the condition is not met ' Log("Falso") End If - End If End If Return x + 'Returns the value of x End Sub Sub InvSuficientePromoEsp As Boolean @@ -1394,7 +1405,7 @@ End Sub 'Regresa el nombre del cliente del id dado. Sub traeNombreCliente(id As String) As String - Private c As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_NOMBRE from kmt_info2 where CAT_CL_CODIGO = '${id}'"$) + Private c As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_NOMBRE from kmt_info3 where CAT_CL_CODIGO = '${id}'"$) Private n As String = "N/A" Do While c.NextRow n = c.GetString("CAT_CL_NOMBRE") @@ -1512,7 +1523,7 @@ Sub validaPromoProcterPRO3009 ' Log(">>>> CUANTOS: " & r2.GetString("cuantos")) If r2.GetString("cuantos") = 0 Then Starter.skmt.ExecNonQuery($"delete from pedido_cliente where pc_cliente = '${r.GetString("PE_CLIENTE")}'"$) - Starter.skmt.ExecNonQuery($"update kmt_info2 set gestion = 0 where cat_cl_codigo = '${r.GetString("PE_CLIENTE")}'"$) + Starter.skmt.ExecNonQuery($"update kmt_info3 set gestion = 0 where cat_cl_codigo = '${r.GetString("PE_CLIENTE")}'"$) End If Loop Loop