diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 051a98e..f90de51 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -70,6 +70,7 @@ Sub Class_Globals Dim user As EditText Dim pass As EditText + Public tabulador As C_tabulador Dim c As Cursor Dim existe As String Dim paso1 As String @@ -167,6 +168,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) B4XPages.AddPage("Promos", promos) historico.Initialize B4XPages.AddPage("Historico", historico) + tabulador.Initialize + B4XPages.AddPage("tabulador", tabulador) ' respaldoDiario.Initialize ' B4XPages.AddPageAndCreate("respaldoDiario", respaldoDiario) ruta = Starter.ruta @@ -182,6 +185,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) skmt.Initialize(ruta,"kmt.db", True) Subs.guardaAppInfo(skmt) + Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS TABULADOR_MONEDAS(VEINTE TEXT, DIEZ TEXT, CINCO TEXT, DOS TEXT, PESO TEXT, CENTAVO TEXT, TOTAL TEXT)") + Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS TABULADOR_BILLETES(MIL TEXT, QUINIENTOS TEXT, DOCIENTOS TEXT, CIEN TEXT, CINCUENTA TEXT, VEINTE TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CLIENTES_NUEVOS(CN_ID TEXT, CN_FECHA TEXT, CN_USER TEXT, CN_LAT TEXT, CN_LON TEXT, CN_NOMBRE TEXT, CN_DIRECCION TEXT, CN_FOTO TEXT, CN_ALMACEN TEXT, CN_RUTA TEXT,CN_GIRO TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUOTAS (HC_META6 TEXT, HC_META5 TEXT, HC_META4 TEXT, HC_META3 TEXT, HC_META2 TEXT, HC_META1 TEXT, HC_RUTA TEXT, HC_CUOTA1 TEXT, HC_CUOTA2 TEXT, HC_CUOTA3 TEXT, HC_CUOTA4 TEXT, HC_CUOTA5 TEXT, HC_CUOTA6 TEXT)") diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 406c6a2..891d893 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1250,7 +1250,7 @@ Sub imprime_preventa ' 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 @@ -1279,7 +1279,7 @@ Sub imprime_preventa Printer1.WriteString(" " & CRLF) 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")) If s.RowCount>0 Then - Printer1.WriteString("-------PROMOS PREVENTA--------" & CRLF) + Printer1.WriteString("-------PROMOS PREVENTA--------" & CRLF) Printer1.WriteString("Cant. Precio Importe" & CRLF) Printer1.WriteString("------------------------------" & CRLF) For i=0 To S.RowCount -1 @@ -1629,7 +1629,7 @@ Sub imprime_venta - 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 diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index c962455..e9ee6d9 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -222,6 +222,8 @@ Sub Class_Globals Dim Panel4 As Panel Dim q_buscar As String Private et_buspc As EditText + Private b_tabulador As Button + Private p_b_tabulador As Panel End Sub 'You can add more parameters here. @@ -426,7 +428,9 @@ Sub B4XPage_Appear f.Close If l_ruta.Text = 0 Then l_ruta.Text =0 + p_b_tabulador.Visible = False Else + p_b_tabulador.Visible = True f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") @@ -824,6 +828,69 @@ Sub Subir_Click Next End If c.Close + + 'TABULADOR + c = Starter.skmt.ExecQuery("SELECT VEINTE, DIEZ, CINCO, DOS, PESO, CENTAVO, TOTAL FROM TABULADOR_MONEDAS") + d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") + b = Starter.skmt.ExecQuery("SELECT ID_ALMACEN FROM CAT_ALMACEN") +' f = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS") + d.Position = 0 + b.Position = 0 + f.Position = 0 + If c.RowCount > 0 Then + For i = 0 To c.RowCount - 1 + c.Position=i + Dim cmd As DBCommand + + Dim sDate,sTime As String + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + +' Dim fechatabulador() As String = Regex.Split(" ", f.GetString("HVD_FECHA")) +' Dim fechatabulador2() As String = Regex.Split("-", fechatabulador(0)) +' Dim fechatabulador3 As String = fechatabulador2(1)&"/"&fechatabulador2(2)&"/"&fechatabulador2(0) + cmd.Initialize + cmd.Name = "insert_tabulador_monedas_MARQUEZ2" + cmd.Parameters = Array As Object(d.GetString("RUTAA"), b.GetString("ID_ALMACEN"),c.GetString("VEINTE"),c.GetString("DIEZ"),c.GetString("CINCO"),c.GetString("DOS"),c.GetString("PESO"),c.GetString("CENTAVO"),sDate, "PREVENTA") + reqManager.ExecuteCommand(cmd , "ins_tabulador_mon") + Next + c.Close + d.Close + b.Close + f.Close + End If + + c = Starter.skmt.ExecQuery("SELECT MIL, QUINIENTOS, DOCIENTOS, CIEN, CINCUENTA, VEINTE FROM TABULADOR_BILLETES") + d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") + b = Starter.skmt.ExecQuery("SELECT ID_ALMACEN FROM CAT_ALMACEN") +' f = Starter.skmt.ExecQuery("SELECT HVD_FECHA FROM HIST_VENTAS") + d.Position = 0 + b.Position = 0 + f.Position = 0 + If c.RowCount > 0 Then + For i = 0 To c.RowCount - 1 + c.Position=i + Dim cmd As DBCommand + + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + +' Dim fechatabulador() As String = Regex.Split(" ", f.GetString("HVD_FECHA")) +' Dim fechatabulador2() As String = Regex.Split("-", fechatabulador(0)) +' Dim fechatabulador3 As String = fechatabulador2(1)&"/"&fechatabulador2(2)&"/"&fechatabulador2(0) + cmd.Initialize + cmd.Name = "insert_tabulador_billetes_MARQUEZ2" + cmd.Parameters = Array As Object(b.GetString("ID_ALMACEN"), d.GetString("RUTAA"),c.GetString("MIL"),c.GetString("QUINIENTOS"),c.GetString("DOCIENTOS"),c.GetString("CIEN"),c.GetString("CINCUENTA"),c.GetString("VEINTE"),sDate, "PREVENTA") + reqManager.ExecuteCommand(cmd , "ins_tabulador_bill") + Next + c.Close + d.Close + b.Close + f.Close + End If + 'FIN TABULADOR ' DROP t1.Initialize("T1", 30000) ' 1000 = 1 second @@ -2182,6 +2249,8 @@ Sub e_ruta_EnterPressed B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTAA") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM CLIENTES_NUEVOS") + Starter.skmt.ExecNonQuery("DELETE FROM TABULADOR_MONEDAS") + Starter.skmt.ExecNonQuery("DELETE FROM TABULADOR_BILLETES") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENV_MONTO_LIQ") B4XPage_Appear l_rutasuplencia.Visible = False @@ -2810,4 +2879,8 @@ Sub checaPedido If c.RowCount > 0 Then Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 3 WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA)") End If +End Sub + +Private Sub b_tabulador_Click + B4XPages.ShowPage("tabulador") End Sub \ No newline at end of file diff --git a/B4A/C_tabulador.bas b/B4A/C_tabulador.bas new file mode 100644 index 0000000..d752b11 --- /dev/null +++ b/B4A/C_tabulador.bas @@ -0,0 +1,134 @@ +B4A=true +Group=Default Group +ModulesStructureVersion=1 +Type=Class +Version=12.2 +@EndOfDesignText@ +Sub Class_Globals + Private Root As B4XView 'ignore + Private xui As XUI 'ignore + Private et_mil As EditText + Private et_quinientos As EditText + Private et_docientos As EditText + Private et_cien As EditText + Private et_cincuenta As EditText + Private et_veinte As EditText + Private et_m_veinte As EditText + Private et_m_diez As EditText + Private et_m_cinco As EditText + Private et_m_dos As EditText + Private et_m_peso As EditText + Private et_m_centavo As EditText + Private b_calcular As Button + Private b_guardar As Button + Private l_total As Label + Dim sum_billetes As Int + Dim sum_monedas As Float + Dim total As Float + Dim c As Cursor + Dim d As Cursor +End Sub + +'You can add more parameters here. +Public Sub Initialize As Object + Return Me +End Sub + +'This event will be called once, before the page becomes visible. +Private Sub B4XPage_Created (Root1 As B4XView) + Root = Root1 + 'load the layout to Root + Root.LoadLayout("tabulador") +End Sub + +Sub B4XPage_Appear + d = Starter.skmt.ExecQuery("SELECT VEINTE, DIEZ, CINCO, DOS, PESO, CENTAVO, TOTAL FROM TABULADOR_MONEDAS") + c = Starter.skmt.ExecQuery("SELECT MIL, QUINIENTOS, DOCIENTOS, CIEN, CINCUENTA, VEINTE FROM TABULADOR_BILLETES") + c.Position = 0 + d.Position = 0 + If c.RowCount > 0 And d.RowCount > 0 Then + Log("TABULADR CON RESUKTADO") + et_mil.Text = c.GetString("MIL") + et_quinientos.Text = c.GetString("QUINIENTOS") + et_docientos.Text = c.GetString("DOCIENTOS") + et_cien.Text = c.GetString("CIEN") + et_cincuenta.Text = c.GetString("CINCUENTA") + et_veinte.Text = c.GetString("VEINTE") + et_m_veinte.Text = d.GetString("VEINTE") + et_m_diez.Text = d.GetString("DIEZ") + et_m_cinco.Text = d.GetString("CINCO") + et_m_dos.Text = d.GetString("DOS") + et_m_peso.Text = d.GetString("PESO") + et_m_centavo.Text = d.GetString("CENTAVO") + l_total.Text = d.GetString("TOTAL") + else If c.RowCount = 0 And d.RowCount = 0 Then + Log("TABULADR SIN RESUKTADO") + et_mil.Text = "" + et_quinientos.Text = "" + et_docientos.Text = "" + et_cien.Text = "" + et_cincuenta.Text = "" + et_veinte.Text = "" + et_m_veinte.Text = "" + et_m_diez.Text = "" + et_m_cinco.Text = "" + et_m_dos.Text = "" + et_m_peso.Text = "" + et_m_centavo.Text = "" + l_total.Text = "" + End If + c.Close + d.Close +End Sub + +Private Sub b_guardar_Click + b_calcular_Click + Starter.skmt.ExecNonQuery("DELETE FROM TABULADOR_MONEDAS") + Starter.skmt.ExecNonQuery("DELETE FROM TABULADOR_BILLETES") + Starter.skmt.ExecNonQuery2("INSERT INTO TABULADOR_BILLETES (MIL, QUINIENTOS, DOCIENTOS, CIEN, CINCUENTA, VEINTE) VALUES (?,?,?,?,?,?)", Array As Object(et_mil.Text,et_quinientos.Text,et_docientos.Text,et_cien.Text,et_cincuenta.Text,et_veinte.Text)) + Starter.skmt.ExecNonQuery2("INSERT INTO TABULADOR_MONEDAS (VEINTE, DIEZ, CINCO, DOS, PESO, CENTAVO, TOTAL) VALUES (?,?,?,?,?,?,?)", Array As Object(et_m_veinte.Text,et_m_diez.Text,et_m_cinco.Text,et_m_dos.Text,et_m_peso.Text,et_m_centavo.Text,l_total.Text)) + B4XPages.ShowPage("Principal") +End Sub + +Private Sub b_calcular_Click + If et_mil.Text = "" Then + et_mil.Text = 0 + End If + If et_quinientos.Text = "" Then + et_quinientos.Text = 0 + End If + If et_docientos.Text = "" Then + et_docientos.Text = 0 + End If + If et_cien.Text = "" Then + et_cien.Text = 0 + End If + If et_cincuenta.Text = "" Then + et_cincuenta.Text = 0 + End If + If et_veinte.Text = "" Then + et_veinte.Text = 0 + End If + If et_m_veinte.Text = "" Then + et_m_veinte.Text = 0 + End If + If et_m_diez.Text = "" Then + et_m_diez.Text = 0 + End If + If et_m_cinco.Text = "" Then + et_m_cinco.Text = 0 + End If + If et_m_dos.Text = "" Then + et_m_dos.Text = 0 + End If + If et_m_peso.Text = "" Then + et_m_peso.Text = 0 + End If + If et_m_centavo.Text = "" Then + et_m_centavo.Text = 0 + End If + sum_billetes = (et_mil.Text * 1000) + (et_quinientos.Text * 500) + (et_docientos.Text * 200) + ( et_cien.Text * 100 ) + ( et_cincuenta.Text * 50 ) + ( et_veinte.Text * 20 ) + sum_monedas = (et_m_veinte.Text * 20) + ( et_m_diez.Text * 10 ) + ( et_m_cinco.Text * 5 ) + ( et_m_dos.Text * 2 ) + ( et_m_peso.Text * 1 ) + ( et_m_centavo.Text * 0.50 ) + total = sum_billetes + sum_monedas + l_total.Text = Round2(total, 2) +End Sub \ No newline at end of file diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index be71ca6..5a4c83a 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/tabulador.bal b/B4A/Files/tabulador.bal new file mode 100644 index 0000000..e335cd7 Binary files /dev/null and b/B4A/Files/tabulador.bal differ diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a index b015f15..cd646de 100644 --- a/B4A/MARQUEZ.b4a +++ b/B4A/MARQUEZ.b4a @@ -55,13 +55,14 @@ File57=scrollpromos.bal File58=senial.jpg File59=sync.png File6=carrito.png -File60=tache_rojo.png -File61=Ticket dia.jpg -File62=ticketdia20.jpg -File63=ticketdia20.png -File64=ticketsdia.bal -File65=Tiendita.jpg -File66=verde.png +File60=tabulador.bal +File61=tache_rojo.png +File62=Ticket dia.jpg +File63=ticketdia20.jpg +File64=ticketdia20.png +File65=ticketsdia.bal +File66=Tiendita.jpg +File67=verde.png File7=celltitle.bal File8=cliente.bal File9=clientes.bal @@ -128,6 +129,7 @@ FileGroup63=Default Group FileGroup64=Default Group FileGroup65=Default Group FileGroup66=Default Group +FileGroup67=Default Group FileGroup7=Default Group FileGroup8=Default Group FileGroup9=Default Group @@ -135,31 +137,30 @@ Group=Default Group Library1=appupdating Library10=core Library11=fileprovider -Library12=firebaseadmob -Library13=firebaseanalytics -Library14=firebasenotifications -Library15=fusedlocationprovider -Library16=googlemaps -Library17=googlemapsextras -Library18=gps -Library19=ime +Library12=firebaseanalytics +Library13=firebasenotifications +Library14=fusedlocationprovider +Library15=googlemaps +Library16=googlemapsextras +Library17=gps +Library18=ime +Library19=javaobject Library2=b4xpages -Library20=javaobject -Library21=json -Library22=okhttputils2 -Library23=phone -Library24=preoptimizedclv -Library25=randomaccessfile -Library26=replyauto -Library27=rspopupmenu -Library28=serial -Library29=sql +Library20=json +Library21=okhttputils2 +Library22=phone +Library23=preoptimizedclv +Library24=randomaccessfile +Library25=replyauto +Library26=rspopupmenu +Library27=serial +Library28=sql +Library29=stringutils Library3=baqrcode -Library30=stringutils -Library31=togglelibrary -Library32=xcustomlistview -Library33=xui -Library34=runtimepermissions +Library30=togglelibrary +Library31=xcustomlistview +Library32=xui +Library33=runtimepermissions Library4=batteryprogressview Library5=bitmapcreator Library6=byteconverter @@ -176,36 +177,37 @@ Module14=C_Productos Module15=C_Promos Module16=C_RespaldoDiario Module17=C_Subs -Module18=C_TicketsDia -Module19=C_UpdateAvailable +Module18=C_tabulador +Module19=C_TicketsDia Module2=B4XMainPage -Module20=DBRequestManager -Module21=EscPosPrinter -Module22=FileHandler -Module23=ManageExternalStorage -Module24=MAPA_CLIENTE -Module25=MAPA_RUTAS -Module26=NotificationService -Module27=Pendientes -Module28=Starter -Module29=Subs +Module20=C_UpdateAvailable +Module21=DBRequestManager +Module22=EscPosPrinter +Module23=FileHandler +Module24=ManageExternalStorage +Module25=MAPA_CLIENTE +Module26=MAPA_RUTAS +Module27=NotificationService +Module28=Pendientes +Module29=Starter Module3=BatteryUtilities -Module30=Tracker +Module30=Subs +Module31=Tracker Module4=C_Cliente Module5=C_Clientes Module6=C_Cuestionario Module7=C_Historico Module8=C_Mapas Module9=C_Nota -NumberOfFiles=66 -NumberOfLibraries=34 -NumberOfModules=30 -Version=12.8 +NumberOfFiles=67 +NumberOfLibraries=33 +NumberOfModules=31 +Version=13 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Marquez #VersionCode: 1 - #VersionName: 4.12.10 + #VersionName: 5.01.10 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta index ec6d09b..27fe3ad 100644 --- a/B4A/MARQUEZ.b4a.meta +++ b/B4A/MARQUEZ.b4a.meta @@ -23,6 +23,7 @@ ModuleBookmarks28= ModuleBookmarks29= ModuleBookmarks3= ModuleBookmarks30= +ModuleBookmarks31= ModuleBookmarks4= ModuleBookmarks5= ModuleBookmarks6= @@ -54,6 +55,7 @@ ModuleBreakpoints28= ModuleBreakpoints29= ModuleBreakpoints3= ModuleBreakpoints30= +ModuleBreakpoints31= ModuleBreakpoints4= ModuleBreakpoints5= ModuleBreakpoints6= @@ -85,12 +87,13 @@ ModuleClosedNodes28= ModuleClosedNodes29= ModuleClosedNodes3= ModuleClosedNodes30= +ModuleClosedNodes31= ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,Guardar_Click,696,1,C_Cliente,imprime_venta,1783,0,C_Cliente,GUADAVENTA2,874,0,C_Cliente,mandaPendientesrecarga,2088,0,C_Principal,Class_Globals,0,0,C_Cliente,mandaPendientes,1978,0,C_NoVenta,GUARDA_Click,127,0,C_NoVenta,mandaPendientesnoventa,141,0,C_Principal,Subir_Click,783,1,B4XMainPage,Class_Globals,25,0 +NavigationStack=C_Principal,b_tabulador_Click,2864,0,C_Principal,B4XPage_Created,229,0,C_Principal,B4XPage_Appear,423,5,Diseñador Visual,principal.bal,-100,6,C_Principal,cargar_Click,1199,0,C_Promos,Class_Globals,0,0,C_Promos,muestraPromo,84,0,C_Cliente,imprime_preventa,1246,0,C_Cliente,imprime_venta,1625,0,C_Principal,Subir_Click,866,6 SelectedBuild=0 -VisibleModules=1,2,13,4,7,8,9,10,14,29 +VisibleModules=1,2,13,4,7,8,9,10,14,30,15