diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 850c80c..6533db4 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -545,7 +545,7 @@ Sub GPS_LocationChanged (Location1 As Location) 'now we need the distance between our location and the target location distance = l1.DistanceTo(l2) 'the result is in meter gest.Visible = True - If distance < 500000000000000000000000000000000000000000000000000000000000 Then + If distance < 50 Then LA_GEO.TextColor = Colors.Blue Tels.Visible = True gest.Visible = True @@ -1225,7 +1225,7 @@ Sub imprime_preventa sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) c.Close - + Public Const eLINEFEED As String = "" & Chr(0x0D) & Chr(0x0A) Dim tel As String = "" Dim t As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'TELEFONO'") If t.RowCount > 0 Then @@ -1268,34 +1268,35 @@ Sub imprime_preventa TAMANO = 0 ESPACIO = 22 BLANCO = " " - Printer1.WriteString("Compania Logistica Mazapa." & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) - Printer1.WriteString("Vendedor:" & usuario & CRLF) - Printer1.WriteString("Tel vendedor:" & tel & 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(" " & CRLF) + Printer1.WriteString("Compania Logistica Mazapa." & eLINEFEED) + Printer1.WriteString(sDate & eLINEFEED) + Printer1.WriteString(sTime & eLINEFEED) + Printer1.WriteString("Vendedor:" & usuario & eLINEFEED) + Printer1.WriteString("Tel vendedor:" & tel & eLINEFEED) + Printer1.WriteString("Ruta:" & Subs.traeRuta(la_cuenta.Text) & 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(" " & eLINEFEED) c = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ?",Array As String("PREVENTA_24")) Dim siesacredi As Cursor = skmt.ExecQuery("SELECT * FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") If siesacredi.RowCount > 0 Then - Printer1.WriteString("------PREVENTA A CREDITO------" & CRLF) + Printer1.WriteString("------PREVENTA A CREDITO------" & eLINEFEED) End If If c.RowCount > 0 Then - Printer1.WriteString("--------PREVENTA_24--------" & CRLF) - Printer1.WriteString("Cant. Precio Importe" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) + Printer1.WriteString("--------PREVENTA_24--------" & eLINEFEED) + Printer1.WriteString("Cant. Precio Importe" & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) s=skmt.ExecQuery2("select PE_BCAJAS,PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA_24")) 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.GetString("PE_BCAJAS") = 0 Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) k1 = NumberFormat(s.GETSTRING("PE_COSTOU"),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length @@ -1306,13 +1307,13 @@ Sub imprime_preventa For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& eLINEFEED ) TAMANO = 0 ESPACIO = 23 BLANCO = " " Else - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - k1 = NumberFormat((s.GETSTRING("PE_COSTOU")/s.GETSTRING("PE_CANT")),0,2) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) + k1 = NumberFormat((s.GETSTRING("PE_COSTO_TOT")/s.GETSTRING("PE_CANT")),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length ESPACIO = 23 @@ -1322,7 +1323,8 @@ Sub imprime_preventa For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) + Log(k1) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& eLINEFEED ) TAMANO = 0 ESPACIO = 23 BLANCO = " " @@ -1331,19 +1333,19 @@ Sub imprime_preventa Next End If s.Close - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) 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_FOLIO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("PREVENTA_24")) If s.RowCount>0 Then - Printer1.WriteString("-------PROMOS PREVENTA--------" & CRLF) - Printer1.WriteString("Cant. Precio Importe" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) + Printer1.WriteString("-------PROMOS PREVENTA--------" & eLINEFEED) + Printer1.WriteString("Cant. Precio Importe" & eLINEFEED) + Printer1.WriteString("------------------------------" & 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) Log("promo") Else - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) k1 = NumberFormat(s.GETSTRING("PE_COSTOU"),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length @@ -1354,13 +1356,13 @@ Sub imprime_preventa For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& eLINEFEED ) TAMANO = 0 ESPACIO = 23 BLANCO = " " End If Next - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) End If s.Close s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID And P.PE_CEDIS = P.PE_PROID WHERE PE_CLIENTE IN (Select cuenta FROM CUENTAA) And PE_FOLIO = 'PREVENTA_24'"$) @@ -1375,7 +1377,7 @@ Sub imprime_preventa subtot.Close subtotal = Round2(subtotal, 2) - Printer1.WriteString("Subtotal: $" & NumberFormat(subtotal, 0, 2) & CRLF) + Printer1.WriteString("Subtotal: $" & NumberFormat(subtotal, 0, 2) & eLINEFEED) ' Calcular el descuento Dim descuento As Double @@ -1386,41 +1388,41 @@ Sub imprime_preventa descuento = Round2(descuento, 2) ' Redondear descuento con precisión de 2 decimales s.Close - Printer1.WriteString("Descuento: $" & NumberFormat(descuento, 0, 2) & CRLF) + Printer1.WriteString("Descuento: $" & NumberFormat(descuento, 0, 2) & eLINEFEED) ' Mostrar el total de la preventa - Printer1.WriteString("Total preventa: $" & NumberFormat(total, 0, 2) & CRLF) + Printer1.WriteString("Total preventa: $" & NumberFormat(total, 0, 2) & eLINEFEED) ' Contar los artículos en preventa Dim c As Cursor = skmt.ExecQuery2("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) AND PE_FOLIO = ?", Array As String("PREVENTA_24")) c.Position = 0 - Printer1.WriteString("Total art. preventa: " & NumberFormat(c.GetDouble("PC_NOART"), 0, 0) & CRLF) + Printer1.WriteString("Total art. preventa: " & NumberFormat(c.GetDouble("PC_NOART"), 0, 0) & eLINEFEED) c.Close End If Dim siesacredi As Cursor = skmt.ExecQuery("SELECT * FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") If siesacredi.RowCount > 0 Then siesacredi.Position = 0 - Printer1.WriteString("Total a credito: $" & NumberFormat( siesacredi.GetString("PA_MONTO"),0,2) & CRLF) + Printer1.WriteString("Total a credito: $" & NumberFormat( siesacredi.GetString("PA_MONTO"),0,2) & eLINEFEED) s=skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As String("PREVENTA_24")) s.Position =0 If s.GetString("TOTAL") > siesacredi.GetString("PA_MONTO") Then - Printer1.WriteString("Total a contado: $" & NumberFormat( (s.GetString("TOTAL")-siesacredi.GetString("PA_MONTO")),0,2) & CRLF) + Printer1.WriteString("Total a contado: $" & NumberFormat( (s.GetString("TOTAL")-siesacredi.GetString("PA_MONTO")),0,2) & eLINEFEED) End If s.Close End If - Printer1.WriteString(" " & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString("----ESTE TICKET NO ES UN -----" & CRLF) - Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & CRLF) - Printer1.WriteString("--------INFORMATIVO-----------" & CRLF) - Printer1.WriteString("-POR FAVOR REVISE SU PEDIDO,--" & CRLF) - Printer1.WriteString("-UNA VEZ REALIZADA LA ENTREGA-" & CRLF) - Printer1.WriteString("NO HAY CAMBIOS NI DEVOLUCIONES" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString(" " & CRLF) - Printer1.WriteString(" " & CRLF) - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString("----ESTE TICKET NO ES UN -----" & eLINEFEED) + Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & eLINEFEED) + Printer1.WriteString("--------INFORMATIVO-----------" & eLINEFEED) + Printer1.WriteString("-POR FAVOR REVISE SU PEDIDO,--" & eLINEFEED) + Printer1.WriteString("-UNA VEZ REALIZADA LA ENTREGA-" & eLINEFEED) + Printer1.WriteString("NO HAY CAMBIOS NI DEVOLUCIONES" & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) Sleep(1000) Printer1.DisConnect ProgressDialogHide @@ -1449,7 +1451,7 @@ Sub imprime_venta sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) c.Close - + Public Const eLINEFEED As String = "" & Chr(0x0D) & Chr(0x0A) Dim tel As String = "" Dim t As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'TELEFONO'") If t.RowCount > 0 Then @@ -1512,42 +1514,42 @@ Sub imprime_venta ' Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) ' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) - Printer1.WriteString("Compania Logistica Mazapa." & CRLF) -' Printer1.WriteString(sucursal & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) - Printer1.WriteString("Vendedor:" & usuario & CRLF) - Printer1.WriteString("Tel vendedor:" & tel & 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(" " & CRLF) + Printer1.WriteString("Compania Logistica Mazapa." & eLINEFEED) +' Printer1.WriteString(sucursal & eLINEFEED) + Printer1.WriteString(sDate & eLINEFEED) + Printer1.WriteString(sTime & eLINEFEED) + Printer1.WriteString("Vendedor:" & usuario & eLINEFEED) + Printer1.WriteString("Tel vendedor:" & tel & 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(" " & eLINEFEED) c = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ?",Array As String("PREVENTA_48")) If c.RowCount > 0 Then - Printer1.WriteString("--------PREVENTA_48--------" & CRLF) + Printer1.WriteString("--------PREVENTA_48--------" & eLINEFEED) -' Printer1.WriteString("--------------------------------" & CRLF) - Printer1.WriteString("Cant. Precio Importe" & CRLF) +' Printer1.WriteString("--------------------------------" & eLINEFEED) + Printer1.WriteString("Cant. Precio Importe" & eLINEFEED) - Printer1.WriteString("------------------------------" & CRLF) + Printer1.WriteString("------------------------------" & 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_BCAJAS, PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA_48")) 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.GetString("PE_BCAJAS") = 0 Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) ' TAMANO = s.GetLong("L_CANT") + TAMANO ' If s.GetLong("L_COSTOU") = 1 Then ' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 @@ -1583,7 +1585,7 @@ Sub imprime_venta ' Printer1.Justify = 1 ' Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) ' Printer1.Justify = 2 -' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) k1 = NumberFormat(s.GETSTRING("PE_COSTOU"),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) @@ -1597,14 +1599,14 @@ Sub imprime_venta BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& eLINEFEED ) TAMANO = 0 ESPACIO = 23 BLANCO = " " ' Printer1.Justify = 0 Else - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) ' TAMANO = s.GetLong("L_CANT") + TAMANO ' If s.GetLong("L_COSTOU") = 1 Then ' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 @@ -1641,14 +1643,14 @@ Sub imprime_venta ' Printer1.Justify = 1 ' Printer1.WriteString((s.GETSTRING("PE_COSTOU")/s.GETSTRING("PE_CANT"))& BLANCO) ' Printer1.Justify = 2 -' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) ' TAMANO = 0 ' ESPACIO = 22 ' BLANCO = " " - k1 = NumberFormat((s.GETSTRING("PE_COSTOU")/s.GETSTRING("PE_CANT")),0,2) + k1 = NumberFormat((s.GETSTRING("PE_COSTO_TOT")/s.GETSTRING("PE_CANT")),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length @@ -1660,7 +1662,7 @@ Sub imprime_venta BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& eLINEFEED ) TAMANO = 0 ESPACIO = 23 @@ -1672,20 +1674,20 @@ Sub imprime_venta End If ' Printer1.Justify = 0 s.Close - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) 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_FOLIO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("PREVENTA_48")) If S.RowCount>0 Then - Printer1.WriteString("-------PROMOS VENTA--------" & CRLF) - Printer1.WriteString("Cant. Precio Importe" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) + Printer1.WriteString("-------PROMOS VENTA--------" & eLINEFEED) + Printer1.WriteString("Cant. Precio Importe" & eLINEFEED) + Printer1.WriteString("------------------------------" & 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) Log("promo") Else ' TAMANO = 0 - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & eLINEFEED) ' TAMANO = s.GetLong("L_CANT") + TAMANO ' If s.GetLong("L_COSTOU") = 1 Then ' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 @@ -1716,13 +1718,13 @@ Sub imprime_venta ' 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 ) ' Printer1.Justify = 0 ' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) ' Printer1.Justify = 1 ' Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) ' Printer1.Justify = 2 -' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & eLINEFEED ) ' TAMANO = 0 ' ESPACIO = 22 ' BLANCO = " " @@ -1739,7 +1741,7 @@ Sub imprime_venta BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& eLINEFEED ) TAMANO = 0 ESPACIO = 23 @@ -1747,7 +1749,7 @@ Sub imprime_venta ' Printer1.Justify = 0 End If Next - Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & eLINEFEED) End If s.Close s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID And P.PE_CEDIS = P.PE_PROID WHERE PE_CLIENTE IN (Select cuenta FROM CUENTAA) And PE_FOLIO = 'PREVENTA_48'"$) @@ -1762,7 +1764,7 @@ Sub imprime_venta subtot.Close subtotal = Round2(subtotal, 2) - Printer1.WriteString("Subtotal: $" & NumberFormat(subtotal, 0, 2) & CRLF) + Printer1.WriteString("Subtotal: $" & NumberFormat(subtotal, 0, 2) & eLINEFEED) ' Calcular el descuento Dim descuento As Double @@ -1773,50 +1775,50 @@ Sub imprime_venta descuento = Round2(descuento, 2) ' Redondear descuento con precisión de 2 decimales s.Close - Printer1.WriteString("Descuento: $" & NumberFormat(descuento, 0, 2) & CRLF) + Printer1.WriteString("Descuento: $" & NumberFormat(descuento, 0, 2) & eLINEFEED) ' Mostrar el total de la preventa - Printer1.WriteString("Total preventa: $" & NumberFormat(total, 0, 2) & CRLF) + Printer1.WriteString("Total preventa: $" & NumberFormat(total, 0, 2) & eLINEFEED) ' Contar los artículos en preventa Dim c As Cursor = skmt.ExecQuery2("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) AND PE_FOLIO = ?", Array As String("PREVENTA_48")) c.Position = 0 - Printer1.WriteString("Total art. preventa: " & NumberFormat(c.GetDouble("PC_NOART"), 0, 0) & CRLF) + Printer1.WriteString("Total art. preventa: " & NumberFormat(c.GetDouble("PC_NOART"), 0, 0) & eLINEFEED) c.Close -' Printer1.WriteString(" " & CRLF) +' Printer1.WriteString(" " & eLINEFEED) End If -' Printer1.WriteString(" " & CRLF) -' Printer1.WriteString("------------------------------" & CRLF) +' Printer1.WriteString(" " & eLINEFEED) +' Printer1.WriteString("------------------------------" & eLINEFEED) ' ' 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("Total: $" & s.GetString("TOTAL") & CRLF) +' Printer1.WriteString("Total: $" & 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("-POR FAVOR REVISE SU PEDIDO,--" & CRLF) - Printer1.WriteString("-UNA VEZ REALIZADA LA ENTREGA-" & CRLF) - Printer1.WriteString("NO HAY CAMBIOS NI DEVOLUCIONES" & CRLF) - Printer1.WriteString("------------------------------" & CRLF) - Printer1.WriteString(" " & 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("-POR FAVOR REVISE SU PEDIDO,--" & eLINEFEED) + Printer1.WriteString("-UNA VEZ REALIZADA LA ENTREGA-" & eLINEFEED) + Printer1.WriteString("NO HAY CAMBIOS NI DEVOLUCIONES" & eLINEFEED) + Printer1.WriteString("------------------------------" & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) + Printer1.WriteString(" " & eLINEFEED) Sleep(1000) Printer1.DisConnect diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 5408ad1..818c970 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -2121,7 +2121,7 @@ Sub connecta_Click Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_ruta_mazapa8" + cmd.Name = "select_ruta_mazapa9" cmd.Parameters = Array As Object(ALMACEN, e_ruta.text) ' Log($"${ALMACEN},${e_ruta.text},${imei}"$) reqManager.ExecuteQuery(cmd , 0, "ruta") diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 41f5124..48e8a0d 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -206,6 +206,7 @@ Sub B4XPage_Appear hayPromos = True End If Next + Log(hayPromos) If hayPromos Then lv_catalogos.AddSingleLine("PROMOS") Else Log("NO HAY PROMOS") diff --git a/B4A/MAZAPA.b4a b/B4A/MAZAPA.b4a index 1bc90ec..5439b6a 100644 --- a/B4A/MAZAPA.b4a +++ b/B4A/MAZAPA.b4a @@ -211,7 +211,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: mazapa #VersionCode: 1 - #VersionName: 5.01.05_S/G + #VersionName: 5.01.11 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MAZAPA.b4a.meta b/B4A/MAZAPA.b4a.meta index 3a3c240..6128ce0 100644 --- a/B4A/MAZAPA.b4a.meta +++ b/B4A/MAZAPA.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,Subir_Click,725,0,Subs,traeRuta2,726,0,C_Cliente,GUADAVENTA2,1034,0,C_Cliente,b_acred_Click,833,0,C_Cliente,Guardar_Click,768,0,C_Cliente,GuardaVenta,961,0,C_Cliente,imprime_venta,1810,0,C_Cliente,B_IMP_Click,1190,2,C_Cliente,B4XPage_Appear,513,2,C_Cliente,GPS_LocationChanged,541,0 +NavigationStack=Subs,traemosInventarioDisponibleParaPromo,1035,0,Subs,restaFijosPromo,1072,0,Subs,procesaPromocion,1205,0,Subs,alcanzanLosVariablesParaPromo,1136,5,C_Principal,Class_Globals,0,0,C_Principal,connecta_Click,2117,0,Main,Activity_Create,28,0,C_Cliente,GPS_LocationChanged,516,1,C_Cliente,imprime_preventa,1269,2,C_Cliente,imprime_venta,1453,0 SelectedBuild=0 -VisibleModules=29,1,14,2,12,3,6,7,8,26,15,10,11,5,30,17,4,22,19 +VisibleModules=29,1,14,2,12,3,6,7,8,26,5 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index cb56f72..9383f7a 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -716,7 +716,7 @@ End Sub Sub traeRuta (cliente As String) As String 'ignore Private c As Cursor Private r As String - c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}' UNION ALL select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}'"$) + c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}'"$) r = "0" If c.RowCount > 0 Then c.Position=0 @@ -1140,6 +1140,7 @@ Sub alcanzanLosVariablesParaPromo(promoMap As Map, inventarioSinFijos As Map) As res2 = True 'Si el total de inventario de productos variables (totalProdsVariables) es mayor o igual a los productos requeridos entonces regresamos TRUE End If If promoMap.Get("prodsVariables2Requeridos").As(Int) = 0 Then res2 = True + Log(res1&" ________________________" & res2) If res1 And res2 Then 'Solo si son verdadero los dos el resultado es verdadero. res = True Else @@ -1487,7 +1488,7 @@ Sub pedidoGuardado As Boolean Private g As Cursor = B4XPages.MainPage.skmt.ExecQuery("select gestion from kmt_info where CAT_CL_CODIGO in (Select CUENTA from cuentaa)") If g.RowCount > 0 Then g.Position=0 - If g.GetString("gestion") = "2" Or g.GetString("gestion") = "3" Then guardado = True + If g.GetString("gestion") = "2" Then guardado = True ' Or g.GetString("gestion") = "3" End If ' Log($"Guardado=${guardado}"$) Return guardado