diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 4dd751d..b97f422 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -181,6 +181,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) 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)") Subs.agregaColumna("HIST_ENCUESTA", "HE_LAT", "TEXT") + Subs.agregaColumna("PEDIDO", "PE_RECALCULO", "TEXT") + Subs.agregaColumna("PEDIDO", "PE_RECALCULOTOT", "TEXT") Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "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'") diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 0609daa..ab0756e 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -487,45 +487,6 @@ Sub B4XPage_Appear skmt.Initialize(ruta,"kmt.db", True) reqManager.Initialize(Me, Starter.server) - 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 FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") - s.Position=0 - If c.RowCount > 0 Then - c.Position=0 - la_cuenta.Text = c.GetString("CAT_CL_CODIGO") - la_cuenta_gallina.Text = c.GetString("CAT_CL_CODIGO") - La_nombre.Text = c.GetString("CAT_CL_NOMBRE") - la_Calle.Text = c.GetString("CAT_CL_CALLE") & " " & c.GetString("CAT_CL_NOEXT") - la_col.Text = c.GetString("CAT_CL_COLONIA") - la_edo.Text = c.GetString("CAT_CL_EDO") - l_entre1.Text = c.GetString("CAT_CL_CALLE1") - l_entre2.Text = c.GetString("CAT_CL_CALLE2") - l_atiende.Text = c.GetString("CAT_CL_ATIENDE1") - l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2") - TELEFONO = c.GetString("CAT_CL_TELEFONO") - l_total.Text = s.GetString("TOTAL_CLIE") - total_cliente = s.GetString("TOTAL_CLIE") - m_lat = "0" - If c.GetString("CAT_CL_LAT") <> "" Then m_lat =c.GetString("CAT_CL_LAT") - If m_lat.Length < 5 Then m_lat = "0" - m_lon = "0" - If c.GetString("CAT_CL_LONG") <> "" Then m_lon =c.GetString("CAT_CL_LONG") - If m_lon.Length < 5 Then m_lon = "0" - LA_RUTA = c.GetString("CAT_CL_RUTA") - ' ESTO ES PARA FORZAR A PEDIR LA FOTO Y EL GPS - If c.GetString("CAT_CL_NUM_SERIEFISICO") = "0" Then - L_QR.TEXT = "SIN CODIGO" - L_QR.TextColor = Colors.Red - If ALMACEN <> "32" And ALMACEN <> "33" And ALMACEN <> 6 Then gest.VISIBLE = True And Tels.Visible = True - BT_QR.Visible = True - Else - L_QR.TEXT = c.GetString("CAT_CL_NUM_SERIEFISICO") - L_QR.TextColor = Colors.Blue - BT_QR.Visible = False - End If - 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.Position =0 @@ -681,7 +642,7 @@ Sub B4XPage_Appear B_IMP.Visible = False End If ' Log(distance) - If (ALMACEN = "32" Or ALMACEN = "33") And distance > 100 Then + If (ALMACEN = "32" Or ALMACEN = "33" Or ALMACEN = "87") And distance > 100 Then gest.Visible = False Tels.Visible = False ' ToastMessageShow("aaa", False) @@ -689,38 +650,195 @@ Sub B4XPage_Appear ' Log(Subs.InvSuficientePromoEsp) ' Log(Subs.traemontoprod) - - If Subs.traemontoprod And Subs.InvSuficientePromoEsp And Not(Subs.vendidoPromoEsp) Then - Msgbox2Async("El cliente tiene derecho a una promo por la compra de mas de $120 en productos Helmanns, Maizena y/o Knorr" , "Promo disponible", "Aceptar", "", "", LoadBitmap(File.DirAssets,"alert2.png"), False) - Wait For Msgbox_Result (resultado As Int) - If resultado = DialogResponse.POSITIVE Then - B4XPages.MainPage.productos.terminarpromoesp + If ALMACEN = 32 Then + If Subs.traemontoprod And Subs.InvSuficientePromoEsp And Not(Subs.vendidoPromoEsp) Then + Msgbox2Async("El cliente tiene derecho a una promo por la compra de mas de $120 en productos Helmanns, Maizena y/o Knorr" , "Promo disponible", "Aceptar", "", "", LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + B4XPages.MainPage.productos.terminarpromoesp + End If + Else End If - Else + If Not(Subs.traemontoprod) And Subs.vendidoPromoEsp Then + Private j3 As Cursor + Log("SI PROMO") + j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PROID = ?)",Array As String("PROUNI01")) + Log(j3.RowCount) + If j3.RowCount = 0 Then + Log("estoy aqui") + For i = 0 To j3.RowCount -1 + Log("aqui tronare?") + j3.Position = i + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(j3.GetString("PE_PRONOMBRE"), "PREVENTA")) + Next + End If + j3.Close + Else + End If End If -' If Not(Subs.traemontoprod) And Subs.vendidoPromoEsp Then -' Private j3 As Cursor -' -' Log("SI PROMO") -' j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PROID = ?)",Array As String("PROUNI01")) -' Log(j3.RowCount) -' If j3.RowCount = 0 Then -' Log("estoy aqui") -' For i = 0 To j3.RowCount -1 -' Log("aqui tronare?") -' j3.Position = i -' B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) -' B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(j3.GetString("PE_PRONOMBRE"), "PREVENTA")) -' Next -' End If -' j3.Close -' -' Log("BOR") -' Else -' -' End If + If ALMACEN = 87 Or ALMACEN = 6 Then + If Subs.traemontoprod Then + Msgbox2Async("El cliente tiene derecho a un descuento de 150 pesos por la compra de mas de $500 en productos Productos participantes" , "Descuento disponible", "Aceptar", "", "", LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + + Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT SUM(PE_CANT) AS PIEZAS FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA)") + If c.RowCount > 0 Then + c.Position = 0 + Private des As Float = NumberFormat2(150/c.GetString("PIEZAS"),0,2,2,False) + Log( NumberFormat2(des,0,2,2,False)) + Private c2 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT Ifnull(SUM(PE_CANT),0) AS PE_CANT FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU < ?",Array As String(des)) + If c2.RowCount > 0 Then + c2.Position = 0 + Log(c2.GetString("PE_CANT")) + + End If + + Private c3 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT SUM(PE_CANT) AS PE_CANT FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU > ?",Array As String(des)) + If c3.RowCount > 0 Then + c3.Position = 0 + Log(c3.GetString("PE_CANT")) + Private rec As Float = (des * c2.GetString("PE_CANT"))/c3.GetString("PE_CANT") + Log( NumberFormat2(rec,0,2,2,False)) + Private cantres As Float = des + rec + Log( NumberFormat2(cantres,0,2,2,False)) + + Private c4 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU > ?",Array As String(des)) + If c4.RowCount > 0 Then + For i = 0 To c4.RowCount -1 + c4.Position = i + Private recalculo As Float = c4.GetString("PE_COSTOU") - NumberFormat2(cantres,0,2,2,False) + Private recalculototal As Float = c4.GetString("PE_CANT") * NumberFormat2(recalculo,0,2,2,False) + Log(recalculo&"|||||"&recalculototal) + B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ? WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_PROID = ? ",Array As String(NumberFormat2(recalculo,0,2,2,False) ,NumberFormat2(recalculototal,0,2,2,False), c4.GetString("PE_PROID"))) + + Next + End If + End If + End If + + End If + c.Close + c2.Close + c3.Close + c4.Close + End If + + If Not(Subs.traemontoprod) Then + + Private c4 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND (PE_RECALCULO <> ? OR PE_RECALCULO <> ?)",Array As String("null",Null)) + If c4.RowCount > 0 Then + For i = 0 To c4.RowCount -1 + c4.Position = i +' Private recalculo As Float = c4.GetString("PE_COSTOU") - NumberFormat2(cantres,0,2,2,False) +' Private recalculototal As Float = c4.GetString("PE_CANT") * NumberFormat2(recalculo,0,2,2,False) +' Log(recalculo&"|||||"&recalculototal) + B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ? WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_PROID = ? ",Array As String("","",c4.GetString("PE_PROID"))) + + Next + End If + + Log("AQUI ESTOY") + + Else + End If + End If + + 'AQUI CAMBIAR + Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",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_info 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 = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",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 <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + s5.Position = 0 + If c.RowCount > 0 Then + c.Position=0 + la_cuenta.Text = c.GetString("CAT_CL_CODIGO") + la_cuenta_gallina.Text = c.GetString("CAT_CL_CODIGO") + La_nombre.Text = c.GetString("CAT_CL_NOMBRE") + la_Calle.Text = c.GetString("CAT_CL_CALLE") & " " & c.GetString("CAT_CL_NOEXT") + la_col.Text = c.GetString("CAT_CL_COLONIA") + la_edo.Text = c.GetString("CAT_CL_EDO") + l_entre1.Text = c.GetString("CAT_CL_CALLE1") + l_entre2.Text = c.GetString("CAT_CL_CALLE2") + l_atiende.Text = c.GetString("CAT_CL_ATIENDE1") + l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2") + TELEFONO = c.GetString("CAT_CL_TELEFONO") + l_total.Text = s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE") + total_cliente = s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE") + m_lat = "0" + If c.GetString("CAT_CL_LAT") <> "" Then m_lat =c.GetString("CAT_CL_LAT") + If m_lat.Length < 5 Then m_lat = "0" + m_lon = "0" + If c.GetString("CAT_CL_LONG") <> "" Then m_lon =c.GetString("CAT_CL_LONG") + If m_lon.Length < 5 Then m_lon = "0" + LA_RUTA = c.GetString("CAT_CL_RUTA") + ' ESTO ES PARA FORZAR A PEDIR LA FOTO Y EL GPS + If c.GetString("CAT_CL_NUM_SERIEFISICO") = "0" Then + L_QR.TEXT = "SIN CODIGO" + L_QR.TextColor = Colors.Red + If ALMACEN <> "32" And ALMACEN <> "33" And ALMACEN <> 6 Then gest.VISIBLE = True And Tels.Visible = True + BT_QR.Visible = True + Else + L_QR.TEXT = c.GetString("CAT_CL_NUM_SERIEFISICO") + L_QR.TextColor = Colors.Blue + BT_QR.Visible = False + End If + End If + 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_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)") + s.Position=0 + If c.RowCount > 0 Then + c.Position=0 + la_cuenta.Text = c.GetString("CAT_CL_CODIGO") + la_cuenta_gallina.Text = c.GetString("CAT_CL_CODIGO") + La_nombre.Text = c.GetString("CAT_CL_NOMBRE") + la_Calle.Text = c.GetString("CAT_CL_CALLE") & " " & c.GetString("CAT_CL_NOEXT") + la_col.Text = c.GetString("CAT_CL_COLONIA") + la_edo.Text = c.GetString("CAT_CL_EDO") + l_entre1.Text = c.GetString("CAT_CL_CALLE1") + l_entre2.Text = c.GetString("CAT_CL_CALLE2") + l_atiende.Text = c.GetString("CAT_CL_ATIENDE1") + l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2") + TELEFONO = c.GetString("CAT_CL_TELEFONO") + Log(s.GetString("TOTAL_CLIE")) + l_total.Text = s.GetString("TOTAL_CLIE") + total_cliente = s.GetString("TOTAL_CLIE") + m_lat = "0" + If c.GetString("CAT_CL_LAT") <> "" Then m_lat =c.GetString("CAT_CL_LAT") + If m_lat.Length < 5 Then m_lat = "0" + m_lon = "0" + If c.GetString("CAT_CL_LONG") <> "" Then m_lon =c.GetString("CAT_CL_LONG") + If m_lon.Length < 5 Then m_lon = "0" + LA_RUTA = c.GetString("CAT_CL_RUTA") + ' ESTO ES PARA FORZAR A PEDIR LA FOTO Y EL GPS + If c.GetString("CAT_CL_NUM_SERIEFISICO") = "0" Then + L_QR.TEXT = "SIN CODIGO" + L_QR.TextColor = Colors.Red + If ALMACEN <> "32" And ALMACEN <> "33" And ALMACEN <> 6 Then gest.VISIBLE = True And Tels.Visible = True + BT_QR.Visible = True + Else + L_QR.TEXT = c.GetString("CAT_CL_NUM_SERIEFISICO") + L_QR.TextColor = Colors.Blue + BT_QR.Visible = False + End If + End If + c.Close + s.Close + End If + 'AQUI TERMINA + End Sub @@ -763,7 +881,7 @@ Sub GPS_LocationChanged (Location1 As Location) End If End If - If ALMACEN = "32" Or ALMACEN = "33" Then + If ALMACEN = "32" Or ALMACEN = "33" Or ALMACEN = "87" Then If distance < 100 Then LA_GEO.TextColor = Colors.Blue Tels.Visible = True @@ -1722,10 +1840,41 @@ Sub Guardar_Click 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.Position=0 + + 'AQUI CAMBIAR + Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + LogColor(s3.RowCount,Colors.Yellow) + If s3.RowCount > 0 Then + + + Private s As Cursor=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 = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",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 <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + s5.Position = 0 + + + Private suma As Float = s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE") + + + + + s.Close + + + Else If s3.RowCount = 0 Then + Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("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)") + s.Position=0 + + Private suma As Float = s.GetString("TOTAL_CLIE") + + s.Close + End If + 'AQUI TERMINA + If c.GetString("CUANTOS") > 0 Then 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"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) + 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_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End If c.Close diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 6c24525..eee9cbc 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -105,6 +105,36 @@ Sub B4XPage_Appear c.Position=0 DESC = c.GetString("DESCUENTO") b_desc.Visible = False + + 'AQUI CAMBIAR + Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + LogColor(s3.RowCount,Colors.Yellow) + If s3.RowCount > 0 Then + + + Private s As Cursor=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 = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",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 <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + s5.Position = 0 + + + L_TOTAL.Text = s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE") + + + + s.Close + + + Else If s3.RowCount = 0 Then + Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("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)") + s.Position=0 + + L_TOTAL.Text = s.GetString("TOTAL_CLIE") + + s.Close + End If + 'AQUI TERMINA + End If End Sub diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index dfea5c6..c451e67 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -571,7 +571,7 @@ Sub Subir_Click Next End If c.Close - c=B4XPages.MainPage.skmt.ExecQuery("SELECT 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") + c=B4XPages.MainPage.skmt.ExecQuery2("SELECT 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 WHERE PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",Null)) d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO") If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -587,6 +587,23 @@ Sub Subir_Click d.Position=0 cuantos_pedido = D.GetString("CUANTOS_PEDIDO") d.Close + + c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,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 WHERE PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO") + If c.RowCount>0 Then + For i=0 To c.RowCount -1 + c.Position=i + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_pedido_GV2" + cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), ALMACEN, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), 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") + Next + End If + c.Close + d.Position=0 + cuantos_pedido = D.GetString("CUANTOS_PEDIDO") + d.Close 'CUESTIONARIO c = B4XPages.MainPage.skmt.ExecQuery($"select * from cuestionario"$) @@ -851,7 +868,7 @@ Sub cargar_Click cmd.Parameters = Array As Object(ALMACEN) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp") - If ALMACEN = 32 Or ALMACEN = 6 Then + If ALMACEN = 32 Then 'Or ALMACEN = 6 cmd.Initialize cmd.Name = "select_cat_promoesp_GUNA" @@ -860,6 +877,15 @@ Sub cargar_Click End If + If ALMACEN = 87 Or ALMACEN = 6 Then + + cmd.Initialize + cmd.Name = "select_cat_promoesp_GUNA2" + cmd.Parameters = Array As Object(ALMACEN) + B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "promoesp") + + End If + cmd.Initialize cmd.Name = "select_cat_paquetess_GV2" cmd.Parameters = Array As Object(ALMACEN) @@ -2152,6 +2178,35 @@ Sub resdia_Click l_monto_ks.Text = "0" End If c.Close + + 'AQUI CAMBIAR + Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + LogColor(s3.RowCount,Colors.Yellow) + If s3.RowCount > 0 Then + + + Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",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_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null)) + s5.Position = 0 + + + L_REAL.Text = s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE") + + + + s.Close + + + Else If s3.RowCount = 0 Then + Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO ") + s.Position=0 + + L_REAL.Text = s.GetString("TOTAL_CLIE") + + s.Close + End If + Dim cuantos_obj As String c=B4XPages.MainPage.skmt.ExecQuery("Select count(*) AS TOTAL from HIST_MARCAS_CUOTAS ") c.Position = 0 @@ -2170,7 +2225,7 @@ Sub resdia_Click End If c.Close End If - L_REAL.Text = l_monto_ks.Text +' L_REAL.Text = l_monto_ks.Text L_ALCANCE.Text = Round2((L_NES.Text / L_REAL.Text + 1),2) L_VPLAN.Text = l_porvisitar.Text L_VREAL.Text = L_CUANTOST.text diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index f4aa44c..db25ce4 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -60,6 +60,35 @@ Sub B4XPage_Appear If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i + + 'AQUI CAMBIAR + Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ? and PE_CLIENTE = ?",Array As String("","null",Null,c.GetString("PC_CLIENTE"))) + LogColor(s3.RowCount,Colors.Yellow) + If s3.RowCount > 0 Then + + + Private s As Cursor=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 = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ? and PE_CLIENTE = ?",Array As String("","null",Null,c.GetString("PC_CLIENTE"))) + 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 <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ? and PE_CLIENTE = ?",Array As String("","null",Null,c.GetString("PC_CLIENTE"))) + s5.Position = 0 + + + Private suma As Float =NumberFormat2( s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False) + + + + s.Close + + + Else If s3.RowCount = 0 Then + Private s As Cursor=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 = ?",Array As String(c.GetString("PC_CLIENTE"))) + s.Position=0 + + Private suma As Float = NumberFormat2( s.GetString("TOTAL_CLIE"),0,2,2,False) + + s.Close + End If + Dim label1 As Label label1 = ListView1.TwoLinesLayout.Label label1.TextSize = 15 @@ -68,7 +97,7 @@ Sub B4XPage_Appear label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 10 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& NumberFormat2(suma,0,2,2,False)) Next End If c.Close diff --git a/B4A/Files/datoscliente.bal b/B4A/Files/datoscliente.bal new file mode 100644 index 0000000..d122f9f Binary files /dev/null and b/B4A/Files/datoscliente.bal differ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index 982f9d9..96cfd42 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -190,7 +190,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna V3.1 #VersionCode: 1 - #VersionName: 4.06.29.E + #VersionName: 4.07.10.E_PR2 '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 7c4cbc9..579ecbd 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -53,7 +53,7 @@ ModuleClosedNodes1=5,7,8,9,10,11,12,13,14 ModuleClosedNodes10= ModuleClosedNodes11= ModuleClosedNodes12=6 -ModuleClosedNodes13=2,3,8,10,14 +ModuleClosedNodes13=2,8,10,14 ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= @@ -67,12 +67,12 @@ ModuleClosedNodes22=1 ModuleClosedNodes23= ModuleClosedNodes24= ModuleClosedNodes3= -ModuleClosedNodes4=12,13,14,15,16 +ModuleClosedNodes4=12,14,15,16 ModuleClosedNodes5=7 ModuleClosedNodes6=6,8,9,10 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,lv_promos_ItemLongClick,650,6,Subs,procesaPromocion,906,0,Diseñador Visual,productos.bal,-100,1,Subs,traeMaxPromos,877,0,C_Productos,lv_promos_ItemClick,246,2,Subs,traePromoIdDeBD,1119,0,Subs,traePromo,762,0,C_Principal,cargar_Click,843,0,C_Cliente,B4XPage_Appear,696,6,C_Productos,lv_catalogos_ItemClick,146,1 +NavigationStack=Diseñador Visual,resdia.bal,-100,1,C_TicketsDia,Class_Globals,0,0,C_Productos,Class_Globals,0,0,C_TicketsDia,B4XPage_Appear,97,6,C_Cliente,B_ACEPTA_GALLINA_Click,3148,0,C_Nota,B4XPage_Appear,102,5,C_Principal,resdia_Click,2176,3,C_Cliente,Guardar_Click,1868,6,C_Principal,cargar_Click,873,0,C_Cliente,B4XPage_Appear,638,6,C_Cliente,GPS_LocationChanged,877,0 SelectedBuild=0 -VisibleModules=22,2,23,13,14,4,6,9,12,5 +VisibleModules=22,2,23,13,14,4,6,9,12,5,16