diff --git a/Files/fila.bal b/Files/fila.bal index c1af4b1..edc036b 100644 Binary files a/Files/fila.bal and b/Files/fila.bal differ diff --git a/Files/info_gral.bal b/Files/info_gral.bal index bd14033..9e8be1c 100644 Binary files a/Files/info_gral.bal and b/Files/info_gral.bal differ diff --git a/Files/intmex_logo_192x192.jpg b/Files/intmex_logo_192x192.jpg new file mode 100644 index 0000000..8b31f85 Binary files /dev/null and b/Files/intmex_logo_192x192.jpg differ diff --git a/Files/login.bal b/Files/login.bal index 4ea61d5..1427d2b 100644 Binary files a/Files/login.bal and b/Files/login.bal differ diff --git a/Files/seleccion.bal b/Files/seleccion.bal index 122f720..e3c1327 100644 Binary files a/Files/seleccion.bal and b/Files/seleccion.bal differ diff --git a/fila.bas b/fila.bas index e421f63..5f07edc 100644 --- a/fila.bas +++ b/fila.bas @@ -84,6 +84,16 @@ Sub Globals Dim CREDITO As String Private p_principal As Panel Private B_PASO2 As Button + Dim almacen As String + Dim fechaprev As String + Dim rutaprev As String + Dim rutarep As String + Dim montopagare As String + Private b_cancred As Button + Private b_acred As Button + Private et_montoacredito As EditText + Private l_limite As Label + Private p_credito As Panel End Sub Sub Activity_Create(FirstTime As Boolean) @@ -173,6 +183,7 @@ Sub Activity_Resume ' g.Start(0,0) ' End If Subs.centraPanel(p_principal, Activity.Width) + Subs.centraPanel(p_credito, Activity.Width) Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) c=Starter.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_BCREDITO from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") s=Starter.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)") @@ -256,6 +267,71 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) End Sub Sub gest_Click + If CREDITO = 1 Then + Msgbox2Async("Forma de pago","EL CLIENTE PUEDE TENER CREDITO","Parcial","Total","Efectivo",LoadBitmap(File.DirAssets,"alert2.png"),False) + Wait For Msgbox_Result (Result As Int) + If Result= DialogResponse.POSITIVE Then + Log(1) + p_credito.Visible = True + 'monto + c=Starter.skmt.ExecQuery("select sum(HVD_COSTO_TOT) AS MONTO from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND HVD_RECHAZO = 0 AND HVD_PARCIAL = 0") + c.Position = 0 + montopagare = c.GetString("MONTO") + c.Close + l_limite.Text = "Monto de la venta: $" & montopagare + Else If Result = DialogResponse.NEGATIVE Then + Log(2) + Guardado + Else If Result = DialogResponse.CANCEL Then + Log(3) + DateTime.DateFormat = "dd/MM/yyyy" + DateTime.TimeFormat = "HH:mm:ss" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + 'cliente + c=Starter.skmt.ExecQuery("select CUENTA from cuentaa") + c.Position = 0 + cuenta = c.GetString("CUENTA") + c.Close + 'usuario + c=Starter.skmt.ExecQuery("select usuario from usuarioa") + c.Position = 0 + usuario = c.GetString("USUARIO") + c.Close + 'Almacen + c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") + c.Position = 0 + almacen = c.GetString("ID_ALMACEN") + c.Close + 'FECHA PREVENTA + c=Starter.skmt.ExecQuery("select HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + c.Position = 0 + fechaprev = c.GetString("HVD_FECHA") + c.Close + 'RUTAPREVENTA + c=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + c.Position = 0 + rutaprev = c.GetString("CAT_CL_RUTA") + c.Close + 'RUTA rep + c=Starter.skmt.ExecQuery("select RUTAA from RUTAA") + c.Position = 0 + rutarep = c.GetString("RUTAA") + c.Close + 'monto + c=Starter.skmt.ExecQuery("select sum(HVD_COSTO_TOT) AS MONTO from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND HVD_RECHAZO = 0 AND HVD_PARCIAL = 0") + c.Position = 0 + montopagare = c.GetString("MONTO") + c.Close + Starter.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA_REP, PA_RUTAPREV, PA_FECHA_PREV, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?,?) ", Array As Object (almacen,rutarep,rutaprev,fechaprev,(sDate),montopagare,usuario,cuenta)) + Guardado + End If + Else + Guardado + End If +End Sub + +Sub Guardado DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) @@ -297,6 +373,7 @@ Sub DATOS_Click End Sub Sub Guardar_Click + StartActivity(seleccion) End Sub @@ -514,4 +591,52 @@ Sub B_PASO2_Click Starter.skmt.ExecNonQuery("DELETE FROM NOVENTA WHERE NV_CLIENTE IN (select cuenta from cuentaa)") Starter.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE, NV_FECHA, NV_USER, NV_MOTIVO, NV_COMM, NV_LAT, NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta, sDate & sTime, usuario, "PASO", "PASO ESPERA", Main.lat_gps, Main.lon_gps)) StartActivity(seleccion) +End Sub + +Private Sub b_acred_Click + If et_montoacredito.Text > montopagare Then + MsgboxAsync("El monto del pagare no puede ser mayor a la venta","Atención") + Else + DateTime.DateFormat = "dd/MM/yyyy" + DateTime.TimeFormat = "HH:mm:ss" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + 'cliente + c=Starter.skmt.ExecQuery("select CUENTA from cuentaa") + c.Position = 0 + cuenta = c.GetString("CUENTA") + c.Close + 'usuario + c=Starter.skmt.ExecQuery("select usuario from usuarioa") + c.Position = 0 + usuario = c.GetString("USUARIO") + c.Close + 'Almacen + c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") + c.Position = 0 + almacen = c.GetString("ID_ALMACEN") + c.Close + 'FECHA PREVENTA + c=Starter.skmt.ExecQuery("select HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + c.Position = 0 + fechaprev = c.GetString("HVD_FECHA") + c.Close + 'RUTAPREVENTA + c=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + c.Position = 0 + rutaprev = c.GetString("CAT_CL_RUTA") + c.Close + 'RUTA rep + c=Starter.skmt.ExecQuery("select RUTAA from RUTAA") + c.Position = 0 + rutarep = c.GetString("RUTAA") + c.Close + Starter.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA_REP, PA_RUTAPREV, PA_FECHA_PREV, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?,?) ", Array As Object (almacen,rutarep,rutaprev,fechaprev,(sDate),et_montoacredito.Text,usuario,cuenta)) + p_credito.Visible = False + Guardado + End If +End Sub + +Private Sub b_cancred_Click + p_credito.Visible = False End Sub \ No newline at end of file diff --git a/intmex_reparto.b4a b/intmex_reparto.b4a index 5524bd6..eb7954d 100644 --- a/intmex_reparto.b4a +++ b/intmex_reparto.b4a @@ -6,34 +6,35 @@ File12=guna_viejo.png File13=guna_viejo2.png File14=info_gral.bal File15=infonavit1.jpg -File16=itembuttonblue.png -File17=kelloggs.png -File18=keymon_logo.png -File19=kmt.db +File16=intmex_logo_192x192.jpg +File17=itembuttonblue.png +File18=kelloggs.png +File19=keymon_logo.png File2=alerta.jpg -File20=login.bal -File21=LOGO SANFER.jpg -File22=Logo.jpg -File23=logo_exitus1.jpg -File24=Malo.jpg -File25=mapa.bal -File26=mapa_cliente.bal -File27=mapa_rutas.bal -File28=nopago.bal -File29=nuevocliente.bal +File20=kmt.db +File21=login.bal +File22=LOGO SANFER.jpg +File23=Logo.jpg +File24=logo_exitus1.jpg +File25=Malo.jpg +File26=mapa.bal +File27=mapa_cliente.bal +File28=mapa_rutas.bal +File29=nopago.bal File3=buscar.bal -File30=pedido.bal -File31=planfia_logo.png -File32=planfia_logo_old.png -File33=planfia_logo_old2.png -File34=productos.bal -File35=profina.jpg -File36=PROFINA.png -File37=seleccion.bal -File38=sync.png -File39=tarjeta.bal +File30=nuevocliente.bal +File31=pedido.bal +File32=planfia_logo.png +File33=planfia_logo_old.png +File34=planfia_logo_old2.png +File35=productos.bal +File36=profina.jpg +File37=PROFINA.png +File38=seleccion.bal +File39=sync.png File4=dbc.png -File40=telefonos.bal +File40=tarjeta.bal +File41=telefonos.bal File5=detalle_promo.bal File6=durakelo1.png File7=engrane.jpg @@ -74,6 +75,7 @@ FileGroup38=Default Group FileGroup39=Default Group FileGroup4=Default Group FileGroup40=Default Group +FileGroup41=Default Group FileGroup5=Default Group FileGroup6=Default Group FileGroup7=Default Group @@ -126,15 +128,15 @@ Module6=DBRequestManager Module7=detalle_promo Module8=fila Module9=foto -NumberOfFiles=40 +NumberOfFiles=41 NumberOfLibraries=22 NumberOfModules=23 -Version=12.5 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex-Reparto #VersionCode: 1 - #VersionName: 4.05.19 + #VersionName: 4.05.22 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -224,6 +226,7 @@ Sub Activity_Create(FirstTime As Boolean) ' Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) ' LogColor("Revisamos BD RUTAA", Colors.Magenta) Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") + Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PAGARES (PA_ALMACEN TEXT, PA_RUTA_REP TEXT, PA_RUTAPREV TEXT, PA_FECHA_PREV TEXT, PA_CAPTURA TEXT, PA_MONTO TEXT, PA_USUARIO TEXT, PA_CLIENTE TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)") Dim server As String = "http://187.189.244.154:1781" ' Dim server As String = "http://11.0.0.107:1781" diff --git a/intmex_reparto.b4a.meta b/intmex_reparto.b4a.meta index 061d896..62000d0 100644 --- a/intmex_reparto.b4a.meta +++ b/intmex_reparto.b4a.meta @@ -56,7 +56,7 @@ ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17= -ModuleClosedNodes18=3,6,7,8,9 +ModuleClosedNodes18=6,7,8,9 ModuleClosedNodes19=3,4,5,6,7,8 ModuleClosedNodes2= ModuleClosedNodes20= @@ -68,8 +68,8 @@ ModuleClosedNodes4= ModuleClosedNodes5=2,3 ModuleClosedNodes6= ModuleClosedNodes7= -ModuleClosedNodes8=2,7,11 +ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=nopago,cb_reprogramar_CheckedChange,124,0,nopago,GUARDA_Click,80,0,seleccion,JobDone,798,0,Diseñador Visual,nopago.bal,-100,4,Diseñador Visual,seleccion.bal,-100,1,seleccion,Activity_Create,102,0,seleccion,Activity_Resume,246,0,seleccion,Subir_Click,451,6,seleccion,cargar_Click,559,0,Main,Activity_Create,94,3 +NavigationStack=seleccion,e_ruta_EnterPressed,1051,0,fila,ListView1_ItemLongClick,247,0,fila,Guardado,274,0,fila,b_cancred_Click,588,4,Main,Activity_Create,93,0,fila,b_acred_Click,627,2,fila,gest_Click,319,6,Diseñador Visual,seleccion.bal,-100,4,seleccion,Subir_Click,492,6 SelectedBuild=0 VisibleModules=19,23,20,18,4,5,8,15,6,9 diff --git a/seleccion.bas b/seleccion.bas index ae2bfa3..69d0ea1 100644 --- a/seleccion.bas +++ b/seleccion.bas @@ -474,12 +474,64 @@ Sub Subir_Click Next End If r.Close + + 'PAGARES. + Dim pa As Cursor =Starter.skmt.ExecQuery("select * from PAGARES") + If pa.RowCount > 0 Then + For pag = 0 To pa.RowCount - 1 + pa.Position = pag + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_reparto_PAGARES_INTMEX2" + Dim fechaenvio() As String + fechaenvio = Regex.Split(" ",pa.GetString("PA_FECHA_PREV")) +' Log(fechaenvio(0)) + Dim fechaenvio1() As String + fechaenvio1 = Regex.Split("/",fechaenvio(0)) + Dim fechaano As String = fechaenvio1(2).SubString(2) + Dim fechareal As String = fechaenvio1(0)&"/"&fechaenvio1(1)&"/"&fechaano +' Log(fechareal) + + Dim fechacap() As String + fechacap = Regex.Split("/",pa.GetString("PA_CAPTURA")) + Dim fechacapano As String = fechacap(2).SubString(2) + Dim fechacapreal As String = fechacap(0)&"/"&fechacap(1)&"/"&fechacapano + + cmd.Parameters = Array As Object(pa.GetString("PA_CLIENTE"),pa.GetString("PA_MONTO"),fechacapreal,pa.GetString("PA_ALMACEN"),pa.GetString("PA_RUTAPREV"),pa.GetString("PA_RUTA_REP"),fechareal,pa.GetString("PA_USUARIO")) + reqManager.ExecuteCommand(cmd , "ins_pagares") + Next + End If + pa.Close 'd.Position=0 'cuantos_pedido = D.GetString("CUANTOS_PEDIDO") 'd.Close ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True) End Sub +'Private Sub ImageView1_LongClick +' 'PAGARES. +' Dim pa As Cursor =Starter.skmt.ExecQuery("select * from PAGARES") +' If pa.RowCount > 0 Then +' For pag = 0 To pa.RowCount - 1 +' pa.Position = pag +'' Dim cmd As DBCommand +'' cmd.Initialize +'' cmd.Name = "insert_reparto_PAGARES_INTMEX2" +' Dim fechaenvio() As String +' fechaenvio = Regex.Split(" ",pa.GetString("PA_FECHA_PREV")) +' Log(fechaenvio(0)) +' Dim fechaenvio1() As String +' fechaenvio1 = Regex.Split("/",fechaenvio(0)) +' Dim fechaaño As String = fechaenvio1(2).SubString(2) +' Dim fechareal As String = fechaenvio1(0)&"/"&fechaenvio1(1)&"/"&fechaaño +' Log(fechareal) +' +'' cmd.Parameters = Array As Object(pa.GetString("PA_CLIENTE"),pa.GetString("PA_MONTO"),pa.GetString("PA_CAPTURA"),pa.GetString("PA_ALMACEN"),pa.GetString("PA_RUTAPREV"),pa.GetString("PA_RUTA_REP"),,pa.GetString("PA_USUARIO")) +'' reqManager.ExecuteCommand(cmd , "ins_pagares") +' Next +' End If +'End Sub + Sub cargar_Click ' img2.Visible =True EJECUTANDO = 1 @@ -1045,6 +1097,7 @@ Sub e_ruta_EnterPressed e_ruta.Text = "" Starter.skmt.ExecNonQuery("delete from pedido_cliente") + Starter.skmt.ExecNonQuery("delete from PAGARES") Starter.skmt.ExecNonQuery("delete from pedido") Starter.skmt.ExecNonQuery("delete from noventa") Starter.skmt.ExecNonQuery("delete from clie_act") @@ -1202,4 +1255,5 @@ End Sub Private Sub Panel1_Click -End Sub \ No newline at end of file +End Sub +