cheveguerra/Guna_Preventa
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Guna_Preventa.git synced 2026-04-19 21:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- VERSION 4.10.28

Browse Source 
- Se corrigió el error de cuando se borraba un producto que estaba en promo y fuera de promo, se borraba todo el pedido.
- Se corrigió que cuando se hacia Back en Nota, se regresaba a Principal
This commit is contained in:
Jose Alberto Guerra Ugalde
2024-10-31 16:23:39 -06:00
parent 15a741c06e
commit 7057c92bb6
6 changed files with 78 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
B4A/C_Cliente.bas
View File

@@ -1946,6 +1946,8 @@ Private Sub B4XPage_CloseRequest As ResumableSub
Else if SV_ENCUESTA.Visible Then Else if SV_ENCUESTA.Visible Then
SV_ENCUESTA.visible = False SV_ENCUESTA.visible = False
p_cliente.Visible = True p_cliente.Visible = True
Else If B4XPages.MainPage.nota Then
Else Else
B4XPages.ShowPage("Clientes") B4XPages.ShowPage("Clientes")
End If End If

2
B4A/C_Historico.bas
View File

@@ -101,7 +101,7 @@ End Sub
Private Sub B4XPage_CloseRequest As ResumableSub Private Sub B4XPage_CloseRequest As ResumableSub
' BACK key pressed ' BACK key pressed
' Return True To close, False To cancel ' Return True To close, False To cancel
B4XPages.ShowPage("Principal") B4XPages.ShowPage("Cliente")
Return False Return False
End Sub End Sub

71
B4A/C_Nota.bas
View File

@@ -73,7 +73,7 @@ Sub B4XPage_Appear
C.Position=0 C.Position=0
Existe = C.GetString("EXISTE") Existe = C.GetString("EXISTE")
C.Close C.Close
c=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PRONOMBRE asc") c=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS desc")
ListView1.Clear ListView1.Clear
Private cs As CSBuilder Private cs As CSBuilder
If c.RowCount>0 Then If c.RowCount>0 Then
@@ -91,7 +91,7 @@ Sub B4XPage_Appear
label2 = ListView1.TwoLinesLayout.SecondLabel label2 = ListView1.TwoLinesLayout.SecondLabel
label2.TextSize = 10 label2.TextSize = 10
label2.TextColor = Colors.Blue label2.TextColor = Colors.Blue
ListView1.AddTwoLines(cs.Color(textColor).append(c.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c.GetString("PE_CANT")& " SubTotal $"& c.GetString("PE_COSTO_TOT")& " Folio "& c.GetString("PE_FOLIO")) ListView1.AddSingleLine(cs.Color(textColor).Size(12).append(c.GetString("PE_PRONOMBRE") & " ").pop.Append(CRLF).Size(8).Color(Colors.Blue).Append("Cantidad #"& c.GetString("PE_CANT")).Append(" SubTotal $"& c.GetString("PE_COSTO_TOT")).Append(" " & c.GetString("PE_FOLIO")& " " &c.GetString("PE_CEDIS")).PopAll)
folio = c.GetString("PE_FOLIO") folio = c.GetString("PE_FOLIO")
Next Next
End If End If
@@ -182,32 +182,57 @@ End Sub
Sub ListView1_ItemLongClick (Position As Int, Value As Object) Sub ListView1_ItemLongClick (Position As Int, Value As Object)
result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
If result = DialogResponse.POSITIVE Then If result = DialogResponse.POSITIVE Then
c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value)) Private X() As String = Regex.Split(" ", Value)
c.Position=0 Log(X)
' B4XPages.MainPage.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"))) Log(X.Length)
B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) Private nom As String = ""
c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from CAT_GUNAPROD where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value)) For i = 0 To X.Length -1
c2.Position=0 ' Log(X(i))
Log(c2.GetString("CUANTOS")) If X(i).Contains(CRLF) Then
If c2.GetString("CUANTOS") > 0 Then ' Log("Retorno")
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_PRONOMBRE = ?)",Array As String(Value))
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"), c.GetString("PE_FOLIO")))
Next
End If End If
j3.Close If Not(X(i).Contains(CRLF)) Then
nom = nom & " " & X(i)
Else
Exit
End If
' Log(nom)
Next
' Log(nom)
nom = nom.Trim
Private cedis As String = X(X.Length-1)
c=B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID,PE_CANT, PE_FOLIO, PE_CEDIS, PE_PRONOMBRE FROM PEDIDO where pe_pronombre = '${nom}' AND PE_CEDIS = '${cedis}' and pe_cliente in (Select CUENTA from cuentaa)"$)
Log($"select PE_PROID,PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO where pe_pronombre = '${nom}' AND PE_CEDIS = '${cedis}' and pe_cliente in (Select CUENTA from cuentaa)"$)
Log(c.RowCount)
c.Position=0
' If c.RowCount > 0 Then
' B4XPages.MainPage.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")))
B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
' c2=B4XPages.MainPage.skmt.ExecQuery($"select count(*) AS CUANTOS from CAT_GUNAPROD where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = '${nom}' and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$)'Con esto revisamos si el nombre es de una promo
' c2=B4XPages.MainPage.skmt.ExecQuery($"select ISNUMERIC(pe_cedis) AS noEsPromo from pedido where pe_pronombre = '${nom}' and pe_cliente in (Select CUENTA from cuentaa) and pe_cedis = '${cedis}'"$)'Con esto revisamos si el nombre es de una promo
' Log($"select count(*) AS CUANTOS from CAT_GUNAPROD where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = '${nom}' and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$)
' Log($"select ISNUMERIC(pe_cedis) AS noEsPromo from pedido where pe_pronombre = '${nom}' and pe_cliente in (Select CUENTA from cuentaa) and pe_cedis = '${cedis}'"$)
' c2.Position=0
' Log("Algo "&c2.GetString("noEsPromo"))
If Not(IsNumber(cedis)) Then
' 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_PRONOMBRE = ?)",Array As String(nom))
' Log(j3.RowCount)
' If j3.RowCount > 0 Then
Log("Soy promo")
' For j = 0 To c.RowCount -1
' Log("aqui tronare?")
'' c.Position = j
B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.GetString("PE_PROID")}'"$)
B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis= ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(cedis, c.GetString("PE_FOLIO")))
' Next
' End If
' j3.Close
Else Else
B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$)
B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, c.GetString("PE_FOLIO"))) B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cedis = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(nom, cedis, c.GetString("PE_FOLIO")))
End If End If
c.Close c.Close
c2.Close ' c2.Close
DateTime.DateFormat = "MM/dd/yyyy" DateTime.DateFormat = "MM/dd/yyyy"
sDate=DateTime.Date(DateTime.Now) sDate=DateTime.Date(DateTime.Now)
sTime=DateTime.Time(DateTime.Now) sTime=DateTime.Time(DateTime.Now)

2
B4A/C_Productos.bas
View File

@@ -537,7 +537,7 @@ Sub b_prodMas_Click
End Sub End Sub
Private Sub et_pCant_TextChanged (Old As String, New As String) Private Sub et_pCant_TextChanged (Old As String, New As String)
' LogColor($"txt changed: ${Old}|${New}, hasfocus=${etCantHasFocus}"$,Colors.Magenta) LogColor($"txt changed: ${Old}|${New}, hasfocus=${etCantHasFocus}"$,Colors.Magenta)
Try Try
Dim index As Int = clv_productos.GetItemFromView(Sender) Dim index As Int = clv_productos.GetItemFromView(Sender)
Dim pnl0 As B4XView = clv_productos.GetPanel(index) Dim pnl0 As B4XView = clv_productos.GetPanel(index)

44
B4A/Guna Vistas V3.1.b4a
View File

@@ -69,28 +69,29 @@ File7=carrito.png
File70=planfia_logo_old2.png File70=planfia_logo_old2.png
File71=principal.bal File71=principal.bal
File72=proditem.bal File72=proditem.bal
File73=productos.bal File73=proditem2.bal
File74=promociones.bal File74=productos.bal
File75=qr.bal File75=promociones.bal
File76=qr_gallina.jpg File76=qr.bal
File77=resdia.bal File77=qr_gallina.jpg
File78=ResDia.jpg File78=resdia.bal
File79=resdia20.png File79=ResDia.jpg
File8=celltitle.bal File8=celltitle.bal
File80=rojo.png File80=resdia20.png
File81=salma.jpg File81=rojo.png
File82=salma.png File82=salma.jpg
File83=seleccion.bal File83=salma.png
File84=senial.jpg File84=seleccion.bal
File85=sync.png File85=senial.jpg
File86=tache_rojo.png File86=sync.png
File87=telefonos.bal File87=tache_rojo.png
File88=Ticket dia.jpg File88=telefonos.bal
File89=ticketdia20.png File89=Ticket dia.jpg
File9=cliente.bal File9=cliente.bal
File90=ticketsdia.bal File90=ticketdia20.png
File91=Tiendita.jpg File91=ticketsdia.bal
File92=verde.png File92=Tiendita.jpg
File93=verde.png
FileGroup1=Default Group FileGroup1=Default Group
FileGroup10=Default Group FileGroup10=Default Group
FileGroup11=Default Group FileGroup11=Default Group
@@ -183,6 +184,7 @@ FileGroup9=Default Group
FileGroup90=Default Group FileGroup90=Default Group
FileGroup91=Default Group FileGroup91=Default Group
FileGroup92=Default Group FileGroup92=Default Group
FileGroup93=Default Group
Group=Default Group Group=Default Group
Library1=appupdating Library1=appupdating
Library10=firebaseadmob Library10=firebaseadmob
@@ -243,7 +245,7 @@ Module6=C_Cuestionario
Module7=C_Historico Module7=C_Historico
Module8=C_Mapas Module8=C_Mapas
Module9=C_Nota Module9=C_Nota
NumberOfFiles=92 NumberOfFiles=93
NumberOfLibraries=33 NumberOfLibraries=33
NumberOfModules=25 NumberOfModules=25
Version=12.8 Version=12.8

6
B4A/Guna Vistas V3.1.b4a.meta
View File

@@ -66,7 +66,7 @@ ModuleClosedNodes2=
ModuleClosedNodes20= ModuleClosedNodes20=
ModuleClosedNodes21= ModuleClosedNodes21=
ModuleClosedNodes22=3,4 ModuleClosedNodes22=3,4
ModuleClosedNodes23=2,3,4,5,6,7,8,9 ModuleClosedNodes23=3,4,5,6,7,8,9
ModuleClosedNodes24= ModuleClosedNodes24=
ModuleClosedNodes25= ModuleClosedNodes25=
ModuleClosedNodes3= ModuleClosedNodes3=
@@ -76,6 +76,6 @@ ModuleClosedNodes6=8,9,10,11
ModuleClosedNodes7= ModuleClosedNodes7=
ModuleClosedNodes8= ModuleClosedNodes8=
ModuleClosedNodes9= ModuleClosedNodes9=
NavigationStack=Subs,traeUsuarioDeBD,738,0,C_Productos,cuentaProds,617,0,Subs,revisaProdFueraDePromo,1691,6,Subs,traeTablaProds,1686,0,C_Productos,ponProdsEnCero,632,6,Starter,ENVIA_ULTIMA_GPS,104,0,Starter,GPS_LocationChanged,85,0,C_Nota,Class_Globals,25,0,C_Nota,B4XPage_CloseRequest,149,1,C_Nota,Regresar_Click,145,0,C_Nota,GPS_LocationChanged,140,0 NavigationStack=C_Productos,l_prodX_LongClick,717,0,Diseñador Visual,nota.bal,-100,4,C_Nota,borra_Click,174,0,C_Nota,ListView1_ItemLongClick,223,6,C_Nota,B4XPage_Appear,69,6,C_Productos,ponProdsEnCero,642,0,Subs,traeTablaProds,1681,0,Subs,revisaProdFueraDePromo,1699,0,C_Historico,Regresar_Click,91,0,C_Historico,B4XPage_CloseRequest,96,0,C_Historico,B4XPage_Appear,84,0
SelectedBuild=0 SelectedBuild=0
VisibleModules=2,23,24,4,5,13,14,9,10 VisibleModules=23,24,4,5,13,14,25,9,19,10,7