diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index fac0100..001bebb 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -2307,7 +2307,7 @@ Sub resdia_Click SCROLL_RESDIA.Visible = True SCROLL_RESDIA.Panel.LoadLayout("RESDIA") SCROLL_RESDIA.Panel.Height = Panel4.Height - Panel4.Visible = False + Panel4.Visible = True NUEVO.Visible =False BUSCA.Visible=False diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 61727d6..e21d895 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -191,7 +191,7 @@ Sub B4XPage_Appear c = B4XPages.MainPage.skmt.ExecQuery($"SELECT CUENTA FROM CUENTAA"$) c.Position = 0 - If c.GetString("CUENTA") <> "0" and c.GetString("CUENTA") <> "1" Then + If c.GetString("CUENTA") <> "0" And c.GetString("CUENTA") <> "1" Then c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String("PROMOS", "PROMOS")) ' Log($"res:${c2.RowCount}, ${Value}, ${marca}, ${tipo}"$) Private hayPromos As Boolean = False @@ -1128,7 +1128,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In et_pCant.TextColor=Colors.Red et_pCantc.TextColor=Colors.Red If Subs.pedidoGuardado Then - Log("YA SE GUARDO") +' Log("YA SE GUARDO") et_pCant.Enabled = False ' b_prodMas.Enabled = False b_prodMenos.Enabled = False @@ -1176,7 +1176,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In Log("cajas a 0") Else Private maxcajas As Int = clv_prods_ll.GetValue(i).As(Map).Get("almacen")/clv_prods_ll.GetValue(i).As(Map).Get("conversion") - Log("cajas no a 0") +' Log("cajas no a 0") End If ' Private maxcajas As Int = clv_prods_ll.GetValue(i).As(Map).Get("almacen")/clv_prods_ll.GetValue(i).As(Map).Get("conversion") l_prodX.Text = cs.Color(Colors.red).append(clv_prods_ll.GetValue(i).As(Map).Get("prod")).pop.append(CRLF).Append("Existencias: " & clv_prods_ll.GetValue(i).As(Map).Get("almacen")).Color(0xFF017F01).Append($" $${precio}${CRLF}Max. Cajas: ${maxcajas}"$).Popall @@ -1257,6 +1257,7 @@ Sub LlenaProdsLL(p As ResultSet) Else If pe.GetString("PE_BCAJAS") = 1 Then cantsMap.put(pe.GetString("PE_PROID"), pe.GetString("PE_CANTC")) End If + Log(clienteId &"|||||"&pe.GetString("PE_PROID")&"|||||"& pe.GetString("PE_CANT")) Loop pe.Close End If @@ -1268,14 +1269,18 @@ Sub LlenaProdsLL(p As ResultSet) LogColor(Starter.tabla,Colors.blue) ' Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$) - Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS 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, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS 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"$) + 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, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS 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, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS 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"$) End If Do While p.NextRow Private cant As Int = 0 - If hayPedido And cantsMap.ContainsKey(p.GetString("CAT_GP_ID")) Then cant = cantsMap.Get(p.GetString("CAT_GP_ID")) + If hayPedido And cantsMap.ContainsKey(p.GetString("CAT_GP_ID")) Then + Log(p.GetString("CAT_GP_ID")) + cant = cantsMap.Get(p.GetString("CAT_GP_ID")) + End If Dim tempMap As Map = CreateMap("prod":p.GetString("CAT_GP_NOMBRE"), "precio":p.GetString("CAT_GP_PRECIO"), "almacen":p.GetString("CAT_GP_ALMACEN"), "id":p.GetString("CAT_GP_ID"), "cant":cant, "conversion":p.GetString("CAT_DP_CONVERSION1"), "precio_caja":p.GetString("CAT_DP_PRECIO4"), "b_caja":p.GetString("PE_BCAJAS")) + Log(tempMap) listaProds.Add(tempMap) Loop p.Close diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index 7dbe8dd..de27694 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -56,7 +56,7 @@ End Sub Sub B4XPage_Appear nombre_boton = "NOVENTA" - c=B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") + c=B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") Dim noArticulos As Int = 0 ListView1.Clear diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a index 64022a1..f6ca8ca 100644 --- a/B4A/MARQUEZ.b4a +++ b/B4A/MARQUEZ.b4a @@ -194,7 +194,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Marquez #VersionCode: 1 - #VersionName: 4.07.03 + #VersionName: 4.07.11 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta index d8388e0..d4f8a39 100644 --- a/B4A/MARQUEZ.b4a.meta +++ b/B4A/MARQUEZ.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,B4XPage_Created,242,1,C_Principal,B4XPage_Appear,406,2,C_Principal,Subir_Click,822,4,C_Principal,JobDone,1261,1,MAPA_RUTAS,Activity_Create,55,0,MAPA_RUTAS,MapFragment1_Ready,179,5,C_Cliente,B4XPage_Appear,435,0,C_Principal,Class_Globals,0,0,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,187,0,C_Cliente,mandaPendientesrecarga,1744,6 +NavigationStack=C_Productos,LlenaProdsLL,1299,6,Main,Activity_Create,28,0,C_TicketsDia,Class_Globals,0,0,C_TicketsDia,B4XPage_Appear,52,2,C_TicketsDia,B4XPage_Created,32,0,C_Principal,B4XPage_CloseRequest,1991,0,C_Principal,B_OK_RES_Click,2273,3,Diseñador Visual,principal.bal,-100,6,Diseñador Visual,resdia.bal,-100,2,C_Principal,resdia_Click,2303,1 SelectedBuild=0 -VisibleModules=1,2,13,4,7,8,9,10,14,28,24 +VisibleModules=1,2,13,4,7,8,9,10,14,28,18