From f83981f7a99d6cf8d8910f9e99f374c9a4856007 Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Mon, 25 Nov 2024 21:53:47 -0600 Subject: [PATCH] =?UTF-8?q?Version=204.11.19=20Se=20corrije=20clientes=20n?= =?UTF-8?q?uevos,=20llega=20ruta=20y=20almacen(no=20llegaba=20antes)=20Se?= =?UTF-8?q?=20a=C3=B1ade=20lista=20completa=20de=20productos=20para=20arqu?= =?UTF-8?q?eo=20ciego=20y=20recarga.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 14 +++++++++----- B4A/C_Cliente.bas | 39 +++++++++++++++++++++++++++++++++------ B4A/C_NuevoCliente.bas | 2 +- B4A/C_Principal.bas | 36 +++++++++++++++++++++++++++++++++++- B4A/C_Productos.bas | 16 +++++++++++++++- B4A/MARQUEZ.b4a | 2 +- B4A/MARQUEZ.b4a.meta | 4 ++-- B4A/Subs.bas | 9 +++++++-- 8 files changed, 103 insertions(+), 19 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index f3838d3..a70a736 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -189,6 +189,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GIRO(GIRO TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PICKCIEGO_HECHO(HECHO TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GUNAPROD2 (CAT_GP_INICIATIVA TEXT, CAT_GP_TIPOPROD TEXT, CAT_GP_DEV TEXT, CAT_GP_ALMACEN NUMERIC, CAT_GP_ID TEXT, CAT_GP_NOMBRE TEXT, CAT_GP_IMP1 TEXT, CAT_GP_IMP2 TEXT, CAT_GP_PRECIO TEXT, CAT_GP_CLASIF TEXT, CAT_GP_STS TEXT, CAT_GP_TIPO TEXT, CAT_GP_SUBTIPO TEXT, CAT_GP_IMG BLOB)") + skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GUNAPROD3 (CAT_GP_INICIATIVA TEXT, CAT_GP_TIPOPROD TEXT, CAT_GP_DEV TEXT, CAT_GP_ALMACEN NUMERIC, CAT_GP_ID TEXT, CAT_GP_NOMBRE TEXT, CAT_GP_IMP1 TEXT, CAT_GP_IMP2 TEXT, CAT_GP_PRECIO TEXT, CAT_GP_CLASIF TEXT, CAT_GP_STS TEXT, CAT_GP_TIPO TEXT, CAT_GP_SUBTIPO TEXT, CAT_GP_IMG BLOB)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_STORE (HSS_CODIGO TEXT, HSS_IN TEXT, HSS_OUT TEXT, HSS_TOT TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_OUT (HSO_INI TEXT, HSO_FIN TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS INVENT_X_ENVIAR (ALMACEN TEXT, PROID TEXT, CANTIDAD TEXT)") @@ -215,10 +216,13 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("kmt_info", "CAT_CL_BCREDITO", "TEXT") Subs.agregaColumna("kmt_info", "CAT_CL_LIMITECREDITO", "TEXT") Subs.agregaColumna("CAT_GUNAPROD", "CAT_DP_CONVERSION1", "TEXT") + Subs.agregaColumna("CAT_GUNAPROD", "CAT_DP_PRECIO4", "TEXT") + Subs.agregaColumna("CAT_GUNAPROD3", "CAT_DP_CONVERSION1", "TEXT") + Subs.agregaColumna("CAT_GUNAPROD3", "CAT_DP_PRECIO4", "TEXT") Subs.agregaColumna("CAT_GUNAPROD2", "CAT_DP_CONVERSION1", "TEXT") Subs.agregaColumna("CAT_GUNAPROD2", "CAT_DP_PRECIO4", "TEXT") - Subs.agregaColumna("CAT_GUNAPROD", "CAT_DP_PRECIO4", "TEXT") Subs.agregaColumna("CLIENTES_NUEVOS", "CN_SOLICITA", "TEXT") + Subs.agregaColumna("ABONOSP", "DIA_VENCIMIENTO", "TEXT") Subs.agregaColumna("CLIENTES_NUEVOS", "CN_COLONIA", "TEXT") Subs.agregaColumna("CLIENTES_NUEVOS", "CN_TELEFONO", "TEXT") @@ -929,7 +933,7 @@ Private Sub b_guardar_Click End Sub Private Sub b_arqueocieego_Click - c = skmt.ExecQuery("SELECT * FROM CAT_GUNAPROD") + c = skmt.ExecQuery("SELECT * FROM CAT_GUNAPROD3") If c.RowCount > 0 Then Subs.panelVisible(p_validacion,0,0) recarga = "0" @@ -946,7 +950,7 @@ Private Sub et_buspc_TextChanged (Old As String, New As String) q_buscar = "%" & et_buspc.Text & "%" Log(q_buscar) - c=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID , ifnull(PC_CANT,0) AS PC_CANT FROM CAT_GUNAPROD INNER JOIN PICK_CIEGO ON PC_ID_PROD = CAT_GP_ID AND PC_NOM_PROD = CAT_GP_NOMBRE WHERE (CAT_GP_NOMBRE LIKE ? OR CAT_GP_ID LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'"$, Array As String(q_buscar,q_buscar)) + c=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID , ifnull(PC_CANT,0) AS PC_CANT FROM CAT_GUNAPROD3 INNER JOIN PICK_CIEGO ON PC_ID_PROD = CAT_GP_ID AND PC_NOM_PROD = CAT_GP_NOMBRE WHERE (CAT_GP_NOMBRE LIKE ? OR CAT_GP_ID LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'"$, Array As String(q_buscar,q_buscar)) If c.RowCount > 0 Then @@ -957,7 +961,7 @@ Private Sub et_buspc_TextChanged (Old As String, New As String) Next c.Close - d=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD WHERE (CAT_GP_NOMBRE LIKE ? OR CAT_GP_ID LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'AND CAT_GP_ID NOT IN (SELECT PC_ID_PROD FROM PICK_CIEGO)"$, Array As String(q_buscar,q_buscar)) + d=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD3 WHERE (CAT_GP_NOMBRE LIKE ? OR CAT_GP_ID LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'AND CAT_GP_ID NOT IN (SELECT PC_ID_PROD FROM PICK_CIEGO)"$, Array As String(q_buscar,q_buscar)) For i = 0 To d.RowCount - 1 d.Position = i @@ -967,7 +971,7 @@ Private Sub et_buspc_TextChanged (Old As String, New As String) d.Close Else If c.RowCount = 0 Then - d=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD WHERE (CAT_GP_NOMBRE LIKE ? OR CAT_GP_ID LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'"$, Array As String(q_buscar,q_buscar)) + d=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD3 WHERE (CAT_GP_NOMBRE LIKE ? OR CAT_GP_ID LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'"$, Array As String(q_buscar,q_buscar)) For i = 0 To d.RowCount - 1 d.Position = i diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index d82f463..29d48ce 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -438,7 +438,8 @@ Sub B4XPage_Appear Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO2 INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") If credi3.RowCount > 0 Then credi3.Position = 0 - If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then + + If NumberFormat2(credi2.GetString ("SALDO_PENDIENTE"),1,2,2,False) <> NumberFormat2(credi3.GetString ("a_abono"),1,2,2,False) Then MsgboxAsync("La venta sera en efectivo porque el pago del pagare en menor al total de la deuda.","Atención") Else If credi2.GetString ("SALDO_PENDIENTE") = credi3.GetString ("a_abono") Then End If @@ -451,7 +452,7 @@ Sub B4XPage_Appear Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO2 INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") If credi3.RowCount > 0 Then credi3.Position = 0 - If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then + If NumberFormat2(credi2.GetString ("SALDO_PENDIENTE"),1,2,2,False) <> NumberFormat2(credi3.GetString ("a_abono"),1,2,2,False) Then MsgboxAsync("La venta sera en efectivo porque el pago del pagare en menor al total de la deuda.","Atención") Else If credi2.GetString ("SALDO_PENDIENTE") = credi3.GetString ("a_abono") Then End If @@ -2604,15 +2605,40 @@ Sub imprime_pagare Printer1.WriteString("Colonia: " & la_col.Text & CRLF) Printer1.WriteString(" " & CRLF) Dim notaabono As String - c = Starter.skmt.ExecQuery("SELECT NOTA FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + Dim saldopendiente As String + c = Starter.skmt.ExecQuery("SELECT NOTA, DIA_VENCIMIENTO, SALDO_PENDIENTE FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") If c.RowCount > 0 Then c.Position = 0 + + Dim fechatabulador() As String = Regex.Split(" ", c.GetString("DIA_VENCIMIENTO")) + Dim fechatabulador2() As String = Regex.Split("-", fechatabulador(0)) + Dim fechatabulador3 As String = fechatabulador2(2)&"/"&fechatabulador2(1)&"/"&fechatabulador2(0) + notaabono = c.GetString("NOTA") + saldopendiente = c.GetString("SALDO_PENDIENTE") End If + c.Close + +' c = Starter.skmt.ExecQuery("SELECT NOTA FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") +' If c.RowCount > 0 Then +' c.Position = 0 +' notaabono = c.GetString("NOTA") +' End If + Log(notaabono) + Log(et_abono.Text) Printer1.WriteString("Comprobante de pago del pagare" & CRLF) - Printer1.WriteString("con folio: " & notaabono & CRLF) - Printer1.WriteString("por el monto: " &(NumberFormat(et_abono.Text,0,2)) & CRLF) - Printer1.WriteString("el dia: " & sDate & CRLF) + + Printer1.WriteString("Folio: " & notaabono & CRLF) + + Printer1.WriteString("Monto deuda: " & (NumberFormat(saldopendiente,0,2)) & CRLF) + + Printer1.WriteString("Monto abono: " & (NumberFormat(et_abono.Text,0,2)) & CRLF) + + Printer1.WriteString("Restante: " &(NumberFormat(saldopendiente-et_abono.Text,0,2)) & CRLF) + + Printer1.WriteString("Fecha Abono: " & sDate & CRLF) + + Printer1.WriteString("Fecha vencimiento: " & fechatabulador3 & CRLF) Printer1.WriteString(" " & CRLF) Printer1.WriteString(" " & CRLF) @@ -2625,6 +2651,7 @@ Sub imprime_pagare Printer1.WriteString("------------------------------" & CRLF) Printer1.WriteString("-------------FIRMA------------" & CRLF) + Printer1.WriteString(" " & CRLF) Printer1.WriteString(" " & CRLF) Printer1.WriteString(" " & CRLF) Sleep(1000) diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index 1df4531..179d247 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -226,7 +226,7 @@ Sub GUARDA_Click sDate2 = DateTime.Date(DateTime.Now) sTime2 = DateTime.Time(DateTime.Now) - Starter.skmt.ExecNonQuery2("INSERT INTO CLIENTES_NUEVOS(CN_ID, CN_FECHA, CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_FOTO, CN_RUTA, CN_GIRO, CN_SOLICITA,CN_COLONIA, CN_TELEFONO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As String(no_cliente, sDate2 &" "&sTime2, usuario, lat, lon, E_NOMBRE.Text, et_direccion.Text, ALMACEN, no_ruta, cb_giro.SelectedItem, ET_Atiende.Text,et_colonia.Text,et_telefono.Text)) + Starter.skmt.ExecNonQuery2("INSERT INTO CLIENTES_NUEVOS(CN_ID, CN_FECHA, CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_ALMACEN, CN_RUTA, CN_GIRO, CN_SOLICITA,CN_COLONIA, CN_TELEFONO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As String(no_cliente, sDate2 &" "&sTime2, usuario, lat, lon, E_NOMBRE.Text, et_direccion.Text, ALMACEN, no_ruta, cb_giro.SelectedItem, ET_Atiende.Text,et_colonia.Text,et_telefono.Text)) ' fototomada = "0" B4XPages.ShowPage("Cliente") CallSubDelayed(Tracker, "StartFLP") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 50fd6ef..0fb718a 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -975,6 +975,11 @@ Sub cargar_Click cmd.Parameters = Array As Object(ALMACEN,e_ruta.Text) reqManager.ExecuteQuery(cmd , 0, "gunaprod2") + cmd.Initialize + cmd.Name = "select_cat_gunaprod3_MARQUEZ" + cmd.Parameters = Array As Object(ALMACEN,e_ruta.Text) + reqManager.ExecuteQuery(cmd , 0, "gunaprod3") + cmd.Initialize cmd.Name = "select_cat_GIRO_MARQUEZ" reqManager.ExecuteQuery(cmd , 0, "giro") @@ -1581,6 +1586,34 @@ Sub JobDone(Job As HttpJob) End If End If + If Job.JobName = "DBRequest" Then + Dim RESULT As DBResult = reqManager.HandleJob(Job) + If RESULT.Tag = "gunaprod3" Then 'query tag + If PB2.Progress < 30 Then S_CP.Text = "CARGANDO" 'Mod por CHV - 20211028 Agregue el "If PB2.Progress < 30 then" + For Each records() As Object In RESULT.Rows + Dim CAT_GP_ID As String = records(RESULT.Columns.Get("CAT_GP_ID")) + Dim CAT_GP_NOMBRE As String = records(RESULT.Columns.Get("CAT_GP_NOMBRE")) + Dim CAT_GP_IMP1 As String = records(RESULT.Columns.Get("CAT_GP_IMP1")) + Dim CAT_GP_IMP2 As String = records(RESULT.Columns.Get("CAT_GP_IMP2")) + Dim CAT_GP_PRECIO As String = records(RESULT.Columns.Get("CAT_GP_PRECIO")) + Dim CAT_GP_CLASIF As String = records(RESULT.Columns.Get("CAT_GP_CLASIF")) + Dim CAT_GP_STS As String = records(RESULT.Columns.Get("CAT_GP_STS")) + Dim CAT_GP_TIPO As String = records(RESULT.Columns.Get("CAT_GP_TIPO")) + Dim CAT_GP_SUBTIPO As String = records(RESULT.Columns.Get("CAT_GP_SUBTIPO")) + Dim CAT_GP_IMG() As Byte = records(RESULT.Columns.Get("CAT_GP_IMG")) + Dim CAT_GP_ALMACEN As Int = records(RESULT.Columns.Get("CAT_GP_ALMACEN")) + ' Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV")) + Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_GP_TIPOPROD")) + Dim CAT_GP_INICIATIVA As Int = records(RESULT.Columns.Get("CAT_GP_INICIATIVA")) + Dim CAT_DP_PRECIO4 As Float = records(RESULT.Columns.Get("CAT_DP_PRECIO4")) + Dim CAT_DP_CONVERSION1 As Int = records(RESULT.Columns.Get("CAT_DP_CONVERSION1")) +' CAT_GP_INICIATIVA = 5 +' skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_DEV)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD3(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD,CAT_GP_INICIATIVA,CAT_DP_PRECIO4,CAT_DP_CONVERSION1) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_INICIATIVA,CAT_DP_PRECIO4,CAT_DP_CONVERSION1)) + Next + End If + End If + ''AQUI ESTAMOS TRABAJANDO If Job.JobName = "DBRequest" Then @@ -1976,7 +2009,8 @@ Sub JobDone(Job As HttpJob) Dim NOTA As String = records(RESULT.Columns.Get("NOTA")) Dim CLIENTE As String = records(RESULT.Columns.Get("CLIENTE")) Dim SALDO_PENDIENTE As String = records(RESULT.Columns.Get("SALDO_PENDIENTE")) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO ABONOSP(NOTA,CLIENTE,SALDO_PENDIENTE) VALUES (?,?,?)", Array As Object (NOTA, CLIENTE,SALDO_PENDIENTE)) + Dim DIA_VENCIMIENTO As String = records(RESULT.Columns.Get("DIA_VENCIMIENTO")) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO ABONOSP(NOTA,CLIENTE,SALDO_PENDIENTE,DIA_VENCIMIENTO) VALUES (?,?,?,?)", Array As Object (NOTA, CLIENTE,SALDO_PENDIENTE,DIA_VENCIMIENTO)) Next End If End If diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 9cc6078..4efb033 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -143,11 +143,14 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear - If B4XPages.MainPage.tipo_venta = "PREVENTA" Or B4XPages.MainPage.tipo_venta = "ABORDO" Or B4XPages.MainPage.tipo_venta = "RECARGA" Then + If B4XPages.MainPage.tipo_venta = "PREVENTA" Or B4XPages.MainPage.tipo_venta = "ABORDO" Then Starter.tabla = "CAT_GUNAPROD" Else If B4XPages.MainPage.tipo_venta = "VENTA" Then Starter.tabla = "CAT_GUNAPROD2" + Else If B4XPages.MainPage.tipo_venta = "RECARGA" Then + Starter.tabla = "CAT_GUNAPROD3" End If + Log(Starter.tabla) clienteId = Subs.traeCliente rutaUsuario = Subs.traeRuta(Subs.traeCliente) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("PRIORITARIO","1")) @@ -590,6 +593,17 @@ Sub b_prodMenos_Click If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($" $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas}"$).Popall ' Log(lProdX.Text) End If + + If laCant.Text = 0 Then + If maxcajas > 0 Then + panelcajas.Visible = True + Else + panelcajas.Visible = False + End If + Else If laCant.Text > 0 Then + panelcajas.Visible = False + End If + If Subs.totalPedido < 1 Then laCant.Text = "0" invTotal = totalcajasmaspiezas + Subs.traeinventario(id) 'aqui si lo comentamos aparece la parte de cajas diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a index 59bd8b2..c5dc359 100644 --- a/B4A/MARQUEZ.b4a +++ b/B4A/MARQUEZ.b4a @@ -205,7 +205,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Marquez #VersionCode: 1 - #VersionName: 4.11.01 + #VersionName: 4.11.19 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta index 4b43901..c1dd708 100644 --- a/B4A/MARQUEZ.b4a.meta +++ b/B4A/MARQUEZ.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,b_ubicar_Click,2628,0,Diseñador Visual,cliente.bal,-100,6,C_Cliente,imprime_preventa,1349,6,C_Principal,B4XPage_Appear,360,0,C_Principal,nvo_cliente_Click,2538,0,Diseñador Visual,principal.bal,-100,3,C_NuevoCliente,Class_Globals,0,0,C_NuevoCliente,GUARDA_Click,222,6,C_Principal,Subir_Click,694,2,Diseñador Visual,nuevocliente.bal,-100,6 +NavigationStack=Subs,traeTablaProds,1465,3,C_Productos,Busca_TextChanged,1240,0,B4XMainPage,B4XPage_Created,207,0,B4XMainPage,et_buspc_TextChanged,967,0,B4XMainPage,b_arqueocieego_Click,929,0,C_Cliente,gest_Click,515,0,C_Cliente,mandaPendientesrecarga,2084,0,C_Productos,B4XPage_Appear,146,4,C_Productos,B4XPage_Created,119,0,B4XMainPage,JobDone,679,0 SelectedBuild=0 -VisibleModules=1,2,13,4,7,8,9,10,14,29,24,11 +VisibleModules=1,2,13,4,7,8,9,10,14,29,28 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 7545b0d..2d4ae60 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1463,8 +1463,13 @@ End Sub Sub traeTablaProds(tipoventa As String) As String Private tablaProds As String = "cat_gunaprod2" - If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Or tipoventa = "RECARGA" Then tablaProds = "cat_gunaprod" -' LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0)) + If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Then + tablaProds = "cat_gunaprod" + Else if tipoventa = "RECARGA" Then + tablaProds = "cat_gunaprod3" + End If + + LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0)) Return tablaProds End Sub