From 3a9e0d373adbaa33b5052977c4078469011eeb24 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 6 Dec 2024 12:49:12 -0600 Subject: [PATCH] =?UTF-8?q?-=20VERSION=204.12.02=20-=20Se=20modific=C3=B3?= =?UTF-8?q?=20como=20se=20trae=20la=20ruta=20para=20suplencia,=20porque=20?= =?UTF-8?q?en=20elgunas=20ocasiones=20resgresaba=20la=20ruta=20como=20CERO?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Cliente.bas | 2 ++ B4A/C_NuevoCliente.bas | 9 +++++---- B4A/C_Principal.bas | 12 +++++------ B4A/C_Productos.bas | 14 +++++++------ B4A/Files/resdia.bal | Bin 46069 -> 46108 bytes B4A/Guna Vistas V3.1.b4a | 2 +- B4A/Guna Vistas V3.1.b4a.meta | 8 ++++---- B4A/Subs.bas | 37 ++++++++++++++++++++++++++++------ 8 files changed, 56 insertions(+), 28 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 52768ee..92eb3bb 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -934,6 +934,7 @@ Sub B4XPage_Appear ' Log($">>>>>>>>>> |${la_cuenta.Text.trim}|"$) If la_cuenta.Text.trim = "0" Then gest.Text = "Carga Abordo" ' Log($"ALMACEN: ${ALMACEN}${CRLF}RUTA:${LA_RUTA}"$) + Log(Subs.traeRuta) End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -4801,6 +4802,7 @@ Private Sub LA_GEO_Click geoCont = 0 If distance > 99 Then p_pideGeoPass.BringToFront + et_geopass.RequestFocus p_pideGeoPass.Visible = True End If End If diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index b3368b8..03d8135 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -66,6 +66,7 @@ Sub B4XPage_Appear GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar. l_sinUbicacion.Visible = False End If + Starter.skmt.ExecNonQuery("delete from cuentaa") End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -94,12 +95,12 @@ 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.Position=0 - no_ruta= c.GetString("CAT_CL_RUTA") +' c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA FROM kmt_info2") +' c.Position=0 + no_ruta= Subs.traeRuta no_cliente= "N" & sTime & no_ruta Log("++ ++ no_cliente = "&no_cliente) - c.Close +' 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 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") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 05a7568..7d21680 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -948,6 +948,8 @@ Sub cargar_Click DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) + + Subs.guardaVariable("RUTA", e_ruta.text) Dim P As PhoneId imei = "" @@ -2211,6 +2213,7 @@ Sub t2_tick B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword")) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD")) B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD")) + B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RUTA")) ' B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("FORZAR_ACTUALIZACION")) ' B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("VERSION_NUEVA")) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0)) @@ -2560,7 +2563,6 @@ Sub resdia_Click Label2.Text = "Ruta " & rutOr l_ru_pri.Text = NumberFormat2(ru_o.GetString("TOTAL_CLIE"), 0, 2, 2, False) End If - ru_o.Close 'Prueba1 @@ -2574,9 +2576,8 @@ Sub resdia_Click ru_s.Position = 0 l_ru_sup.Text = NumberFormat2(ru_s.GetString("TOTAL_CLIE"), 0, 2, 2, False) End If - ru_s.Close - + Dim cuantos_obj As String c=B4XPages.MainPage.skmt.ExecQuery("Select count(*) AS TOTAL from HIST_MARCAS_CUOTAS ") c.Position = 0 @@ -2588,10 +2589,8 @@ Sub resdia_Click c.Position = 0 If c.GetString("TOTAL") > 0 Then L_NES.Text = Round(c.GetString("TOTAL") / 25) - Else L_NES.Text = c.GetString("TOTAL") - End If c.Close End If @@ -2605,7 +2604,6 @@ Sub resdia_Click L_EFEC_PURA.Text = Round2(L_VISITCC.Text / L_VPLAN.Text,2) L_LIN_TICK.Text = LPT If l_monto_ks.Text <> "0" Then - c=B4XPages.MainPage.skmt.ExecQuery2("Select COUNT(DISTINCT(PE_CLIENTE)) AS CUANTOS FROM PEDIDO WHERE PE_CEDIS = ? ", Array As String(ALMACEN)) c.Position = 0 L_CTE_PROMO.Text = c.GetString("CUANTOS") @@ -2622,7 +2620,7 @@ Sub resdia_Click 'L_PRIO.Text = NumberFormat(d.GetString("MONTO_DIA"),0,2) L_PRIO.Text = d.GetString("MONTO_DIA") d.Close - + d=B4XPages.MainPage.skmt.ExecQuery2($"Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_TIPOPROD = ?) "$, Array As String("ESTRATEGICO")) d.Position = 0 L_SECUND.Text =d.GetString("MONTO_DIA") diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 2cde3fa..973e0c8 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -56,6 +56,7 @@ Sub Class_Globals Private b_buscar As Button Private p_botonesVenta As Panel Dim tipo_venta As String = Subs.traeTipoVentaDeBD + Dim rutaActual As String End Sub 'You can add more parameters here. @@ -83,6 +84,7 @@ End Sub Sub B4XPage_Appear tipo_venta = Subs.traeTipoVentaDeBD + rutaActual = Subs.traeRuta clv_productos.Clear LogColor(tipo_venta, Colors.red) LogColor(Subs.traeTablaProds(tipo_venta), Colors.red) @@ -516,7 +518,7 @@ Sub b_prodMenos_Click If laCant.Text = "" Then laCant.Text = 0 laCant.Text = NumberFormat2(laCant.Text - 1, 1, 0, 0, False) If laCant.Text < 0 Then laCant.Text = 0 - Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaActual, 0, B4XPages.MainPage.tipo_venta) ' Dim chk As B4XView = pnl.GetView(2) cuentaProds End Sub @@ -538,7 +540,7 @@ Sub b_prodMas_Click If laCant.Text + 1 <= esteTag.get(1) Then laCant.Text = NumberFormat2(laCant.Text + 1, 1, 0, 0, False) ' Subs.guardaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text + 1, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) - Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaActual, 0, B4XPages.MainPage.tipo_venta) cuentaProds End If ' Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$) @@ -560,7 +562,7 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) If esteTag.Get(1) < New Then laCant.Text = esteTag.Get(1) If Not(Old = "0" And New = "") And etCantHasFocus Then ' Log(esteTag) - Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaActual, 0, B4XPages.MainPage.tipo_venta) cuentaProds End If ' Catch @@ -586,7 +588,7 @@ Private Sub et_pCant_FocusChanged (HasFocus As Boolean) Dim esteTag As List = Regex.Split("\|", laCant.Tag) Log(esteTag) Log(laCant.text) - Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaActual, 0, B4XPages.MainPage.tipo_venta) cuentaProds End If End Sub @@ -697,13 +699,13 @@ Sub terminarpromoesp c2 = B4XPages.MainPage.skmt.ExecQuery($"select * from ${Subs.traeTablaProds(tipo_venta)} WHERE CAT_GP_ID IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP)"$) If c2.RowCount > 0 Then c2.Position = 0 - Subs.guardaProducto(c2.GetString("CAT_GP_ID"), "0", 1,c2.GetString("CAT_GP_NOMBRE"), c2.GetString("CAT_GP_ID"), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.guardaProducto(c2.GetString("CAT_GP_ID"), "0", 1,c2.GetString("CAT_GP_NOMBRE"), c2.GetString("CAT_GP_ID"), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaActual, 0, B4XPages.MainPage.tipo_venta) c = B4XPages.MainPage.skmt.ExecQuery("select * from CAT_DETALLES_PAQ WHERE CAT_DP_ID IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP)") If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 c.Position = i Private pn As String = Subs.traeProdNombre(c.GetString("CAT_DP_IDPROD")) - Subs.guardaProducto(c2.GetString("CAT_GP_ID"), c.GetString("CAT_DP_PRECIO"), c.GetString("CAT_DP_PZAS"), pn, c.GetString("CAT_DP_IDPROD"), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + Subs.guardaProducto(c2.GetString("CAT_GP_ID"), c.GetString("CAT_DP_PRECIO"), c.GetString("CAT_DP_PZAS"), pn, c.GetString("CAT_DP_IDPROD"), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaActual, 0, B4XPages.MainPage.tipo_venta) Next End If c.Close diff --git a/B4A/Files/resdia.bal b/B4A/Files/resdia.bal index b6a4e0e95f24ba06f042bda1476e450478987f00..cef1c81fa3091c221f7e1e0d89328151a9078c18 100644 GIT binary patch delta 1264 zcmZ8gTS!z<6uoCs=+a=X*J*JKR}Rfh7SA8NQ+ zm*S1yhvDnDusf(Pc>v4tC=_OyvF}(My9+fs0!_I)P@e38a=?rNcO2Fpkg+>;9D1`R zvwNs3djN+!irq(Dse}B`M1G0~eL1_3dN>UG4?1BgvLZhx9ousS3VVcYsS%J}li6dO zK9`M}vk3y{iNJZnalB2r;~6&QX#-Ei06+8@5lzO83@hf$OlS3Cpk55z&!d5zZjJr( zVJ@yUR#em|h?%XR|HuaR0ycXr`3*^lXgun{*L-cWc?DuKs?;S|SOXp7Lqnm4_L8G% z6&N==Ns&w}I2Hx_aZxwEB9W(&jWv>!1p;E%EX9n%3#^eSPUPAd8~^K4ODsr%A2&~E z3_?#1F`x>2P3mToY6<*S*c-9vn-M&6hIB(sk%ll>q(^v*+SA!^9TM7Naf!A|vkoJW zmLs&eeJY)`2whr)F4e^z+$zkp*)QE*=C|E%l(LVuADF_mIN?5UJ-J$f8* z=G=T+v>nZH3T~*=@pN50>lC|oie23oJve(QjdJ`xVyfsl=v#WghF!(3Q3a2xHjBSF+8#$(%!oPrp8zbpQ55ruw v*$~7qt9T0L*UH8qI^o}Y=*HHhc(1#5A!EU)zv?h@0{ZeyZ!`5n8$Ow<&jP@@Q1SW!e2Wkw%rY3buf zHWdY(TG?hRq90}b$TZT-z7>t4Fswi;HSNRBz3;oZ`f(0t_r1?^&UyCS+K;NqQI%s# z%hb+k?RvFND@jsjVtQhRF*P|p1zCEd$5Gna_+)31-sFWIe}nU@fA&snk4{3~xdP-w zgtPm|4Gu&@#0skPTbGmW_M35>@>urW3X=E_yrlVQQF0)v1& za6vk&Ofa9Yux=D2q*7KutOo__5)pl26>_o?uskLlZ6^+3O}-yuPo^VylL^tMEeJU! z(>>yJ*9v_Z>lHk`Zk|5DlXp%7-4+vqi!Jaik};1t#yMV0pnmr%{jRy}HLGzZPm7t9 zT=oPVN1}Kx`2==WUT=VRptIO~BYUd!u%Wh8aN|p<1_4_a(|1<5k7PNB9cAI{xvP!O zbJ9JMVv!FejbOpCbxFu9x559s=-~6>zdIqvjW8e9;!sc=x?scEGI0;XWed@5)lo0H z!Cr}3%#}9ms*q>7UEw)PXH^{=6dDaG8*tQ+qP7j2t7TMswI|A6)53;@3Y1GyFmSOB z&o0PHj0m1#(fy5EiQQJ2=dM-e8Fnkdz4KN~@YVzQPMMqAB!T-2+4VAmqu!H2_KR=? zdoNhtd$4>^_Lz6ghDMpCq0y7YUc>z(`mj;KGU~zdQQ1O6K07F8S<@u5oNtTt7JR_2r7923fXRyf7mL0an$Lh*leur(d#3=_sXwD3vH#ltqa zli`xwX-v`0z5-lR4_HASzbgjN%~2J<`<>k6y9@3uh0JB zCv%h}`mCmqBri7;$MR07O^U%4dytAT?6oe# 0 Then + elCc.Position = 0 + idCliente = elCc.GetString("CUENTA") + Log("|"&elCc.GetString("CUENTA")&"|") End If + Log($"#########################${CRLF}HAY USUARIO EN CUENTAA: ${elCc.RowCount}${CRLF}#########################"$) If idCliente <> "" Then - c = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_CL_RUTA from kmt_info2 where CAT_CL_RUTA not in (select * from ruta_suplencia) and CAT_CL_CODIGO = '${idCliente}'"$) + Log(1) + c = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_CL_RUTA from kmt_info2 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)") End If -' Log(c.RowCount) + Log($"#########################${CRLF}ENCONTRAMOS RUTA EN KMT_INFO2: ${c.RowCount}${CRLF}#########################"$) If c.RowCount > 0 Then + Log(3) c.Position=0 r = c.GetString("CAT_CL_RUTA") End If @@ -685,6 +692,7 @@ Sub traeRuta As String 'ignore Catch Log(LastException) End Try + Log($"#########################${CRLF}RUTA ENCONTRADA: |${r}|${CRLF}#########################"$) Return r End Sub @@ -1714,4 +1722,21 @@ Sub traeTipoVentaDeBD As String End If ' Log(">>>>>>> " & tipoVenta) Return tipoVenta +End Sub + +'Guarda una variable en CAT_VARIABLES +Sub guardaVariable(nombre As String, valor As String) + B4XPages.MainPage.skmt.ExecNonQuery($"delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = '${nombre}'"$) + B4XPages.MainPage.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('${nombre}', '${valor}')"$) +End Sub + +'Regresa el valor de la variable especificada desde CAT_VARIABLES +Sub traeVariable(nombre As String) As String + Private valor As String = "" + Private laVc As Cursor = Starter.skmt.ExecQuery($"select CAT_VA_VALOR from CAT_VARIABLES where CAT_VA_DESCRIPCION = '${nombre}'"$) + If laVc.RowCount > 0 Then + laVc.Position = 0 + valor = laVc.GetString("CAT_VA_VALOR") + End If + Return valor End Sub \ No newline at end of file