From 50047c06555f9051b3974212c44118c6ee711349 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 19 Jan 2026 15:56:25 -0600 Subject: [PATCH] .... --- B4A/B4XMainPage.bas | 2 +- B4A/C_Cliente.bas | 342 ++++++++++++++++++---------------- B4A/C_Productos.bas | 4 +- B4A/Guna Vistas V3.1.b4a | 2 +- B4A/Guna Vistas V3.1.b4a.meta | 4 +- 5 files changed, 183 insertions(+), 171 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index b3dd0a2..4738390 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -1041,7 +1041,7 @@ Sub revisaActualizacion 'Parte de la funcionalidad "appUpdater" End If End Try Else - LogColor("appUpdater(), Job Failed " & link & CRLF & LastException.Message, Colors.Red) +' LogColor("appUpdater(), Job Failed " & link & CRLF & LastException.Message, Colors.Red) If Msgbox2("Es necesaria una conexión a internet, por favor revise su conexión y vuelva a intentar", "ATENCIÓN", "OK", "", "", Null) = DialogResponse.POSITIVE Then 'Ignore ExitApplication End If diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index db31bf7..f6478ff 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -55,7 +55,7 @@ Sub Class_Globals Dim Label11 As Label Dim Tar As Button - + Dim t1, t2 As Timer Dim la_comm As Label Dim la_actdte As Label Dim la_usuario As Label @@ -469,7 +469,7 @@ Sub Class_Globals Private p_deuda As Panel Private Label22 As Label Private l_animal As Label - private contIguales as int = 0 + Private contIguales As Int = 0 End Sub 'You can add more parameters here. @@ -1277,6 +1277,9 @@ Sub B4XPage_Appear l_animal.Color = Colors.Transparent Label22.Color = Colors.Transparent End If + +' t1.Initialize("T1", 10000) ' 1000 = 1 second +' t1.Enabled = True End Sub Sub MejorarPrecisionGPS As ResumableSub @@ -1359,9 +1362,15 @@ End Sub Private Sub LA_GPS_Click ' Cuando el usuario toca el label de GPS MejorarPrecisionGPS + ToastMessageShow("Mejorando precisión GPS...", False) End Sub +'Sub t1_tick +' MejorarPrecisionGPS +' t1.Enabled = True +'End Sub + ' En lugar de 100m y 50m, usar valores más amplios temporalmente Private Sub RevisarGeocerca ' Dim distanciaAlmacen As Int = distancealm ' Tu cálculo actual @@ -2947,7 +2956,7 @@ Sub Impresion3 ' c.Position = 0 ' sucursal = c.GetString("CAT_VA_VALOR") ' c.Close - + Public Const eLINEFEED As String = "" & Chr(0x0D) & Chr(0x0A) ProgressDialogShow("Imprimiendo, un momento ...") Printer1.DisConnect If Not(Printer1.IsConnected) Then @@ -2979,46 +2988,46 @@ Sub Impresion3 TAMANO = 0 ESPACIO = 21 BLANCO = " " - Dim bmp As Bitmap - bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore - Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) - - myimage = Printer1.DitherImage2D(myimage, 128) - - myimage= Printer1.PackImage(myimage) - Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening - Printer1.WriteString(Printer1.REVERSE) - - Printer1.PrintImage(myimage) - Printer1.WriteString(Printer1.UNREVERSE) +' Dim bmp As Bitmap +' bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore +' Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) +' +' myimage = Printer1.DitherImage2D(myimage, 128) +' +' myimage= Printer1.PackImage(myimage) +' Printer1.WriteString(eLINEFEED) ' nudge the printer to show the user something is happening +' Printer1.WriteString(Printer1.REVERSE) +' +' Printer1.PrintImage(myimage) +' Printer1.WriteString(Printer1.UNREVERSE) 'Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) -' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) - Printer1.WriteString("RFC: DRT-110316-9J1" & CRLF) -' Printer1.WriteString(sucursal & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) - Printer1.WriteString("Vendedor:" & usuario & CRLF) - Printer1.WriteString("Tienda: " & La_nombre.Text & CRLF) - Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & CRLF) - Printer1.WriteString("Calle: " & la_Calle.Text & CRLF) - Printer1.WriteString("Colonia: " & la_col.Text & CRLF) -' Printer1.WriteString("C.P.: " & la_cp.Text & CRLF) - Printer1.WriteString("Entre calle1: " & l_entre1.Text & CRLF) - Printer1.WriteString("Entre Calle2: " & l_entre2.Text & CRLF) +' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & eLINEFEED) + Printer1.WriteString("RFC: DRT-110316-9J1" & eLINEFEED) +' Printer1.WriteString(sucursal & eLINEFEED) + Printer1.WriteString(sDate & eLINEFEED) + Printer1.WriteString(sTime & eLINEFEED) + Printer1.WriteString("Vendedor:" & usuario & eLINEFEED) + Printer1.WriteString("Tienda: " & La_nombre.Text & eLINEFEED) + Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & eLINEFEED) + Printer1.WriteString("Calle: " & la_Calle.Text & eLINEFEED) + Printer1.WriteString("Colonia: " & la_col.Text & eLINEFEED) +' Printer1.WriteString("C.P.: " & la_cp.Text & eLINEFEED) + Printer1.WriteString("Entre calle1: " & l_entre1.Text & eLINEFEED) + Printer1.WriteString("Entre Calle2: " & l_entre2.Text & eLINEFEED) - Printer1.WriteString("-----------PREVENTA-----------" & CRLF) + Printer1.WriteString("-----------PREVENTA-----------" & eLINEFEED) ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, IFNULL(PE_RECALCULO,0) AS PE_RECALCULO, length(PE_COSTOU) as L_COSTOU, length(Ifnull(PE_RECALCULO,0)) as L_COSTOREC, PE_CANT * PE_COSTOU AS PE_COSTO_TOT, PE_CANT * IFNULL(PE_RECALCULO,0) AS PE_COSTO_TOTREC, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT, length(PE_CANT * IFNULL(PE_RECALCULO,0)) as L_COSTO_TOTREC, PE_PROID, PE_CEDIS, PE_RECCANT FROM PEDIDO WHERE PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String(Subs.traeAlmacen)) If S.RowCount>0 Then For i=0 To S.RowCount -1 S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) Else - If s.GetDouble("PE_RECALCULO") = 0 Then - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) + If s.GetInt("PE_RECALCULO") = 0 Then + Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3028,12 +3037,12 @@ Sub Impresion3 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF& CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED& eLINEFEED ) TAMANO = 0 ESPACIO = 21 BLANCO = " " - Else if s.GetDouble("PE_CANT") = s.GetDouble("PE_RECCANT") Then - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) + Else if s.GetInt("PE_CANT") = s.GetInt("PE_RECCANT") Then + Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOREC") + TAMANO TAMANO = s.GetLong("L_COSTO_TOTREC") + TAMANO @@ -3047,14 +3056,17 @@ Sub Impresion3 Dim descpro As Cursor = Starter.skmt.ExecQuery($"SELECT CAT_PD_RANGO, CAT_PD_DESCUENTO, CAT_PD_RANGO2 FROM CAT_PROMOS_DESCUENTOS WHERE CAT_PD_PRODUCTO IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD WHERE CAT_GP_NOMBRE = '${s.GetString("PE_PRONOMBRE")}') AND INSTR(',' || CAT_PD_TIER || ',' , ',${Subs.traeTipoCliente},') > 0 "$) descpro.Position = 0 - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_RECALCULO") & " $" & s.GETSTRING("PE_COSTO_TOTREC") & CRLF & CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_RECALCULO") & " $" & s.GETSTRING("PE_COSTO_TOTREC") & eLINEFEED & eLINEFEED ) - Printer1.WriteString(BLANCO & "PL $" & s.GETSTRING("PE_COSTOU") & " Desc.: " & descpro.GetDouble("CAT_PD_DESCUENTO")&"%" & CRLF & CRLF) + Printer1.WriteString(BLANCO & "PL $" & s.GETSTRING("PE_COSTOU") & " Desc.: " & descpro.GetDouble("CAT_PD_DESCUENTO")&"%" & eLINEFEED & eLINEFEED) TAMANO = 0 ESPACIO = 21 BLANCO = " " - Else if s.GetDouble("PE_CANT") <> s.GetDouble("PE_RECCANT") Then - Printer1.WriteString(s.GetString("PE_RECCANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) + Else if s.GetInt("PE_CANT") <> s.GetInt("PE_RECCANT") Then + Log(s.GetInt("PE_RECCANT")) + Log(s.GetInt("PE_CANT")) + Log("aqui") + Printer1.WriteString(s.GetString("PE_RECCANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOREC") + TAMANO TAMANO = s.GetLong("L_COSTO_TOTREC") + TAMANO @@ -3069,8 +3081,8 @@ Sub Impresion3 Dim descpro As Cursor = Starter.skmt.ExecQuery($"SELECT CAT_PD_RANGO, CAT_PD_DESCUENTO, CAT_PD_RANGO2 FROM CAT_PROMOS_DESCUENTOS WHERE CAT_PD_PRODUCTO IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD WHERE CAT_GP_NOMBRE = '${s.GetString("PE_PRONOMBRE")}') AND INSTR(',' || CAT_PD_TIER || ',' , ',${Subs.traeTipoCliente},') > 0 "$) descpro.Position = 0 - Printer1.WriteString(BLANCO & s.GETSTRING("PE_RECCANT") & " X $" & s.GETSTRING("PE_RECALCULO") & " $" & NumberFormat2((s.GETSTRING("PE_RECCANT") * s.GETSTRING("PE_RECALCULO")),1,2,2,False) & CRLF & CRLF ) - Printer1.WriteString(BLANCO & "PL $" & s.GETSTRING("PE_COSTOU") & " Desc.: " & descpro.GetDouble("CAT_PD_DESCUENTO")&"%" & CRLF & CRLF) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_RECCANT") & " X $" & s.GETSTRING("PE_RECALCULO") & " $" & NumberFormat2((s.GETSTRING("PE_RECCANT") * s.GETSTRING("PE_RECALCULO")),1,2,2,False) & eLINEFEED & eLINEFEED ) + Printer1.WriteString(BLANCO & "PL $" & s.GETSTRING("PE_COSTOU") & " Desc.: " & descpro.GetDouble("CAT_PD_DESCUENTO")&"%" & eLINEFEED & eLINEFEED) Private subTot As String = (s.GETSTRING("PE_CANT")-s.GETSTRING("PE_RECCANT")) * s.GETSTRING("PE_COSTOU") TAMANO = s.GetLong("L_CANT") + TAMANO @@ -3083,8 +3095,8 @@ Sub Impresion3 BLANCO = " " & BLANCO Next ' Sin decuento - Printer1.WriteString((s.GETSTRING("PE_CANT")-s.GETSTRING("PE_RECCANT")) & " " & s.GetString("PE_PRONOMBRE") & CRLF) - Printer1.WriteString(BLANCO & (s.GETSTRING("PE_CANT")-s.GETSTRING("PE_RECCANT")) & " X $" & s.GETSTRING("PE_COSTOU") & " $" & NumberFormat2(subTot,1,2,2,False) & CRLF & CRLF ) + Printer1.WriteString((s.GETSTRING("PE_CANT")-s.GETSTRING("PE_RECCANT")) & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) + Printer1.WriteString(BLANCO & (s.GETSTRING("PE_CANT")-s.GETSTRING("PE_RECCANT")) & " X $" & s.GETSTRING("PE_COSTOU") & " $" & NumberFormat2(subTot,1,2,2,False) & eLINEFEED & eLINEFEED ) TAMANO = 0 @@ -3095,18 +3107,18 @@ Sub Impresion3 Next End If s.Close - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) s=skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE LENGTH(PE_CEDIS) > 3 AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU") If S.RowCount>0 Then - Printer1.WriteString("------------PROMOS------------" & CRLF) + Printer1.WriteString("------------PROMOS------------" & eLINEFEED) For i=0 To S.RowCount -1 S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) Else - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3116,13 +3128,13 @@ Sub Impresion3 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) TAMANO = 0 ESPACIO = 21 BLANCO = " " End If Next - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) End If s.Close @@ -3131,12 +3143,12 @@ Sub Impresion3 ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If - Printer1.WriteString("Subtotal Preventa: $" & s.GetString("TOTAL") & CRLF) -' Printer1.WriteString("Subtotal Preventa: $" & Subs.calculaTotalConPromoXRango(Subs.traeCliente) & CRLF) + Printer1.WriteString("Subtotal Preventa: $" & s.GetString("TOTAL") & eLINEFEED) +' Printer1.WriteString("Subtotal Preventa: $" & Subs.calculaTotalConPromoXRango(Subs.traeCliente) & eLINEFEED) c= skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") C.Position=0 - Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & CRLF) + Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & eLINEFEED) c.Close Dim s3 As Cursor =skmt.ExecQuery("select IFNULL(SUM(PE_COSTO_TOT),0) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and IFNULL(PE_RECALCULO,0) = 0") s3.Position =0 @@ -3145,24 +3157,24 @@ Sub Impresion3 If NumberFormat2((s3.GetString("TOTAL") + S2.GetString("TOTAL")),0,2,2,False) <> s.GetString("TOTAL") Then - Printer1.WriteString("Descuento: $" & NumberFormat2( (s.GetString("TOTAL") - Subs.calculaTotalConPromoXRango(Subs.traeCliente)),0,2,2,False)& CRLF) + Printer1.WriteString("Descuento: $" & NumberFormat2( (s.GetString("TOTAL") - Subs.calculaTotalConPromoXRango(Subs.traeCliente)),0,2,2,False)& eLINEFEED) End If ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If -' Printer1.WriteString("Descuento: $" & 150 & CRLF) -' Printer1.WriteString("Total Preventa: $" & NumberFormat2((s3.GetString("TOTAL") + S2.GetString("TOTAL")),0,2,2,False)& CRLF) - Printer1.WriteString("Total Preventa: $" & NumberFormat2(Subs.calculaTotalConPromoXRango(Subs.traeCliente),0,2,2,False)& CRLF) +' Printer1.WriteString("Descuento: $" & 150 & eLINEFEED) +' Printer1.WriteString("Total Preventa: $" & NumberFormat2((s3.GetString("TOTAL") + S2.GetString("TOTAL")),0,2,2,False)& eLINEFEED) + Printer1.WriteString("Total Preventa: $" & NumberFormat2(Subs.calculaTotalConPromoXRango(Subs.traeCliente),0,2,2,False)& eLINEFEED) - Printer1.WriteString(" " & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString("ENTREGA EN :" & CRLF) - Printer1.WriteString(la_Calle.Text & CRLF) - Printer1.WriteString("----ESTE TICKET NO ES UN -----" & CRLF) - Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & CRLF) - Printer1.WriteString("--------INFORMATIVO-----------" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString("ENTREGA EN :" & eLINEFEED) + Printer1.WriteString(la_Calle.Text & eLINEFEED) + Printer1.WriteString("----ESTE TICKET NO ES UN -----" & eLINEFEED) + Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & eLINEFEED) + Printer1.WriteString("--------INFORMATIVO-----------" & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) Sleep(1000) Printer1.DisConnect @@ -3185,7 +3197,7 @@ Sub Impresion2 ' c.Position = 0 ' sucursal = c.GetString("CAT_VA_VALOR") ' c.Close - + Public Const eLINEFEED As String = "" & Chr(0x0D) & Chr(0x0A) ProgressDialogShow("Imprimiendo, un momento ...") Printer1.DisConnect If Not(Printer1.IsConnected) Then @@ -3217,47 +3229,47 @@ Sub Impresion2 TAMANO = 0 ESPACIO = 21 BLANCO = " " - Dim bmp As Bitmap - bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore - Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) - - myimage = Printer1.DitherImage2D(myimage, 128) - - myimage= Printer1.PackImage(myimage) - Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening - Printer1.WriteString(Printer1.REVERSE) - - Printer1.PrintImage(myimage) - Printer1.WriteString(Printer1.UNREVERSE) +' Dim bmp As Bitmap +' bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore +' Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) +' +' myimage = Printer1.DitherImage2D(myimage, 128) +' +' myimage= Printer1.PackImage(myimage) +' Printer1.WriteString(eLINEFEED) ' nudge the printer to show the user something is happening +' Printer1.WriteString(Printer1.REVERSE) +' +' Printer1.PrintImage(myimage) +' Printer1.WriteString(Printer1.UNREVERSE) 'Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) -' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) - Printer1.WriteString("RFC: DRT-110316-9J1" & CRLF) -' Printer1.WriteString(sucursal & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) - Printer1.WriteString("Vendedor:" & usuario & CRLF) - Printer1.WriteString("Tienda: " & La_nombre.Text & CRLF) - Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & CRLF) - Printer1.WriteString("Calle: " & la_Calle.Text & CRLF) - Printer1.WriteString("Colonia: " & la_col.Text & CRLF) -' Printer1.WriteString("C.P.: " & la_cp.Text & CRLF) - Printer1.WriteString("Entre calle1: " & l_entre1.Text & CRLF) - Printer1.WriteString("Entre Calle2: " & l_entre2.Text & CRLF) +' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & eLINEFEED) + Printer1.WriteString("RFC: DRT-110316-9J1" & eLINEFEED) +' Printer1.WriteString(sucursal & eLINEFEED) + Printer1.WriteString(sDate & eLINEFEED) + Printer1.WriteString(sTime & eLINEFEED) + Printer1.WriteString("Vendedor:" & usuario & eLINEFEED) + Printer1.WriteString("Tienda: " & La_nombre.Text & eLINEFEED) + Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & eLINEFEED) + Printer1.WriteString("Calle: " & la_Calle.Text & eLINEFEED) + Printer1.WriteString("Colonia: " & la_col.Text & eLINEFEED) +' Printer1.WriteString("C.P.: " & la_cp.Text & eLINEFEED) + Printer1.WriteString("Entre calle1: " & l_entre1.Text & eLINEFEED) + Printer1.WriteString("Entre Calle2: " & l_entre2.Text & eLINEFEED) - Printer1.WriteString("-----------PREVENTA-----------" & CRLF) + Printer1.WriteString("-----------PREVENTA-----------" & eLINEFEED) ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS <> ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("DUR")) If S.RowCount>0 Then For i=0 To S.RowCount -1 S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) Else - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3267,7 +3279,7 @@ Sub Impresion2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) TAMANO = 0 ESPACIO = 21 BLANCO = " " @@ -3275,18 +3287,18 @@ Sub Impresion2 Next End If s.Close - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) s=skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE LENGTH(PE_CEDIS) > 3 AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU") If S.RowCount>0 Then - Printer1.WriteString("------------PROMOS------------" & CRLF) + Printer1.WriteString("------------PROMOS------------" & eLINEFEED) For i=0 To S.RowCount -1 S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) Else - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3296,13 +3308,13 @@ Sub Impresion2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) TAMANO = 0 ESPACIO = 21 BLANCO = " " End If Next - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) End If s.Close @@ -3311,29 +3323,29 @@ Sub Impresion2 ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If - Printer1.WriteString("Subtotal Preventa: $" & s.GetString("TOTAL") & CRLF) + Printer1.WriteString("Subtotal Preventa: $" & s.GetString("TOTAL") & eLINEFEED) s.Close c= skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") C.Position=0 - Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & CRLF) + Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & eLINEFEED) c.Close s=skmt.ExecQuery("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") s.Position =0 ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If - Printer1.WriteString("Descuento: $" & 150 & CRLF) - Printer1.WriteString("Total Preventa: $" & (s.GetString("TOTAL") -150 )& CRLF) + Printer1.WriteString("Descuento: $" & 150 & eLINEFEED) + Printer1.WriteString("Total Preventa: $" & (s.GetString("TOTAL") -150 )& eLINEFEED) - Printer1.WriteString(" " & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString("ENTREGA EN :" & CRLF) - Printer1.WriteString(la_Calle.Text & CRLF) - Printer1.WriteString("----ESTE TICKET NO ES UN -----" & CRLF) - Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & CRLF) - Printer1.WriteString("--------INFORMATIVO-----------" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString("ENTREGA EN :" & eLINEFEED) + Printer1.WriteString(la_Calle.Text & eLINEFEED) + Printer1.WriteString("----ESTE TICKET NO ES UN -----" & eLINEFEED) + Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & eLINEFEED) + Printer1.WriteString("--------INFORMATIVO-----------" & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) Sleep(1000) Printer1.DisConnect @@ -3356,7 +3368,7 @@ Sub Impresion ' c.Position = 0 ' sucursal = c.GetString("CAT_VA_VALOR") ' c.Close - + Public Const eLINEFEED As String = "" & Chr(0x0D) & Chr(0x0A) ProgressDialogShow("Imprimiendo, un momento ...") Printer1.DisConnect If Not(Printer1.IsConnected) Then @@ -3388,36 +3400,36 @@ Sub Impresion TAMANO = 0 ESPACIO = 21 BLANCO = " " - Dim bmp As Bitmap - bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore - Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) - - myimage = Printer1.DitherImage2D(myimage, 128) - - myimage= Printer1.PackImage(myimage) - Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening - Printer1.WriteString(Printer1.REVERSE) - - Printer1.PrintImage(myimage) - Printer1.WriteString(Printer1.UNREVERSE) +' Dim bmp As Bitmap +' bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore +' Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) +' +' myimage = Printer1.DitherImage2D(myimage, 128) +' +' myimage= Printer1.PackImage(myimage) +' Printer1.WriteString(eLINEFEED) ' nudge the printer to show the user something is happening +' Printer1.WriteString(Printer1.REVERSE) +' +' Printer1.PrintImage(myimage) +' Printer1.WriteString(Printer1.UNREVERSE) 'Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) -' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) - Printer1.WriteString("RFC: DRT-110316-9J1" & CRLF) -' Printer1.WriteString(sucursal & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) - Printer1.WriteString("Vendedor:" & usuario & CRLF) - Printer1.WriteString("Tienda: " & La_nombre.Text & CRLF) - Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & CRLF) - Printer1.WriteString("Calle: " & la_Calle.Text & CRLF) - Printer1.WriteString("Colonia: " & la_col.Text & CRLF) -' Printer1.WriteString("C.P.: " & la_cp.Text & CRLF) - Printer1.WriteString("Entre calle1: " & l_entre1.Text & CRLF) - Printer1.WriteString("Entre Calle2: " & l_entre2.Text & CRLF) +' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & eLINEFEED) + Printer1.WriteString("RFC: DRT-110316-9J1" & eLINEFEED) +' Printer1.WriteString(sucursal & eLINEFEED) + Printer1.WriteString(sDate & eLINEFEED) + Printer1.WriteString(sTime & eLINEFEED) + Printer1.WriteString("Vendedor:" & usuario & eLINEFEED) + Printer1.WriteString("Tienda: " & La_nombre.Text & eLINEFEED) + Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & eLINEFEED) + Printer1.WriteString("Calle: " & la_Calle.Text & eLINEFEED) + Printer1.WriteString("Colonia: " & la_col.Text & eLINEFEED) +' Printer1.WriteString("C.P.: " & la_cp.Text & eLINEFEED) + Printer1.WriteString("Entre calle1: " & l_entre1.Text & eLINEFEED) + Printer1.WriteString("Entre Calle2: " & l_entre2.Text & eLINEFEED) - Printer1.WriteString("-----------PREVENTA-----------" & CRLF) + Printer1.WriteString("-----------PREVENTA-----------" & eLINEFEED) ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. ' s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS <> ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("DUR")) s=skmt.ExecQuery2("select PE_PRONOMBRE, SUM(PE_CANT) AS PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,SUM(PE_CANT) * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_COSTOU > 0.01 GROUP by PE_PROID", Array As String("DUR")) @@ -3425,11 +3437,11 @@ Sub Impresion For i=0 To S.RowCount -1 S.Position=i ' If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) ' Else -' Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) +' Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3439,7 +3451,7 @@ Sub Impresion For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) TAMANO = 0 ESPACIO = 21 BLANCO = " " @@ -3447,20 +3459,20 @@ Sub Impresion Next End If s.Close - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) ' s=skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE LENGTH(PE_CEDIS) > 3 AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU") s=skmt.ExecQuery2("select PE_PRONOMBRE, SUM(PE_CANT) AS PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,SUM(PE_CANT) * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_COSTOU = 0.01 GROUP by PE_PROID", Array As String("DUR")) If S.RowCount>0 Then - Printer1.WriteString("--------BONIFICACIONES--------" & CRLF) + Printer1.WriteString("--------BONIFICACIONES--------" & eLINEFEED) For i=0 To S.RowCount -1 S.Position=i ' If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) ' Else -' Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) +' Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3470,28 +3482,28 @@ Sub Impresion For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) TAMANO = 0 ESPACIO = 21 BLANCO = " " ' End If Next - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) End If s.Close -' Printer1.WriteString("-------------RMI..-----------" & CRLF) +' Printer1.WriteString("-------------RMI..-----------" & eLINEFEED) ' ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. ' s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? AND PE_CEDIS = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA","DUR")) ' If S.RowCount>0 Then ' For i=0 To S.RowCount -1 ' S.Position=i ' If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then -' Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) +' Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) ' ' Else ' -' Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) +' Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & eLINEFEED) ' TAMANO = s.GetLong("L_CANT") + TAMANO ' TAMANO = s.GetLong("L_COSTOU") + TAMANO ' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO @@ -3501,7 +3513,7 @@ Sub Impresion ' For E=0 To ESPACIO -1 ' BLANCO = " " & BLANCO ' Next -' Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) ' TAMANO = 0 ' ESPACIO = 21 ' BLANCO = " " @@ -3515,22 +3527,22 @@ Sub Impresion ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If - Printer1.WriteString("Total Preventa: $" & s.GetString("TOTAL") & CRLF) + Printer1.WriteString("Total Preventa: $" & s.GetString("TOTAL") & eLINEFEED) s.Close c= skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") C.Position=0 - Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & CRLF) + Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & eLINEFEED) c.Close - Printer1.WriteString(" " & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString("ENTREGA EN :" & CRLF) - Printer1.WriteString(la_Calle.Text & CRLF) - Printer1.WriteString("----ESTE TICKET NO ES UN -----" & CRLF) - Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & CRLF) - Printer1.WriteString("--------INFORMATIVO-----------" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString("ENTREGA EN :" & eLINEFEED) + Printer1.WriteString(la_Calle.Text & eLINEFEED) + Printer1.WriteString("----ESTE TICKET NO ES UN -----" & eLINEFEED) + Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & eLINEFEED) + Printer1.WriteString("--------INFORMATIVO-----------" & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) Sleep(1000) Printer1.DisConnect diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index e3d12b1..f794ab9 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1797,7 +1797,7 @@ Sub LlenaProdsLL(p As ResultSet) ' Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' union all select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN = 0 And CAT_GP_CLASIF <> 'PROMOS' and cat_gp_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 2"$) If Subs.traeTipoCliente = 4 Then - Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_GP_ID, CAT_GP_NOMBRE,CAT_GP_PRECIO, CAT_LISTAPRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPO <> 'PROMOS' and CAT_GP_TIPO <> 'PROMOCION' + Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_LISTAPRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPO <> 'PROMOS' and CAT_GP_TIPO <> 'PROMOCION' order by Case CAT_GP_TIPOPROD when 'PRIORITARIO' THEN 0 WHEN 'ESTRATEGICO' THEN 1 @@ -1844,7 +1844,7 @@ Sub LlenaProdsLL(p As ResultSet) ' ¡Importante! Crear un NUEVO mapa en cada iteración. Dim tempMap As Map = CreateMap( _ "prod": p.GetString("CAT_GP_NOMBRE"), _ - "precio": p.GetString("CAT_LISTAPRECIO"), _ + "precio": p.GetString("CAT_GP_PRECIO"), _ "prioridad": p.GetString("CAT_GP_TIPOPROD"), _ "almacen": p.GetString("CAT_GP_ALMACEN"), _ "id": p.GetString("CAT_GP_ID"), _ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index ffcc28c..93af547 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -294,7 +294,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 5.12.21 + #VersionName: 6.01.10 '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 ae28dc4..2b00637 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Promos,b_promoMas_Click,936,0,C_Productos,lv_catalogos_ItemClick,403,0,C_Productos,B4XPage_Appear,255,0,C_Productos,l_prodX_LongClick,2308,0,C_Cliente,Class_Globals,0,0,C_Cliente,B_IMP_Click,2895,0,C_Principal,Subir_Click,772,3,Subs,calculaTotalConPromoXRango,2233,0,C_Cliente,Impresion3,3126,0,C_Cliente,B4XPage_Appear,964,0,C_Cliente,recalculoXcant,1338,6 +NavigationStack=C_Cliente,Class_Globals,0,0,C_Cliente,B4XPage_Appear,1274,6,C_Cliente,GPS_LocationChanged,1440,0,C_Cliente,MejorarPrecisionGPS,1278,0,C_Cliente,LA_GPS_Click,1359,0,C_Cliente,B_IMP_Click,2930,0,C_Cliente,Impresion3,2984,6,C_Cliente,Impresion2,3225,0,C_Cliente,Impresion,3388,0,B4XMainPage,revisaActualizacion,1037,0 SelectedBuild=0 -VisibleModules=27,2,16,28,5,13,17,29,19,4 +VisibleModules=27,2,16,28,5,13,17,29,19,4,6,12,18,22,24,25