From ae73964cbeaf0c1c43f80700465a99c971ce1ba3 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Sat, 16 Sep 2023 07:31:49 -0600 Subject: [PATCH] ... --- B4A/B4XMainPage.bas | 4 +- B4A/C_Cliente.bas | 94 ++++++++++---------- B4A/C_Principal.bas | 187 +++++++++++++++++++++------------------ B4A/C_Subs.bas | 90 +++++++++++++++++++ B4A/DBRequestManager.bas | 3 +- B4A/Subs.bas | 10 +++ 6 files changed, 253 insertions(+), 135 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 6387a7f..1e07d80 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -47,6 +47,7 @@ Sub Class_Globals 'xxxxxxxxxxxxxxxxxxxxxxxxx Dim reqManager As DBRequestManager + Dim s As C_Subs Dim v As String = Application.VersionName Dim ruta As String Dim tgl As Toggle @@ -104,6 +105,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) B4XPages.GetManager.LogEvents = True Root = Root1 Root.LoadLayout("login") + s.Initialize(Me, "Subs") B4XPages.SetTitle(Me, "Mariana Preventa") login.Initialize B4XPages.AddPage("Login", login) @@ -407,7 +409,7 @@ Sub Entrar_Click End Sub Sub JobDone(Job As HttpJob) - Log(Job.Success) + Log("JOBDONE MAINPAGE - " & Job.Success) If Job.Success = False Then ' ToastMessageShow("Error: " & Job.ErrorMessage, True) Else diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 431d82b..fb1b380 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -158,8 +158,8 @@ 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_info 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)") + c=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_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + s=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 c.Position=0 @@ -206,8 +206,8 @@ Sub B4XPage_Appear p_abono.Visible = False Subs.centraPanel(p_abono, Root.Width) 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,CAT_CL_NUM_SERIEFISICO from kmt_info 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, PC_FACTURA FROM PEDIDO_CLIENTE INNER JOIN PEDIDO ON PEDIDO_CLIENTE.PC_CLIENTE = PEDIDO.PE_CLIENTE WHERE (PE_CLIENTE IN (Select cuenta from cuentaa))") + c=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_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + s=skmt.ExecQuery("Select SUM(PE_COSTO_TOT) As TOTAL_CLIE, SUM(PE_CANT) As CANT_CLIE, PC_FACTURA FROM PEDIDO_CLIENTE INNER JOIN PEDIDO ON PEDIDO_CLIENTE.PC_CLIENTE = PEDIDO.PE_CLIENTE WHERE (PE_CLIENTE IN (Select cuenta from cuentaa))") s.Position=0 If c.RowCount > 0 Then c.Position=0 @@ -249,12 +249,12 @@ Sub B4XPage_Appear End If c.Close s.Close - S2=B4XPages.MainPage.skmt.ExecQuery("select count(*) AS CUANTOS from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa)") + S2=skmt.ExecQuery("select count(*) AS CUANTOS from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa)") S2.Position =0 CUANTOS = S2.GetString("CUANTOS") S2.Close If CUANTOS > 0 Then - c2=B4XPages.MainPage.skmt.ExecQuery("select sum(HVD_COSTO_TOT) AS TOTAL from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa)") + c2=skmt.ExecQuery("select sum(HVD_COSTO_TOT) AS TOTAL from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa)") c2.Position =0 MONTO_COMPRA = c2.GetString("TOTAL") c2.Close @@ -272,7 +272,7 @@ Sub B4XPage_Appear META2 = "CUBIERTO" End If la_saldooper.Text = META2 - c=B4XPages.MainPage.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") + c=skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") If c.RowCount>0 Then C.Position=0 ALMACEN = C.GetString("ID_ALMACEN") @@ -285,10 +285,10 @@ Sub B4XPage_Appear End If If ALMACEN = "4" Then ' b_like.Visible = True - DD=B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM HIST_VENTAS WHERE HVD_CLIENTE IN (Select cuenta from cuentaa) AND HVD_PRONOMBRE =?", Array As String("KNORR RINDE MAS 70 GR")) + DD=skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM HIST_VENTAS WHERE HVD_CLIENTE IN (Select cuenta from cuentaa) AND HVD_PRONOMBRE =?", Array As String("KNORR RINDE MAS 70 GR")) DD.Position =0 If DD.GetString("CUANTOS") = 0 Then - c=B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) AND PE_PRONOMBRE =?", Array As String("KNORR RINDE MAS 70 GR")) + c=skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) AND PE_PRONOMBRE =?", Array As String("KNORR RINDE MAS 70 GR")) c.Position =0 ' If c.GetString("CUANTOS") = 0 Then ' b_like.Visible = True @@ -358,8 +358,8 @@ Sub GPS_LocationChanged (Location1 As Location) ' LA_GEO.TextColor = Colors.Red ' End If LA_GEO.Text= $"$1.2{distance/1000} kms"$ - B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS") - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) + skmt.ExecNonQuery("DELETE FROM HIST_GPS") + skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) l_ubicacion2.TextSize = 13 l_ubicacion2.Text = $"Precisión GPS $1.0{Location1.Accuracy} m"$ @@ -431,31 +431,31 @@ Sub Guardar_Click DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) - c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa") + c=skmt.ExecQuery("Select CUENTA from cuentaa") c.Position=0 clie_id = c.GetString("CUENTA") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa") + c=skmt.ExecQuery("select USUARIO from usuarioa") c.Position=0 usuario = c.GetString("USUARIO") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") + c=skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") c.Position=0 If c.GetString("CUANTOS") > 0 Then Private cbFactura As Int = 0 If cb_factura.Checked Then cbFactura = 1 - 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,PC_ENVIO_OK, PC_FACTURA) 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,0, cbFactura)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)") + 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_ENVIO_OK, PC_FACTURA) 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,0, cbFactura)) + skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End If c.Close DateTime.TimeFormat = "HHmmss" sTime=DateTime.Time(DateTime.Now) - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_OUT = ? where HSS_OUT = 0 AND HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(sTime)) - ' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE HIST_STAY_STORE set HSS_TOT = HSS_OUT - HSS_IN where HSS_CODIGO In (select cuenta from cuentaa)") + skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_OUT = ? where HSS_OUT = 0 AND HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(sTime)) + ' skmt.ExecNonQuery("UPDATE HIST_STAY_STORE set HSS_TOT = HSS_OUT - HSS_IN where HSS_CODIGO In (select cuenta from cuentaa)") Try - c=B4XPages.MainPage.skmt.ExecQuery(" Select (substr(HSS_OUT,1,2) - substr(HSS_IN,1,2)) - Case when (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then 1 Else 0 end HORAS_TOTALES, " & _ + c=skmt.ExecQuery(" Select (substr(HSS_OUT,1,2) - substr(HSS_IN,1,2)) - Case when (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then 1 Else 0 end HORAS_TOTALES, " & _ "Case when (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then (substr(HSS_OUT,3,2) + 60 - substr(HSS_IN,3,2)) " & _ " Else (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) End - Case when (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) < 0 Then 1 Else 0 end MINUTOS_TOTALES, " & _ "Case when (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) < 0 Then (substr(HSS_OUT,5,2) + 60 - substr(HSS_IN,5,2)) " & _ @@ -465,8 +465,8 @@ Sub Guardar_Click stay_hh = c.GetString("HORAS_TOTALES") * 60 * 60 stay_mi = c.GetString("MINUTOS_TOTALES") * 60 stay_ss = c.GetString("SEGUNDOS_TOTALES") - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ? where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss)) - B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ? ", Array As Object(sTime)) + skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ? where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss)) + skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ? ", Array As Object(sTime)) c.Close Catch ToastMessageShow(".",True) @@ -507,7 +507,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_info WHERE CAT_CL_NUM_SERIEFISICO = ?", Array As String(CODIGO)) + DD=skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM kmt_info WHERE CAT_CL_NUM_SERIEFISICO = ?", Array As String(CODIGO)) DD.Position =0 If DD.GetString("CUANTOS") > 0 Then MsgboxAsync("Código ya asignado", "AVISO") @@ -516,10 +516,10 @@ 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_info 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)) + skmt.ExecNonQuery2("UPDATE kmt_info 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)) + 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)) End If Else MsgboxAsync("Código No Valido", "AVISO") @@ -566,7 +566,7 @@ Sub B_IMP_Click printer.WriteLine("Vendedor: KMTS ") printer.WriteLine("Tienda: " & La_nombre.Text) printer.WriteLine("-----------PREVENTA-----------") - s=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") + s=skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") If S.RowCount>0 Then For i=0 To S.RowCount -1 S.Position=i @@ -651,16 +651,16 @@ Sub B_GUARDA_C_Click DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) - c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa") + c=skmt.ExecQuery("Select CUENTA from cuentaa") c.Position=0 clie_id = c.GetString("CUENTA") c.Close - c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa") + c=skmt.ExecQuery("select USUARIO from usuarioa") c.Position=0 usuario = c.GetString("USUARIO") c.Close - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA) VALUES(?,?,?,?,?,?,?,?,?,?) ", Array As Object ("4",.01 , .01, 2, "KNORR RINDE MAS 70 GR", "GUNA2",la_cuenta.TEXT, sDate & sTime, usuario,LA_RUTA)) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_FACE(HFCLIENTE, HFALIAS,HFRUTA,HFALMACEN) VALUES (?,?,?,?) ", Array As Object(la_cuenta.Text, I_COMPRA.Text,LA_RUTA,ALMACEN)) + skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA) VALUES(?,?,?,?,?,?,?,?,?,?) ", Array As Object ("4",.01 , .01, 2, "KNORR RINDE MAS 70 GR", "GUNA2",la_cuenta.TEXT, sDate & sTime, usuario,LA_RUTA)) + skmt.ExecNonQuery2("INSERT INTO HIST_FACE(HFCLIENTE, HFALIAS,HFRUTA,HFALMACEN) VALUES (?,?,?,?) ", Array As Object(la_cuenta.Text, I_COMPRA.Text,LA_RUTA,ALMACEN)) Panel1.Visible = False ' b_like.Visible = True Tar.Visible = True @@ -674,20 +674,20 @@ Sub b_venta_Click DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) -' s=B4XPages.MainPage.skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_ENCUESTA where HE_CLIE In (Select cuenta from cuentaa)") +' s=skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_ENCUESTA where HE_CLIE In (Select cuenta from cuentaa)") ' s.Position= 0 ' If s.GetString("CUANTOS") = 0 Then -' c=B4XPages.MainPage.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String("CUESTIONARIO")) +' c=skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String("CUESTIONARIO")) ' c.Position =0 ' If c.GetString("CAT_VA_VALOR") = "2" Then ' res = Msgbox2("El cliente maneja CAZARES ?","CAZARES", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'Ignore ' If res = DialogResponse.POSITIVE Then -' B4XPages.MainPage.skmt.ExecNonQuery2("insert into HIST_ENCUESTA(HE_CLIE, HE_RES, HE_FECHA, HE_TIPO) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text, "SI",sDate & sTime,"TIENE")) +' skmt.ExecNonQuery2("insert into HIST_ENCUESTA(HE_CLIE, HE_RES, HE_FECHA, HE_TIPO) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text, "SI",sDate & sTime,"TIENE")) ' Panel1.Visible =True ' I_COMPRA.Text = "" ' BT_QR.Visible= False ' Else -' B4XPages.MainPage.skmt.ExecNonQuery2("insert into HIST_ENCUESTA(HE_CLIE, HE_RES, HE_FECHA, HE_TIPO) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text, "NO",sDate & sTime,"TIENE")) +' skmt.ExecNonQuery2("insert into HIST_ENCUESTA(HE_CLIE, HE_RES, HE_FECHA, HE_TIPO) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text, "NO",sDate & sTime,"TIENE")) ' B4XPages.MainPage.tipo_venta = "VENTA" ' B4XPages.ShowPage("Productos") ' End If @@ -705,7 +705,7 @@ End Sub Sub B_E_NEXT_Click If E_RES_E.Text <> "" Then - B4XPages.MainPage.skmt.ExecNonQuery2("insert into HIST_ENCUESTA(HE_CLIE, HE_RES, HE_FECHA, HE_TIPO) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text, E_RES_E.Text,sDate & sTime,"DONDE")) + skmt.ExecNonQuery2("insert into HIST_ENCUESTA(HE_CLIE, HE_RES, HE_FECHA, HE_TIPO) VALUES (?,?,?,?)", Array As Object(la_cuenta.Text, E_RES_E.Text,sDate & sTime,"DONDE")) Panel2.Visible = False B4XPages.ShowPage("Productos") Else @@ -751,7 +751,7 @@ End Sub ' 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_info 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)) +' skmt.ExecNonQuery2("UPDATE kmt_info 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 @@ -766,8 +766,9 @@ Private Sub cb_factura_CheckedChange(Checked As Boolean) End Sub Sub mandaPendientes + Log("MandaPendientes") 'PEDIDO_CLIENTE (Pendientes) - c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE where pc_envio_ok <> 1") + c=skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE where PC_ENVIO_OK <> 1") Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -776,18 +777,19 @@ Sub mandaPendientes cmd.Initialize cmd.Name = "DELETE_PEDIDO_MARDS_PC" cmd.Parameters = Array As Object(ALMACEN, B4XPages.MainPage.principal.l_ruta.text,c.GetString("PC_CLIENTE") ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "DEL_PC") + reqManager.ExecuteCommand(cmd , "DEL_PC") Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_pedidos_MARDS" + Log($"${c.GetString("PC_CLIENTE")}, ${ALMACEN}"$) cmd.Parameters = Array As Object(C.GetString("PC_CLIENTE"), C.GetString("PC_FECHA"), C.GetString("PC_USER"), C.GetString("PC_NOART"), C.GetString("PC_MONTO"), C.GetString("PC_LON"), C.GetString("PC_LAT"), ALMACEN, B4XPages.MainPage.principal.l_ruta.text, C.GetString("PC_COSTO_SIN"), C.GetString("PC_FACTURA")) reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) Next End If 'PEDIDO (Pendientes) - c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM pedido_cliente left join PEDIDO where pc_cliente = pe_cliente and pc_envio_ok <> 1") + c=skmt.ExecQuery("SELECT PC_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM pedido_cliente left join PEDIDO where pc_cliente = pe_cliente and pc_envio_ok <> 1") Log($"Pedido PENDIENTE: ${c.RowCount}"$) If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -797,7 +799,7 @@ Sub mandaPendientes cmd.Initialize cmd.Name = "DELETE_PEDIDO_MARDS_PE" cmd.Parameters = Array As Object(ALMACEN, B4XPages.MainPage.principal.l_ruta.text,c.GetString("PE_CLIENTE") ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "DEL_PE") + reqManager.ExecuteCommand(cmd , "DEL_PE") cmd.Initialize cmd.Name = "insert_pedido_MARDS" @@ -807,7 +809,7 @@ Sub mandaPendientes End If 'ABONOS - Dim ab As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) + Dim ab As Cursor = skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) Log(ab.RowCount) If ab.RowCount > 0 Then For i=0 To ab.RowCount -1 @@ -823,7 +825,7 @@ Sub mandaPendientes ab.Close ' BANDERA FACTURA (Pendientes) -' c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_FACTURA, PC_CLIENTE FROM pedido_cliente where PC_CLIENTE IN (Select CUENTA from cuentaa)") +' c=skmt.ExecQuery("SELECT PC_FACTURA, PC_CLIENTE FROM pedido_cliente where PC_CLIENTE IN (Select CUENTA from cuentaa)") ' Log($"BANDERA FACTURA PENDIENTE: ${c.RowCount}"$) ' If c.RowCount>0 Then ' For i=0 To c.RowCount -1 @@ -840,7 +842,7 @@ Sub mandaPendientes End Sub Sub JobDone(Job As HttpJob) - Log(Job.Success) + Log("JOBDONE CLIENTE . " & Job.Success) If Job.Success = False Then ' ToastMessageShow("Error: " & Job.ErrorMessage, True) Else @@ -856,6 +858,7 @@ Sub JobDone(Job As HttpJob) Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k))) Next Next + skmt.ExecNonQuery($"UPDATE PEDIDO_CLIENTE set PC_ENVIO_OK = 1 where PC_CLIENTE = '${cliente}'"$) End If End If @@ -872,6 +875,7 @@ Sub JobDone(Job As HttpJob) Next End If End If + 'ABONOS PENDIENTES If Job.JobName = "DBRequest" Then Dim resultado As DBResult = reqManager.HandleJob(Job) @@ -884,7 +888,7 @@ Sub JobDone(Job As HttpJob) Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k))) Next Next - B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE ABONOS set a_enviado = 1 where a_cliente = '${cliente}'"$) + skmt.ExecNonQuery($"UPDATE ABONOS set a_enviado = 1 where a_cliente = '${cliente}'"$) End If End If Job.Release diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 1d007cf..86c387b 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -6,9 +6,10 @@ Version=11.5 @EndOfDesignText@ Sub Class_Globals Public rp As RuntimePermissions - dim s as C_Subs + Dim s As C_Subs Private Root As B4XView 'ignore Private xui As XUI 'ignore + Dim reqManager As DBRequestManager Dim conectado As String Dim t1 As Timer Dim sb As StringBuilder @@ -304,10 +305,12 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + s.reqManagerReInit 'Reiniciamos el DBReqManager por si hay modificacion en el servidor. + reqManager.Initialize(Me, Starter.server) nvo_cliente.Enabled = False HORAINGRESO ="000000" Btn_Ubicar.Left = (Root.Width/2) - (Btn_Ubicar.Width/2) -' B4XPages.MainPage.reqManager.Initialize(Me, B4XPages.MainPage.SERVER) +' reqManager.Initialize(Me, B4XPages.MainPage.SERVER) PASO =0 If Not(Starter.gps.GPSEnabled) Then If Starter.marcaCel <> "Sony" Then ToastMessageShow("Es necesario tener el GPS encendido", True) @@ -318,7 +321,7 @@ Sub B4XPage_Appear If c.GetString("CUANTOS") = 0 Then cmd.Initialize cmd.Name = "select_fecha" - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "fecha") + reqManager.ExecuteQuery(cmd , 0, "fecha") Msgbox("AJUSTAR FECHA","AVISO") 'ignore B4XPage_Appear Else @@ -519,7 +522,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "UPDATE_MARDS_ACTUAL2_GPS" cmd.Parameters = Array As Object(L_MONTOD.Text, L_CUANTOST.Text, l_cuantosc.Text,l_porvisitar.TEXT,c.GetString("hglat"),c.GetString("hglon"),batterystatus(0),LPT, STEYIN, STEYOUT,ALMACEN,l_ruta.Text ) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "update_gps") + reqManager.ExecuteCommand(cmd , "update_gps") Next End If c.Close @@ -534,7 +537,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_pedidos_MARDS" cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos") + reqManager.ExecuteCommand(cmd , "ins_pedidos") Next End If c.Close @@ -554,7 +557,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_QR_2_MARDS" 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") + reqManager.ExecuteCommand(cmd , "ins_QR") Next End If c.Close @@ -571,7 +574,7 @@ Sub Subir_Click ' cmd.Initialize ' cmd.Name = "insert_QR_MARDS" ' cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"),C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_LONG"),C.GetString("CAT_CL_LAT"),ALMACEN,l_ruta.text, foto1 ) -' B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR") +' reqManager.ExecuteCommand(cmd , "ins_QR") ' Next ' End If ' c.Close @@ -584,7 +587,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_encuesta_MARDS" cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"), c.GetString("HE_TIPO")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -598,7 +601,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_pedido_MARDS" cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido") + reqManager.ExecuteCommand(cmd , "ins_pedido") Next End If c.Close @@ -616,7 +619,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_noventa_MARDS" cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, l_ruta.Text,C.GetString("NV_NOMBRE"),C.GetString("NV_DIRECCION")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -641,7 +644,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_clientesnuevos_MARDS" cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),c.GetString("CN_ALMACEN"), c.GetString("CN_RUTA"), fotocn, "EN ESPERA",c.GetString("CN_GIRO")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_clientesn") + reqManager.ExecuteCommand(cmd , "inst_clientesn") Next End If c.Close @@ -655,7 +658,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_geocerca_MARDS" cmd.Parameters = Array As Object(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If c.Close @@ -670,7 +673,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_face_like_MARDS" cmd.Parameters = Array As Object(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If @@ -693,7 +696,7 @@ Sub Subir_Click ' cmd.Initialize ' cmd.Name = "insert_fotos_cliente_nuevo_MARIANA" ' cmd.Parameters = Array As Object(c.GetString("CODIGO"),c.GetString("ALMACEN"),c.GetString("RUTA"),fotox) -' B4XPages.MainPage.reqManager.ExecuteCommand(cmd, $"insert_clientes_${c.GetString("CODIGO")}"$) +' reqManager.ExecuteCommand(cmd, $"insert_clientes_${c.GetString("CODIGO")}"$) ' Next ' End If ' @@ -710,7 +713,7 @@ Sub Subir_Click cmd.Initialize cmd.Name ="insert_drop_MARDS_2" cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",ALMACEN) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") img2.Visible =True PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1)) If Starter.marcaCel <> "Sony" Then ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True) @@ -817,134 +820,134 @@ Sub cargar_Click cmd.Initialize cmd.Name ="insert_drop_MARDS_2" cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"CARGA",ALMACEN) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") cmd.Initialize cmd.Name = "select_cat_gunaprod_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod") + reqManager.ExecuteQuery(cmd , 0, "gunaprod") cmd.Initialize cmd.Name = "select_cat_bandera_MARDS" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "bandera") + reqManager.ExecuteQuery(cmd , 0, "bandera") cmd.Initialize cmd.Name = "select_cat_GIRO_MARDS" - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "giro") + reqManager.ExecuteQuery(cmd , 0, "giro") ' cmd.Initialize ' cmd.Name = "select_resum_apk_INTMEX" ''' va el nombre de archivo de config ' cmd.Parameters = Array As Object(ALMACEN) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done +' reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done cmd.Initialize cmd.Name = "select_cat_paquetes_MARDS3" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") + reqManager.ExecuteQuery(cmd , 0, "gunaprodp") cmd.Initialize cmd.Name = "select_cat_paquetess_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") + reqManager.ExecuteQuery(cmd , 0, "gunaprodp") cmd.Initialize cmd.Name = "select_cat_detallepa_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "detallepaq") + reqManager.ExecuteQuery(cmd , 0, "detallepaq") cmd.Initialize cmd.Name = "select_cat_clientes_MARDS" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + reqManager.ExecuteQuery(cmd , 0, "kmt_datos") cmd.Initialize cmd.Name = "select_hist_datos_MARDS_2" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos") + reqManager.ExecuteQuery(cmd , 0, "hist_datos") cmd.Initialize cmd.Name = "select_hist_promos_MARDS" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_promos") cmd.Initialize cmd.Name = "select_hist_cliente_promos_MARDS" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") ' cmd.Initialize ' cmd.Name = "select_HIST_MARCAS_CUOTAS_INTMEX" ' cmd.Parameters = Array As Object( ALMACEN, e_ruta.text) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS") +' reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS") If E_RUTA2.text <> "" Then cmd.Initialize cmd.Name = "select_cat_clientes_MARDS" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + reqManager.ExecuteQuery(cmd , 0, "kmt_datos") cmd.Initialize cmd.Name = "select_hist_datos_MARDS" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos") + reqManager.ExecuteQuery(cmd , 0, "hist_datos") cmd.Initialize cmd.Name = "select_hist_promos_MARDS" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_promos") cmd.Initialize cmd.Name = "select_hist_cliente_promos_MARDS" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos") End If cmd.Initialize cmd.Name = "select_promo_comp_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos") + reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos") ' cmd.Initialize ' cmd.Name = "select_verificacion_INTMEX" ' cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "cat_verificacion") +' reqManager.ExecuteQuery(cmd , 0, "cat_verificacion") cmd.Initialize cmd.Name = "select_fecha" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "fecha") + reqManager.ExecuteQuery(cmd , 0, "fecha") cmd.Initialize cmd.Name = "select_folio_MARDS" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "folio") + reqManager.ExecuteQuery(cmd , 0, "folio") cmd.Initialize cmd.Name = "select_marcas_rutas_MARDS" cmd.Parameters = Array As Object( ALMACEN, e_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "marcas_rutas") + reqManager.ExecuteQuery(cmd , 0, "marcas_rutas") ' cmd.Initialize ' cmd.Name = "select_CUEST_INTMEX" ' cmd.Parameters = Array As Object(ALMACEN) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO") +' reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO") ' cmd.Initialize ' cmd.Name = "select_HIST_CUOTAS_INTMEX" ' cmd.Parameters = Array As Object( ALMACEN,e_ruta.text ) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CUOTAS") +' reqManager.ExecuteQuery(cmd , 0, "CUOTAS") ' cmd.Initialize ' cmd.Name = "select_comis_cedex_MARDS" ' cmd.Parameters = Array As Object( ALMACEN, e_ruta.text ) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "COMISIONES") +' reqManager.ExecuteQuery(cmd , 0, "COMISIONES") ' cmd.Initialize ' cmd.Name = "select_hist_avance_MARDS" 'select * from HIST_AVANCE_MESACTUAL where HIST_AM_RUTA = ? and HIST_AM_IDALMACEN order by HIST_AM_MARCA ' cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) ' LogColor($"HIST_AVANCE Ruta=|${e_ruta.text}|, almacen=|${ALMACEN}|"$, Colors.Red) -' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_avance") +' reqManager.ExecuteQuery(cmd , 0, "hist_avance") cargar.Visible = False Subir.Visible = False @@ -959,7 +962,7 @@ End Sub Sub JobDone(Job As HttpJob) Log("JOBDONE PRINCIPAL") ' If Job.JobName = "DBRequest" Then -' Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) +' Dim RESULT As DBResult = reqManager.HandleJob(Job) ' Log($"Tag: ${RESULT.tag}, success=${Job.Success}"$) ' End If @@ -975,10 +978,10 @@ Sub JobDone(Job As HttpJob) End If End If Else 'If Job Success then ... - LogColor("JobDone: '" & B4XPages.MainPage.reqManager.HandleJob(Job).tag & "' - Registros: " & B4XPages.MainPage.reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 + LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 'Verificamos que el usuario guardado en BD sea VALIDO. If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "update_gps" Then For Each records() As Object In RESULT.Rows @@ -1019,7 +1022,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "giro" Then 'query tag For Each records() As Object In RESULT.Rows Dim giro As String = records(RESULT.Columns.Get("CAT_GR_DESC")) @@ -1050,7 +1053,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "bandera" Then 'query tag For Each records() As Object In RESULT.Rows Dim aurotizado As String = records(RESULT.Columns.Get("CAT_RU_B_ALTA_CLIENTES")) @@ -1081,7 +1084,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "kmt_datos" Then 'query tag S_CC.TEXT = "CARGANDO" For Each records() As Object In RESULT.Rows @@ -1123,7 +1126,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "resum_apk" Then 'query tag For Each records() As Object In RESULT.Rows Dim HIST_RA_OBJMES As String = records(RESULT.Columns.Get("HIST_RA_OBJMES")) @@ -1183,7 +1186,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_promos" Then 'query tag For Each records() As Object In RESULT.Rows Dim HP_CLIENTE As String = records(RESULT.Columns.Get("HP_CLIENTE")) @@ -1204,7 +1207,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_cliente_promos" Then 'query tag For Each records() As Object In RESULT.Rows Dim HCCP_CLIENTE As String = records(RESULT.Columns.Get("HCCP_CLIENTE")) @@ -1217,7 +1220,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "HIST_MARCAS_CUOTAS" Then 'query tag For Each records() As Object In RESULT.Rows Dim HMC_MARCA As String = records(RESULT.Columns.Get("HMC_MARCA")) @@ -1229,7 +1232,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_comp_promos" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_PA_ID As String = records(RESULT.Columns.Get("CAT_PA_ID")) @@ -1251,7 +1254,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "cat_verificacion" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_VE_IDPROD As String = records(RESULT.Columns.Get("CAT_VE_IDPROD")) @@ -1263,7 +1266,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "marcas_rutas" Then 'query tag For Each records() As Object In RESULT.Rows Dim HVD_MARCA As String = records(RESULT.Columns.Get("HVD_MARCA")) @@ -1275,7 +1278,7 @@ Sub JobDone(Job As HttpJob) 'CUOTAS If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "CUOTAS" Then 'query tag For Each records() As Object In RESULT.Rows Dim HC_RUTA As String = records(RESULT.Columns.Get("HC_RUTA")) @@ -1299,7 +1302,7 @@ Sub JobDone(Job As HttpJob) 'COMISIONES If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "COMISIONES" Then 'query tag For Each records() As Object In RESULT.Rows Dim HCM_TOTAL_V As String = records(RESULT.Columns.Get("HCM_TOTAL_V")) @@ -1312,7 +1315,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "gunaprod" Then 'query tag If PB2.Progress < 30 Then S_CP.Text = "CARGANDO" 'Mod por CHV - 20211028 Agregue el "If PB2.Progress < 30 then" For Each records() As Object In RESULT.Rows @@ -1372,7 +1375,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "gunaprodp" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_GP_ID As String = records(RESULT.Columns.Get("CAT_GP_ID")) @@ -1417,7 +1420,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "gunaprodps" Then 'query tag For Each records() As Object In RESULT.Rows @@ -1463,7 +1466,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "detallepaq" Then 'query tag For Each records() As Object In RESULT.Rows Dim CAT_DP_ALMACEN As String = records(RESULT.Columns.Get("CAT_DP_ALMACEN")) @@ -1503,7 +1506,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_datos" Then 'query tag For Each records() As Object In RESULT.Rows Dim HVD_CLIENTE As String = records(RESULT.Columns.Get("HVD_CLIENTE")) @@ -1532,7 +1535,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "variables" Then 'query tag For Each records() As Object In RESULT.Rows Dim Cat_Va_Descripcion As String = records(RESULT.Columns.Get("CAT_VA_DESCRIPCION")) @@ -1543,7 +1546,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "CUESTIONARIO" Then 'query tag For Each records() As Object In RESULT.Rows Dim Cat_Va_Valor As String = records(RESULT.Columns.Get("CAT_VALOR")) @@ -1554,8 +1557,9 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "valida_pedido" Then 'query tag + Subs.logJobDoneResultados(RESULT) For Each records() As Object In RESULT.Rows Dim CUANTOSP As Int = records(RESULT.Columns.Get("CUANTOSP")) @@ -1569,15 +1573,14 @@ Sub JobDone(Job As HttpJob) S_CP.Text = "ENVIAR DATOS (K-2)" Log("No se cargo bien la info P. Sync Nuevamente" & CUANTOSP & " " & cuantos_pedido) End If - - Next End If End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "valida_pedidoc" Then 'query tag + Subs.logJobDoneResultados(RESULT) For Each records() As Object In RESULT.Rows Dim CUANTOSC As Int = records(RESULT.Columns.Get("CUANTOSC")) @@ -1594,8 +1597,9 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "valida_noventa" Then 'query tag + Subs.logJobDoneResultados(RESULT) For Each records() As Object In RESULT.Rows Dim CUANTOSN As Int = records(RESULT.Columns.Get("CUANTOSN")) If cuantos_noventa = CUANTOSN Then @@ -1610,7 +1614,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "ins_pedido" Then 'query tag For Each records() As Object In RESULT.Rows PB2.Progress = PB2.Progress + 5 @@ -1623,7 +1627,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "version" Then 'query tag For Each records() As Object In RESULT.Rows B4XPages.MainPage.skmt.ExecNonQuery("delete from VERSION") @@ -1634,7 +1638,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "count_cli" Then 'query tag For Each records() As Object In RESULT.Rows COUNT_CLIE = records(RESULT.Columns.Get("COUNT_CLIE")) @@ -1643,7 +1647,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "ruta" Then 'query tag For Each records() As Object In RESULT.Rows Dim VALIDO As String = records(RESULT.Columns.Get("VALIDO")) @@ -1667,7 +1671,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "usuario" Then 'query tag For Each records() As Object In RESULT.Rows Dim name2 As String = records(RESULT.Columns.Get("VALIDO")) @@ -1681,7 +1685,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "fecha" Then 'query tag For Each records() As Object In RESULT.Rows Dim FECHA_HOY As String = records(RESULT.Columns.Get("FECHA")) @@ -1692,7 +1696,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "folio" Then 'query tag For Each records() As Object In RESULT.Rows Dim FOLIO As String = records(RESULT.Columns.Get("FOLIO")) @@ -1703,7 +1707,7 @@ Sub JobDone(Job As HttpJob) End If If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) + Dim RESULT As DBResult = reqManager.HandleJob(Job) If RESULT.Tag = "hist_avance" Then 'query tag For Each records() As Object In RESULT.Rows Dim marca As String = records(RESULT.Columns.Get("HIST_AM_MARCA")) @@ -1738,10 +1742,17 @@ End Sub '################### Codigo de prueba JAGU, no poner atencion ############################ Sub connecta_LongClick ProgressDialogShow("Enviamos") - s.reqManagerReInit 'Reiniciamos el DBReqManager por si hay modificacion en el servidor. +' s.reqManagerReInit 'Reiniciamos el DBReqManager por si hay modificacion en el servidor. s.envioTest 'Llamamos envioTest de C_Subs. End Sub +Sub tickets_dia_LongClick + cuantos_pedido = 0 + cuantos_pedidosc = 0 + cuantos_noventa = 0 + t1_tick +End Sub + Sub Subs_envioOk(succes As Boolean) Log("###################### " & succes) ProgressDialogHide @@ -1749,7 +1760,7 @@ End Sub '################################ Termina codigo de prueba ############################# Sub connecta_Click - B4XPages.MainPage.reqManager.Initialize(Me, Starter.server) + reqManager.Initialize(Me, Starter.server) Log(Starter.server) connecta1 = connecta1 + 1 ' imei = p.GetDeviceId @@ -1758,7 +1769,7 @@ Sub connecta_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_version_MARDS" - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "version") + reqManager.ExecuteQuery(cmd , 0, "version") ' Cuando nos conectamos verificamos que el usuario guardado en BD sea VALIDO. c = B4XPages.MainPage.skmt.ExecQuery("select USUARIO, PASS from usuarioa") @@ -1769,7 +1780,7 @@ Sub connecta_Click cmd.Initialize cmd.Name = "select_usuario_guna_MARDS_1" cmd.Parameters = Array As Object(usrT, passT) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "usuarioA") + reqManager.ExecuteQuery(cmd , 0, "usuarioA") End If c.Close @@ -1778,7 +1789,7 @@ Sub connecta_Click cmd.Initialize cmd.Name = "select_ruta_MARDS_6" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") + reqManager.ExecuteQuery(cmd , 0, "ruta") If e_ruta.Text = "KMTS1" Then cargar.Visible = True @@ -1806,7 +1817,7 @@ Sub connecta_Click ' 'SERVER = "http://177.244.63.54:1782" '' B4XPages.MainPage.SERVER = "http://187.189.244.154:1782" '' SERVER = "http://10.0.0.205:1782" -' B4XPages.MainPage.reqManager.Initialize(Me, Starter.server) +' reqManager.Initialize(Me, Starter.server) ' End If End Sub @@ -1872,16 +1883,16 @@ Sub inv_Click cmd.Initialize cmd.Name = "select_cat_gunaprod_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod") + reqManager.ExecuteQuery(cmd , 0, "gunaprod") cmd.Initialize cmd.Name = "select_cat_paquetes_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") + reqManager.ExecuteQuery(cmd , 0, "gunaprodp") cmd.Initialize cmd.Name = "select_cat_detallepa_MARDS" cmd.Parameters = Array As Object(ALMACEN) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "detallepaq") + reqManager.ExecuteQuery(cmd , 0, "detallepaq") cargar.Visible = False Subir.Visible = False @@ -1894,17 +1905,17 @@ Sub t1_tick cmd.Initialize cmd.Name = "select_cuantos_pedido_MARDS" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "valida_pedido") + reqManager.ExecuteQuery(cmd , 0, "valida_pedido") cmd.Initialize cmd.Name = "select_cuantos_noventa_MARDS" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "valida_noventa") + reqManager.ExecuteQuery(cmd , 0, "valida_noventa") cmd.Initialize cmd.Name = "select_cuantos_pedidoc_MARDS" cmd.Parameters = Array As Object(ALMACEN,l_ruta.text) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc") + reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc") If PB2.Progress = 0 Then S_CP.Text = "ENVIAR DATOS (K-1)" diff --git a/B4A/C_Subs.bas b/B4A/C_Subs.bas index b4b26b6..c4841a6 100644 --- a/B4A/C_Subs.bas +++ b/B4A/C_Subs.bas @@ -46,6 +46,7 @@ Sub dbOk(Success As Boolean) End If End Sub +'Inicializamos el DBReqServer. Sub reqManagerInit As DBRequestManager Private rm As DBRequestManager rm.Initialize(Me, traeDBReqServerDeBD(db)) @@ -53,6 +54,7 @@ Sub reqManagerInit As DBRequestManager Return rm End Sub +'Reinicializamos el DBReqServer. Sub reqManagerReInit Log("reqManager ReInit") reqManager = reqManagerInit @@ -494,4 +496,92 @@ Sub notiLowReturn(title As String, Body As String, id As Int) As Notification 'i notification.Notify(id) ' Log("notiLowReturn SetInfo") Return notification +End Sub + +'Regresa el almacen actual de la base de datos. +Sub traeAlmacen As String 'ignore + Private c As Cursor + Private a As String + c = db.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") + c.Position = 0 + a = C.GetString("ID_ALMACEN") + c.Close + Return a +End Sub + +'Regresa la ruta actual de la base de datos. +Sub traeRuta As String 'ignore + Private c As Cursor + Private r As String + c = db.ExecQuery("select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + r = "0" + If c.RowCount > 0 Then + c.Position=0 + r = c.GetString("CAT_CL_RUTA") + End If + c.Close + Return r +End Sub + +'Mandamos los pedidos pendientes (pc_envio_ok <> 1). +Sub mandaPendientes 'ignore + Private logger As Boolean = False + 'PEDIDO_CLIENTE (Pendientes) + Private c As Cursor = db.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE where pc_envio_ok <> 1") + If logger Then Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) + Private almacen As String = traeAlmacen + Private ruta As String = traeRuta + If c.RowCount>0 Then + For i = 0 To c.RowCount - 1 + c.Position = i + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "DELETE_PEDIDO_MARDS_PC" + cmd.Parameters = Array As Object(almacen, ruta, c.GetString("PC_CLIENTE") ) + reqManager.ExecuteCommand(cmd , "DEL_PC") + + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_pedidos_MARDS" + If logger Then Log($"${c.GetString("PC_CLIENTE")}, ${almacen}"$) + cmd.Parameters = Array As Object(C.GetString("PC_CLIENTE"), C.GetString("PC_FECHA"), C.GetString("PC_USER"), C.GetString("PC_NOART"), C.GetString("PC_MONTO"), C.GetString("PC_LON"), C.GetString("PC_LAT"), almacen, ruta, C.GetString("PC_COSTO_SIN"), C.GetString("PC_FACTURA")) + reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) + Next + End If + + 'PEDIDO (Pendientes) + c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM pedido_cliente left join PEDIDO where pc_cliente = pe_cliente and pc_envio_ok <> 1") + If logger Then Log($"Pedido PENDIENTE: ${c.RowCount}"$) + If c.RowCount>0 Then + For i = 0 To c.RowCount - 1 + c.Position = i + Dim cmd As DBCommand + + cmd.Initialize + cmd.Name = "DELETE_PEDIDO_MARDS_PE" + cmd.Parameters = Array As Object(almacen, ruta,c.GetString("PE_CLIENTE") ) + reqManager.ExecuteCommand(cmd , "DEL_PE") + + cmd.Initialize + cmd.Name = "insert_pedido_MARDS" + cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"), almacen, c.GetString("PE_COSTO_TOT"), c.GetString("PE_COSTOU"), c.GetString("PE_CANT"), c.GetString("PE_PRONOMBRE"), c.GetString("PE_PROID"), c.GetString("PE_CLIENTE"), c.GetString("PE_FECHA"), c.GetString("PE_USUARIO"), c.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"), c.GetString("PE_DESC"), c.GetString("PE_FOLIO")) + reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}"$) + Next + End If + + 'ABONOS + Dim ab As Cursor = db.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) + If logger Then Log(ab.RowCount) + If ab.RowCount > 0 Then + For i = 0 To ab.RowCount - 1 + ab.Position = i + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_abono_MARDS" + cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha") ) + reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) + if logger then Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) + Next + End If + ab.Close End Sub \ No newline at end of file diff --git a/B4A/DBRequestManager.bas b/B4A/DBRequestManager.bas index 43c627f..0421c52 100644 --- a/B4A/DBRequestManager.bas +++ b/B4A/DBRequestManager.bas @@ -41,6 +41,7 @@ Public Sub ExecuteQuery(Command As DBCommand, Limit As Int, Tag As Object) WriteList(Command.Parameters, out2) out2.Close j.PostBytes(link & "?method=query", ms.ToBytesArray) + j.GetRequest.Timeout = 10000 'timeout del request (10 segs) End Sub 'Executes a batch of (non-select) commands. @@ -188,7 +189,7 @@ End Sub 'Handles the Job result and returns a DBResult. Public Sub HandleJob(Job As HttpJob) As DBResult - Dim start As Long = DateTime.Now +' Dim start As Long = DateTime.Now Dim In As InputStream = Job.GetInputStream Dim cs As CompressedStreams In = cs.WrapInputStream(In, "gzip") diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 3aebcd2..88e80ae 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1289,4 +1289,14 @@ Sub guardaAppInfo(skmt As SQL) skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'EMPRESA' or CAT_VA_DESCRIPCION = 'APP_NAME' or CAT_VA_DESCRIPCION = 'APP_VERSION'") skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_NAME', '${Application.LabelName}')"$) skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_VERSION', '${Application.VersionName}')"$) +End Sub + +'Muestra en el Log los campos y valores que regresan en el JobDone. +Sub logJobDoneResultados(resultado As DBResult) + For Each records() As Object In resultado.Rows + LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0)) + For Each k As String In resultado.Columns.Keys + LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0)) + Next + Next End Sub \ No newline at end of file