From a1c4dc0bcd096a9c30d1209d1bb07d5974997636 Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Tue, 14 Nov 2023 11:25:22 -0600 Subject: [PATCH] Cambio doe --- B4A/C_Cliente.bas | 142 ++++++++++++++++++++++++++++------------ B4A/C_Nota.bas | 12 ++-- B4A/C_TicketsDia.bas | 30 +++++++-- B4A/KelloggsV3.b4a | 2 +- B4A/KelloggsV3.b4a.meta | 4 +- 5 files changed, 135 insertions(+), 55 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 67dc97d..0dc9dfd 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -765,7 +765,7 @@ Sub GPS_LocationChanged (Location1 As Location) Else existenciaspromo = 0 End If - Log(existenciaspromo) +' Log(existenciaspromo) ' If pgs_boton_noventa = "1" Then Tels.Visible = True ' Log(clienteConPromo) If gps_boton_doe = "1" And clienteConPromo = "0" Then b_whats.Visible = True @@ -3920,57 +3920,115 @@ Private Sub b_aceptarrpomo_Click ' l_promowhats.Text = c.GetString("CAT_CL_NOMBRE") ' End If ' c.Close - sDate=DateTime.Date(DateTime.Now) - sTime=DateTime.Time(DateTime.Now) - c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa") - c.Position=0 - clie_id = c.GetString("CUENTA") - c.Close - c=Starter.skmt.ExecQuery("select USUARIO from usuarioa") - c.Position=0 - usuario = c.GetString("USUARIO") - c.Close - c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") - If c.RowCount>0 Then - C.Position=0 - Id_Almacen = C.GetString("ID_ALMACEN") - End If - c.Close - - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_PROMO_WHATS VALUES (?,?)", Array As Object(l_promowhats.Text, "PROMO ACEPTADA")) + Private almadoe As Cursor = Starter.skmt.ExecQuery("SELECT ID_ALMACEN FROM CAT_ALMaCEN") + almadoe.Position = 0 + LogColor(almadoe.GetString("ID_ALMACEN"),Colors.Blue) + If almadoe.GetString("ID_ALMACEN") = "3" Then - Starter.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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DOE", "PDOE100123",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) - Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN CHOCO 236ML", "1008027226",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) - Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN VAINILLA 236ML", "1008027230",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) - Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN NUEZ 236ML", "1008027228",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) - Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE CHOCO MELVIN 236ML", "1008013799",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa") + c.Position=0 + clie_id = c.GetString("CUENTA") + c.Close + c=Starter.skmt.ExecQuery("select USUARIO from usuarioa") + c.Position=0 + usuario = c.GetString("USUARIO") + c.Close + c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") + If c.RowCount>0 Then + C.Position=0 + Id_Almacen = C.GetString("ID_ALMACEN") + End If + c.Close + + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_PROMO_WHATS VALUES (?,?)", Array As Object(l_promowhats.Text, "PROMO ACEPTADA")) + + Starter.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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DOE", "PDOE100123",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.02 , 0.01, 2, "LECHE ALL BRAN CHOCO 236ML", "1008027226",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN NUEZ 236ML", "1008027228",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE CHOCO MELVIN 236ML", "1008013799",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) - Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027226")) - Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027230")) - Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027228")) - Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799")) + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("2", "1008027226")) + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027228")) + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799")) - c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") - c.Position=0 - Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) - Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN"))) + c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") + c.Position=0 + Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) + Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN"))) - Starter.skmt.ExecNonQuery("delete from pedido3") - Starter.skmt.ExecNonQuery("UPDATE PEDIDO SET PE_FOLIO = 0 where PE_FOLIO IS NULL") - Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO ) SELECT PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, SUM(PE_COSTO_TOT) AS PE_COSTO_TOT, PE_COSTOU, SUM(PE_CANT) As PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2, PE_TIPO, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTOU, PE_PRONOMBRE, PE_PROID, PE_CLIENTE ") 'Mod por CHV - 220302 - Agregué PE_FECHA al select/insert + Starter.skmt.ExecNonQuery("delete from pedido3") + Starter.skmt.ExecNonQuery("UPDATE PEDIDO SET PE_FOLIO = 0 where PE_FOLIO IS NULL") + Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO ) SELECT PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, SUM(PE_COSTO_TOT) AS PE_COSTO_TOT, PE_COSTOU, SUM(PE_CANT) As PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2, PE_TIPO, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTOU, PE_PRONOMBRE, PE_PROID, PE_CLIENTE ") 'Mod por CHV - 220302 - Agregué PE_FECHA al select/insert ' starter.skmt.ExecNonQuery2("INSERT INTO") - p_promowhats.Visible = False - P_INF_GENERAL.Visible = True - c.Close - b_whats.Visible = False - Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS where HCCP_CLIENTE IN (Select cuenta from cuentaa)") - B4XPage_Appear + p_promowhats.Visible = False + P_INF_GENERAL.Visible = True + c.Close + b_whats.Visible = False + Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS where HCCP_CLIENTE IN (Select cuenta from cuentaa)") + B4XPage_Appear + + Else + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa") + c.Position=0 + clie_id = c.GetString("CUENTA") + c.Close + c=Starter.skmt.ExecQuery("select USUARIO from usuarioa") + c.Position=0 + usuario = c.GetString("USUARIO") + c.Close + c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") + If c.RowCount>0 Then + C.Position=0 + Id_Almacen = C.GetString("ID_ALMACEN") + End If + c.Close + + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_PROMO_WHATS VALUES (?,?)", Array As Object(l_promowhats.Text, "PROMO ACEPTADA")) + + Starter.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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DOE", "PDOE100123",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN CHOCO 236ML", "1008027226",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN VAINILLA 236ML", "1008027230",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN NUEZ 236ML", "1008027228",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + Starter. 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,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE CHOCO MELVIN 236ML", "1008013799",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0)) + + + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027226")) + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027230")) + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027228")) + Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799")) + + + + + c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") + c.Position=0 + Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) + Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN"))) + + Starter.skmt.ExecNonQuery("delete from pedido3") + Starter.skmt.ExecNonQuery("UPDATE PEDIDO SET PE_FOLIO = 0 where PE_FOLIO IS NULL") + Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO ) SELECT PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, SUM(PE_COSTO_TOT) AS PE_COSTO_TOT, PE_COSTOU, SUM(PE_CANT) As PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2, PE_TIPO, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTOU, PE_PRONOMBRE, PE_PROID, PE_CLIENTE ") 'Mod por CHV - 220302 - Agregué PE_FECHA al select/insert + +' starter.skmt.ExecNonQuery2("INSERT INTO") + p_promowhats.Visible = False + P_INF_GENERAL.Visible = True + c.Close + b_whats.Visible = False + Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS where HCCP_CLIENTE IN (Select cuenta from cuentaa)") + B4XPage_Appear + End If + almadoe.Close End Sub Private Sub b_rechazapromo_Click diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index a92efdf..3bd8abb 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -235,14 +235,14 @@ Sub borra_Click If folio = "0" Then 'Si el folio es 0 o el cliente actual es "abordo", los deja borrar. - Mod por CHV 220512 poner esto para dejar borrar abordo "Or Subs.clienteActual = "0"" result = Msgbox2("Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore If result = DialogResponse.POSITIVE Then - c=Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_TIPO FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") + c=Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_TIPO, PE_CEDIS FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i TIPO = c.GetString("PE_TIPO") - If c.GetString("PE_TIPO") = "VENTA" Then + If c.GetString("PE_TIPO") = "VENTA" And c.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) - Else + Else If c.GetString("PE_TIPO") = "ABORDO" Then Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) End If Next @@ -272,12 +272,12 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) If c.GetString("PE_FOLIO") = "0" Or Subs.clienteActual = "0" Then result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore If result = DialogResponse.POSITIVE Then - c=Starter.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_TIPO FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS <> ? ", Array As String(Value, "DOE")) + c=Starter.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_TIPO, PE_CEDIS FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND (PE_CEDIS <> ? or PE_CEDIS <> ?)", Array As String(Value, "DOE","DUR")) c.Position=0 TIPO = c.GetString("PE_TIPO") - If c.GetString("PE_TIPO") = "VENTA" Then + If c.GetString("PE_TIPO") = "VENTA" And c.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) - Else + Else If c.GetString("PE_TIPO") = "ABORDO" Then Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) End If c.Close diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index 51c8127..b676315 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -13,6 +13,7 @@ Sub Class_Globals Dim b_noventa As Button Dim nombre_boton As String Dim cursorprueba As Cursor + End Sub 'You can add more parameters here. @@ -60,24 +61,30 @@ Sub B4XPage_Appear label1.TextColor = Colors.Black Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 13 + label2.TextSize = 10 label2.TextColor = Colors.Black cursorprueba = Starter.skmt.ExecQuery2("select PE_COSTO_TOT from pedido where PE_CEDIS <> PE_PROID and pe_cliente = ? AND PE_CEDIS <> ?", Array As String(c.GetString("PC_CLIENTE"),"DOE")) - For i= 0 To cursorprueba.RowCount -1 - cursorprueba.Position = i + For x= 0 To cursorprueba.RowCount -1 + cursorprueba.Position = x ' LogColor(cursorprueba.GetString("PE_COSTO_TOT"),Colors.Red) sumatotal = sumatotal + cursorprueba.GetString("PE_COSTO_TOT") sumatotal = NumberFormat2(sumatotal, 0, 2, 2, False) ' Log(NumberFormat2(sumatotal, 0, 2, 2, False)) +' Log("estoy aqui") Next cursorprueba.Close - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cant. #"& c.GetString("PC_NOART")& " SubTotal $"& sumatotal) + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) +' LogColor(i, Colors.Red) Next End If c.Close + + + Log("Sali") + c.Close End Sub Sub Regresar_Click @@ -122,6 +129,7 @@ Sub b_noventa_Click Next End If Else + Dim sumatotal As Double = 0 nombre_boton = "NOVENTA" b_noventa.Text ="NO VENTA" c=Starter.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") @@ -137,7 +145,21 @@ Sub b_noventa_Click label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 10 label2.TextColor = Colors.Black + + cursorprueba = Starter.skmt.ExecQuery2("select PE_COSTO_TOT from pedido where PE_CEDIS <> PE_PROID and pe_cliente = ? AND PE_CEDIS <> ?", Array As String(c.GetString("PC_CLIENTE"),"DOE")) + For x= 0 To cursorprueba.RowCount -1 + cursorprueba.Position = x +' LogColor(cursorprueba.GetString("PE_COSTO_TOT"),Colors.Red) + sumatotal = sumatotal + cursorprueba.GetString("PE_COSTO_TOT") + sumatotal = NumberFormat2(sumatotal, 0, 2, 2, False) + +' Log(NumberFormat2(sumatotal, 0, 2, 2, False)) +' Log("estoy aqui") + Next + cursorprueba.Close + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) +' LogColor(i, Colors.Red) Next End If c.Close diff --git a/B4A/KelloggsV3.b4a b/B4A/KelloggsV3.b4a index 6282df9..4a08e5e 100644 --- a/B4A/KelloggsV3.b4a +++ b/B4A/KelloggsV3.b4a @@ -176,7 +176,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 3.11.11 RMI + #VersionName: 3.11.12 RMI #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV3.b4a.meta b/B4A/KelloggsV3.b4a.meta index 60bce5d..3f95095 100644 --- a/B4A/KelloggsV3.b4a.meta +++ b/B4A/KelloggsV3.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_TicketsDia,Regresar_Click,79,0,C_TicketsDia,B4XPage_Appear,59,0,C_Cliente,B_IMP_Click,1000,6,C_Cliente,B_IMP2_YYY_Click,1953,0,C_Cliente,b_mapa_Click,926,0,C_Cliente,B_IMP2_Click,1991,6,C_Cliente,B_IMP2_ZZZ_Click,1475,0,Visual Designer,cliente.bal,-100,2,B4XMainPage,JobDone,456,0,C_Cliente,B4XPage_CloseRequest,810,0,C_Cliente,b_geopass_Click,4045,0 +NavigationStack=C_NoVenta,Class_Globals,0,0,C_Nota,GPS_LocationChanged,211,0,C_Nota,borra_Click,244,2,C_Nota,Activity_KeyPress,224,0,C_Cliente,Mods,0,0,C_Cliente,P_BOLETA_Click,3896,0,C_Cliente,B4XPage_Appear,667,0,C_Cliente,BP_DOE_A_Click,4064,0,C_Cliente,GPS_LocationChanged,761,0,C_Cliente,b_aceptarrpomo_Click,3916,6,C_Cliente,b_whats_Click,3903,0 SelectedBuild=0 -VisibleModules=1,2,3,4,5,6,7,8,9,10,12,14 +VisibleModules=1,2,3,4,5,6,7,8,9,10