diff --git a/B4A/C_DetalleVenta.bas b/B4A/C_DetalleVenta.bas index 65008b7..891a83c 100644 --- a/B4A/C_DetalleVenta.bas +++ b/B4A/C_DetalleVenta.bas @@ -49,6 +49,8 @@ Sub Class_Globals Private b_prodMasC As Button Private p_botMasMenC As Panel Private p_botMasMen As Panel + Private l_cajas As Label + Private l_piezas As Label End Sub 'You can add more parameters here. @@ -425,6 +427,7 @@ Sub CreateListItem(Text As String, precioU As String, inv As Int, inv2 As Int, W l_pCant.BringToFront et_pCant.SendToBack p_botMasMenC.Visible = False + l_cajas.Visible = False ' i_prod.Bitmap = img Return p End Sub @@ -455,6 +458,7 @@ Sub CreateListItem2(Text As String, precioU As String, inv As Int, inv2 As Int, l_pCantC.BringToFront et_pCantC.SendToBack p_botMasMen.Visible = False + l_piezas.Visible = False ' i_prod.Bitmap = img Return p End Sub diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index e32eb90..e6ab8da 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -44,6 +44,10 @@ End Sub Sub B4XPage_Appear reqManager.Initialize(Me, B4XPages.MainPage.SERVER) e_comm.Text="" + r_1.Checked = False + r_2.Checked = False + r_3.Checked = False + r_4.Checked = False End Sub Sub GPS_LocationChanged (Location1 As Location) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index e6431b2..6e1d034 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -464,7 +464,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_reparto_noventa_MARQUEZ_REPG" cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, l_ruta.Text) - reqManager.ExecuteQuery(cmd , 0, "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next c.Close End If @@ -480,7 +480,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_rep_hist_ventas_marquez_REPG" cmd.Parameters = Array As Object(C.GetString("HVD_CLIENTE"),C.GetString("HVD_PRONOMBRE"),C.GetString("HVD_CANT"),C.GetString("HVD_COSTO_TOT"),C.GetString("HVD_CODPROMO"),C.GetString("HVD_PROID"),C.GetString("HVD_NUM_TICKET"),C.GetString("HVD_NUM_REGISTRO"),C.GetString("HVD_RECHAZO"),C.GetString("HVD_PARCIAL"), ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "inst_noventa") + reqManager.ExecuteCommand(cmd , "inst_noventa") Next c.Close End If @@ -493,7 +493,7 @@ Sub Subir_Click cmd.Initialize cmd.Name = "insert_pedido_REPG" cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),"0","VENTA") - reqManager.ExecuteQuery(cmd , 0, "ins_pedido") + reqManager.ExecuteCommand(cmd , "ins_pedido") Next c.Close End If @@ -562,6 +562,31 @@ Sub Subir_Click b.Close f.Close End If + + c = Starter.skmt.ExecQuery("SELECT IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_CLIENTE, HVD_PROID, HVD_FECHA, HVD_CODPROMO, HVD_NUM_TICKET FROM HIST_VENTAS") + If c.RowCount > 0 Then + For i=0 To c.RowCount -1 + c.Position = i + Private d4 As Cursor = Starter.skmt.ExecQuery($"SELECT CAT_CL_RUTA FROM kmt_info WHERE CAT_CL_CODIGO = '${c.GetString("HVD_CLIENTE")}'"$) + d4.Position = 0 + + Dim fecha1() As String = Regex.Split(" ", c.GetString("HVD_FECHA")) + Dim fecha2() As String = Regex.Split("-", fecha1(0)) + Dim fecha3 As String = fecha2(2)&"/"&fecha2(1)&"/"&fecha2(0) + Log(fecha3) + Dim hora() As String = Regex.Split("\.", fecha1(1)) + Log(hora(0)) + + cmd.Initialize + cmd.Name = "update_HVD_MARQUEZrep" + cmd.Parameters = Array As Object(c.GetString("HVD_RECHAZOCANT"), c.GetString("HVD_CLIENTE"), c.GetString("HVD_PROID"),fecha3&" "&hora(0), d4.GetString("CAT_CL_RUTA"),ALMACEN,l_ruta.Text,c.GetString("HVD_CODPROMO"),c.GetString("HVD_NUM_TICKET")) +' HVD_CANT_RECHAZO_MOVIL = ? where HVD_CLIENTE = ? And HVD_PROID = ? And TRUNC(HVD_FECHA) = TRUNC(to_date((?),DD/MM/YYYY HH24:MI:ss)) AND HVD_RUTA = ? AND HVD_ALMACEN = ? AND HVD_COBA = ? AND HVD_CODPROMO = ? AND HVD_NUM_TICKET = ? + reqManager.ExecuteCommand(cmd, "update_hvd") + d4.Close + Next + End If + c.Close + c = Starter.skmt.ExecQuery("SELECT MIL, QUINIENTOS, DOCIENTOS, CIEN, CINCUENTA, VEINTE FROM TABULADOR_BILLETES") d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA") diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index f0ccd3a..e11bf36 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1188,6 +1188,11 @@ Sub Class_Globals Private b_revversar As Button Private Label2 As Label Private Label3 As Label + Private l_piezas As Label + Private l_cajas As Label + + Private l_cajas As Label + Private l_piezas As Label End Sub 'You can add more parameters here. @@ -1546,6 +1551,7 @@ Sub CreateListItem(Text As String, precioU As String, inv As Int, inv2 As Int, W l_pCant.BringToFront et_pCant.SendToBack p_botMasMenC.Visible = False + l_cajas.Visible = False ' i_prod.Bitmap = img Return p End Sub @@ -1576,6 +1582,7 @@ Sub CreateListItem2(Text As String, precioU As String, inv As Int, inv2 As Int, l_pCantC.BringToFront et_pCantC.SendToBack p_botMasMen.Visible = False + l_piezas.Visible = False ' i_prod.Bitmap = img Return p End Sub diff --git a/B4A/Files/check.bal b/B4A/Files/check.bal index bf60695..7854bb6 100644 Binary files a/B4A/Files/check.bal and b/B4A/Files/check.bal differ diff --git a/B4A/Files/clientes.bal b/B4A/Files/clientes.bal index c7a942b..ce487dd 100644 Binary files a/B4A/Files/clientes.bal and b/B4A/Files/clientes.bal differ diff --git a/B4A/Files/detalle_promo.bal b/B4A/Files/detalle_promo.bal index 14ef3fb..0376a1d 100644 Binary files a/B4A/Files/detalle_promo.bal and b/B4A/Files/detalle_promo.bal differ diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index 7509698..dfbf0cb 100644 Binary files a/B4A/Files/login.bal and b/B4A/Files/login.bal differ diff --git a/B4A/Files/mapa.bal b/B4A/Files/mapa.bal index d9624ae..08ee427 100644 Binary files a/B4A/Files/mapa.bal and b/B4A/Files/mapa.bal differ diff --git a/B4A/Files/mapa_cliente.bal b/B4A/Files/mapa_cliente.bal index cace635..8651810 100644 Binary files a/B4A/Files/mapa_cliente.bal and b/B4A/Files/mapa_cliente.bal differ diff --git a/B4A/Files/mariana.jpg b/B4A/Files/mariana.jpg new file mode 100644 index 0000000..d294384 Binary files /dev/null and b/B4A/Files/mariana.jpg differ diff --git a/B4A/Files/nuevocliente.bal b/B4A/Files/nuevocliente.bal index 584381c..b46991c 100644 Binary files a/B4A/Files/nuevocliente.bal and b/B4A/Files/nuevocliente.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index ded491b..443fffc 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/proditem2.bal b/B4A/Files/proditem2.bal index 28813c2..b228cd4 100644 Binary files a/B4A/Files/proditem2.bal and b/B4A/Files/proditem2.bal differ diff --git a/B4A/Files/productos.bal b/B4A/Files/productos.bal index 982be58..f1fc784 100644 Binary files a/B4A/Files/productos.bal and b/B4A/Files/productos.bal differ diff --git a/B4A/Marquez_Reparto.b4a b/B4A/Marquez_Reparto.b4a index 55c5282..7b0988f 100644 --- a/B4A/Marquez_Reparto.b4a +++ b/B4A/Marquez_Reparto.b4a @@ -502,8 +502,8 @@ File1448=mapa.bal File1449=mapa_cliente.bal File145=118maker-azul4.png File1450=mapa_rutas.bal -File1451=mariana_logo_192x192.jpg -File1452=MARQUEZ_logo_192x192.jpg +File1451=mariana.jpg +File1452=mariana_logo_192x192.jpg File1453=no_venta.bal File1454=nuevocliente.bal File1455=pedido.bal diff --git a/B4A/Marquez_Reparto.b4a.meta b/B4A/Marquez_Reparto.b4a.meta index 19aae58..e78fc73 100644 --- a/B4A/Marquez_Reparto.b4a.meta +++ b/B4A/Marquez_Reparto.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=1,2,3,6,7,8,9,10,13,15,16 ModuleClosedNodes8= ModuleClosedNodes9=5,6,7,8,9,13,14,15,16,17,20 -NavigationStack=C_Principal,Subir_Click,571,0,B4XMainPage,b_CargarMonto_Click,423,1,B4XMainPage,muestraProgreso,420,0,B4XMainPage,B_Can_Monto_Click,505,0,B4XMainPage,Class_Globals,84,0,B4XMainPage,B4XPage_Created,133,2,C_Principal,cargar_Click,603,0,B4XMainPage,B_Aceptar_Monto_Click,547,6,Diseñador Visual,login.bal,-100,6,B4XMainPage,JobDone,325,6 +NavigationStack=Diseñador Visual,mapa_rutas.bal,-100,1,Diseñador Visual,no_venta.bal,-100,1,Diseñador Visual,nuevocliente.bal,-100,2,Diseñador Visual,pedido.bal,-100,1,Diseñador Visual,principal.bal,-100,3,Diseñador Visual,proditem.bal,-100,1,Diseñador Visual,productos.bal,-100,5,Diseñador Visual,tabulador.bal,-100,1,Diseñador Visual,telefonos.bal,-100,1,B4XMainPage,B_Aceptar_Monto_Click,516,0 SelectedBuild=0 -VisibleModules=27,2,16,7,26,28,5,17,6,9 +VisibleModules=27,2,16,7,26,28,5,17,6,9,13