diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 56ff346..2148047 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -270,7 +270,7 @@ Sub B4XPage_Appear gest.Visible = False bitacora.p_transparenteInicioFin2.Visible = False bitacora.b_Inicio_Fin_venta2.Visible = False - b_ventaabordo.Enabled = False + b_ventaabordo.Visible = False If Subs.hayPedido Then 'Si hay pedido, deshabilitamos el boton de "No Venta" Log(">>>>> HAY PEDIDO") @@ -532,7 +532,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 < 50 Then + If distance < 50000000000000000000000000000000000000000000 Then LA_GEO.TextColor = Colors.Blue Tels.Visible = True gest.Visible = True @@ -1214,13 +1214,13 @@ Sub imprime_preventa Printer1.WriteString(" " & CRLF) 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'"$) + s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_ 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'"$) Dim subtotal As Double s.Position = 0 subtotal = s.GetDouble("SUBTOTAL") s.Close - Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_24' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") + Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_ C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_24' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") subtot.Position = 0 subtotal = subtotal + subtot.GetDouble("TOTAL_SIN_PROMO") subtot.Close @@ -1593,13 +1593,13 @@ Sub imprime_venta Printer1.WriteString(" " & CRLF) 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'"$) + s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_ 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'"$) Dim subtotal As Double s.Position = 0 subtotal = s.GetDouble("SUBTOTAL") s.Close - Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_48' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") + Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_ C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_48' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") subtot.Position = 0 subtotal = subtotal + subtot.GetDouble("TOTAL_SIN_PROMO") subtot.Close @@ -2415,7 +2415,7 @@ End Sub Private Sub b_ventaabordo_Click -' c=B4XPages.MainPage.skmt.ExecQuery("Select * From CAT_GUNAPROD2") +' c=B4XPages.MainPage.skmt.ExecQuery("Select * From CAT_2") c=B4XPages.MainPage.skmt.ExecQuery2("Select * From CAT_GUNAPROD2 where cat_gp_tipo <> ? " , Array As String ("PROMOS")) If c.RowCount > 0 Then diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 39f960b..0e4abb8 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -965,10 +965,10 @@ Sub cargar_Click cmd.Parameters = Array As Object(ALMACEN) reqManager.ExecuteQuery(cmd , 0, "gunaprod") - cmd.Initialize - cmd.Name = "select_cat_gunaprod2_mazapa" - cmd.Parameters = Array As Object(ALMACEN,e_ruta.Text) - reqManager.ExecuteQuery(cmd , 0, "gunaprod2") +' cmd.Initialize +' cmd.Name = "select_cat_gunaprod2_mazapa" +' cmd.Parameters = Array As Object(ALMACEN,e_ruta.Text) +' reqManager.ExecuteQuery(cmd , 0, "gunaprod2") cmd.Initialize cmd.Name = "select_cat_GIRO_mazapa" diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta deleted file mode 100644 index e01d01e..0000000 --- a/B4A/MARQUEZ.b4a.meta +++ /dev/null @@ -1,96 +0,0 @@ -ModuleBookmarks0= -ModuleBookmarks1= -ModuleBookmarks10= -ModuleBookmarks11= -ModuleBookmarks12= -ModuleBookmarks13= -ModuleBookmarks14= -ModuleBookmarks15= -ModuleBookmarks16= -ModuleBookmarks17= -ModuleBookmarks18= -ModuleBookmarks19= -ModuleBookmarks2= -ModuleBookmarks20= -ModuleBookmarks21= -ModuleBookmarks22= -ModuleBookmarks23= -ModuleBookmarks24= -ModuleBookmarks25= -ModuleBookmarks26= -ModuleBookmarks27= -ModuleBookmarks28= -ModuleBookmarks29= -ModuleBookmarks3= -ModuleBookmarks30= -ModuleBookmarks4= -ModuleBookmarks5= -ModuleBookmarks6= -ModuleBookmarks7= -ModuleBookmarks8= -ModuleBookmarks9= -ModuleBreakpoints0= -ModuleBreakpoints1= -ModuleBreakpoints10= -ModuleBreakpoints11= -ModuleBreakpoints12= -ModuleBreakpoints13= -ModuleBreakpoints14= -ModuleBreakpoints15= -ModuleBreakpoints16= -ModuleBreakpoints17= -ModuleBreakpoints18= -ModuleBreakpoints19= -ModuleBreakpoints2= -ModuleBreakpoints20= -ModuleBreakpoints21= -ModuleBreakpoints22= -ModuleBreakpoints23= -ModuleBreakpoints24= -ModuleBreakpoints25= -ModuleBreakpoints26= -ModuleBreakpoints27= -ModuleBreakpoints28= -ModuleBreakpoints29= -ModuleBreakpoints3= -ModuleBreakpoints30= -ModuleBreakpoints4= -ModuleBreakpoints5= -ModuleBreakpoints6= -ModuleBreakpoints7= -ModuleBreakpoints8= -ModuleBreakpoints9= -ModuleClosedNodes0= -ModuleClosedNodes1= -ModuleClosedNodes10= -ModuleClosedNodes11= -ModuleClosedNodes12= -ModuleClosedNodes13= -ModuleClosedNodes14= -ModuleClosedNodes15= -ModuleClosedNodes16= -ModuleClosedNodes17= -ModuleClosedNodes18= -ModuleClosedNodes19= -ModuleClosedNodes2= -ModuleClosedNodes20= -ModuleClosedNodes21= -ModuleClosedNodes22= -ModuleClosedNodes23= -ModuleClosedNodes24= -ModuleClosedNodes25= -ModuleClosedNodes26= -ModuleClosedNodes27= -ModuleClosedNodes28= -ModuleClosedNodes29= -ModuleClosedNodes3= -ModuleClosedNodes30= -ModuleClosedNodes4= -ModuleClosedNodes5= -ModuleClosedNodes6= -ModuleClosedNodes7= -ModuleClosedNodes8= -ModuleClosedNodes9= -NavigationStack=Diseñador Visual,nota.bal,-100,1,Diseñador Visual,mapa_rutas.bal,-100,1,Diseñador Visual,mapa_cliente.bal,-100,1,Diseñador Visual,MainPage.bal,-100,1,Diseñador Visual,folioabono.bal,-100,1,Diseñador Visual,datoscliente.bal,-100,1,Diseñador Visual,clientes.bal,-100,1,Diseñador Visual,cliente.bal,-100,1,Diseñador Visual,celltitle.bal,-100,1,C_Principal,Subir_Click,694,2 -SelectedBuild=0 -VisibleModules=1,2,13,4,7,8,9,10,14,29,17,28,30 diff --git a/B4A/MAZAPA.b4a b/B4A/MAZAPA.b4a index d90df84..11c9e27 100644 --- a/B4A/MAZAPA.b4a +++ b/B4A/MAZAPA.b4a @@ -204,12 +204,12 @@ Module9=C_Mapas NumberOfFiles=68 NumberOfLibraries=33 NumberOfModules=31 -Version=13 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: mazapa #VersionCode: 1 - #VersionName: 4.12.11 + #VersionName: 4.12.16 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MAZAPA.b4a.meta b/B4A/MAZAPA.b4a.meta index 17e38cd..3842615 100644 --- a/B4A/MAZAPA.b4a.meta +++ b/B4A/MAZAPA.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,B4XPage_Appear,139,0,C_Principal,CARGA_Click,2398,0,C_Principal,cargar_Click,1042,6,C_Principal,JobDone,1327,3,C_Cliente,imprime_preventa,1205,0,Diseñador Visual,clientes.bal,-100,2,C_Cliente,B4XPage_Appear,488,1,Subs,revisaUUG,388,0,C_Cliente,MODS,0,0,C_Cliente,GPS_LocationChanged,546,6 +NavigationStack=C_Productos,Class_Globals,0,0,C_Productos,b_prodMas_Click,670,0,Subs,actualizaProducto,807,0,Subs,actualizaProducto2,850,0,Subs,guardaProductoSinGestion,786,0,Subs,guardaProductoSinGestion2,832,0,Main,Activity_Create,32,0,C_Cliente,b_ventaabordo_Click,2412,0,C_Cliente,B4XPage_Appear,498,0,C_Cliente,GPS_LocationChanged,528,0 SelectedBuild=0 -VisibleModules=29,1,2,14,5,12,3,6,7,8,30 +VisibleModules=29,1,2,14,5,12,3,6,7,8,30,15 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index cc28aca..4c2c027 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -834,7 +834,9 @@ Sub guardaProductoSinGestion2(cedis As String, costoU As String, cant As String, ' LogColor("guardaProducto: "&prodId&", cant="&cant, Colors.Magenta) Private c As Cursor B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO,PE_ENVIO_OK,PE_CANTC,PE_BCAJAS) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0,?,?) ", Array As Object (cedis, (cantc * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta,cantc,bcajas)) - B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId)) +' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId)) + B4XPages.MainPage.skmt.ExecNonQuery2($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId)) + B4XPages.MainPage.skmt.ExecNonQuery2($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId)) c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") c.Position=0 B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") @@ -852,7 +854,9 @@ Sub actualizaProducto2(cedis As String, costoU As String, cant As Int, nombre As If IsNumber(c.GetInt("PE_CANT")) Then antCant=c.GetInt("PE_CANT") Private difCant As Int = cant - antCant B4XPages.MainPage.skmt.ExecNonQuery($"update pedido set pe_cant = ${cant}, pe_costo_tot = ${(cantc*c.GetString("PE_COSTOU"))}, PE_CANTC = ${cantc}, PE_BCAJAS = ${bcajas} where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' AND PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$) - B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$) +' B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$) + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$) + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$) ' Log($"CANT=${cant}"$) If cant = 0 Then Log("BORRAMOS PROD")