From 72594321c5028aafb32075b066347ed764b18afc Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 4 May 2024 13:10:08 -0600 Subject: [PATCH] - Correccion al codigo de pedido sugerido, al aceptar pedido sugerido se borraba el pedido del ultimo cliente con venta. --- B4A/C_Cliente.bas | 23 ++++++++++++++++++----- B4A/C_Nota.bas | 6 +++++- B4A/C_Principal.bas | 29 +++++++++++++++-------------- B4A/C_Productos.bas | 3 ++- B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 4 ++-- B4A/Subs.bas | 20 ++++++++++++++------ B4A/kms_helperSubs.bas | 2 +- 8 files changed, 58 insertions(+), 31 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 3b4457d..b79a39a 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -352,7 +352,11 @@ Private Sub B4XPage_Created (Root1 As B4XView) ' Else ' l_doe.Visible = False ' End If - If kh.clienteConDOE Then l_doe.Visible = True Else l_doe.Visible = False + If kh.clienteConDOE And l_doe.IsInitialized Then + l_doe.Visible = True + Else + If l_doe.IsInitialized Then l_doe.Visible = False + End If '''FIN CLIENTES DOE l_total.Text = s.GetString("TOTAL_CLIE") total_cliente = s.GetString("TOTAL_CLIE") @@ -401,7 +405,7 @@ End Sub Sub B4XPage_Appear indicePregunta = 0 b_noVenta.Enabled = False - Log(kh.traeTotalCliente) +' Log(kh.traeTotalCliente) If kh.traeTotalCliente = 0 Then b_noVenta.Enabled = True clienteId = kh.traeCliente P_DOE.Visible = False @@ -516,7 +520,11 @@ Sub B4XPage_Appear ' Else ' l_doe.Visible = False ' End If - If kh.clienteConDOE Then l_doe.Visible = True Else l_doe.Visible = False + If kh.clienteConDOE And l_doe.IsInitialized Then + l_doe.Visible = True + Else + If l_doe.IsInitialized Then l_doe.Visible = False + End If LONGITUD = 0 If c.GetString("CAT_CL_LONG") <> Null And c.GetString("CAT_CL_LONG") <> "null" And IsNumber(c.GetString("CAT_CL_LONG")) Then LONGITUD = c.GetString("CAT_CL_LONG") LATITUD = 0 @@ -910,6 +918,7 @@ Sub Guardar_Click c = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") c.Position = 0 If c.GetString("CUANTOS") > 0 Then + Log("###### delete from pedido_cliente") Starter.skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)") Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) @@ -1082,7 +1091,7 @@ Sub B_IMP_Click End Sub Sub B_IMP2_Click - LogColor(kh.traeDisponibleAbordo,Colors.Green) +' LogColor(kh.traeDisponibleAbordo,Colors.Green) If kh.traeDisponibleAbordo < 0 And la_cuenta.Text = "0" Then Msgbox2Async("No tienes venta suficiente","Atención", "Modificar pedido", "", "Borrar pedido",LoadBitmap(File.DirAssets,"alert2.png"),False) Wait For Msgbox_Result (result As Int) @@ -1091,7 +1100,8 @@ Sub B_IMP2_Click B4XPages.ShowPage("Productos") Else If result = DialogResponse.NEGATIVE Then ' ToastMessageShow("Negativo",True) - B4XPages.MainPage.nota.borra_Click + Subs.borraPedidoClienteActual + ToastMessageShow("Abordo BORRADO!", True) B4XPage_Appear End If Else @@ -3924,6 +3934,7 @@ Private Sub b_aceptarrpomo_Click Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799")) c=Starter.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 + Log("###### delete from pedido_cliente") Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN"))) @@ -3966,6 +3977,7 @@ Private Sub b_aceptarrpomo_Click Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799")) c=Starter.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 + Log("###### delete from pedido_cliente") Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN"))) @@ -4081,6 +4093,7 @@ Private Sub BP_DOE_A_Click Starter.skmt.ExecNonQuery2("UPDATE PEDIDO SET PE_CEDIS = ?, PE_TIPO = ? WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As Object("DOE","DOE")) c=Starter.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 + Log("###### delete from pedido_cliente") Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta) Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN"))) diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 4cfbb75..3e2f627 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -97,7 +97,11 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear - If kh.clienteConDOE Then l_tipoPedido.Visible = True Else l_tipoPedido.Visible = False + If kh.clienteConDOE And l_tipoPedido.IsInitialized Then + l_tipoPedido.Visible = True + Else + If l_tipoPedido.IsInitialized Then l_tipoPedido.Visible = False + End If pedidoMostrado = "NORMAL" Dim sumatotal As Double = 0 c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_CEDIS = ?", Array As String("DOE")) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 0a71370..9081f5d 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -424,7 +424,7 @@ Sub B4XPage_Appear c.Close ' Subs.guardaUltimaActividadBD("principal") - ' Revisamos si hay abordo y si SI hay y no esta impreso, lo borramos. +' Revisamos si hay abordo y si SI hay y no esta impreso, lo borramos. Private imp As ResultSet = Starter.skmt.ExecQuery("select IMPRESION from kmt_info where CAT_CL_CODIGO = '0'") 'Revisamos si el cliente 0 esta impreso. Private abordoImpreso As Boolean = False Do While imp.NextRow @@ -436,7 +436,6 @@ Sub B4XPage_Appear LogColor("BORRAMOS PEDIDO DE ABORDO PORQUE NO ESTA IMPRESO", Colors.red) ' Starter.skmt.ExecNonQuery("delete from PEDIDO where PE_CLIENTE = '0'") 'Borramos el abordo si no esta impreso. Subs.actualizaProducto(ALMACEN, 0, 0, ab.GetString("PE_PRONOMBRE"), ab.GetString("PE_PROID"), ab.GetString("PE_CLIENTE"), Subs.traeFecha, Subs.traeUsuarioDeBD, ab.GetString("PE_RUTA"), 0, ab.GetString("PE_TIPO")) - End If Loop @@ -2555,18 +2554,20 @@ Sub B_PROXIMA_Click Wait For Msgbox_Result (result As Int) If result = DialogResponse.POSITIVE Then ' If horaentrada Then - For i = 0 To e.RowCount - 1 - e.Position = i - c = Starter.skmt.ExecQuery2("SELECT * FROM CAT_GUNAPROD WHERE CAT_GP_ID = ?",Array As String(e.GetString("ID_PRODUCTO"))) - If c.RowCount > 0 Then - c.Position = 0 - Subs.actualizaProducto(e.GetString("ALMACEN"), c.GetString("CAT_GP_PRECIO"),e.GetString("PROMEDIO"), c.GetString("CAT_GP_NOMBRE"), e.GetString("ID_PRODUCTO"),"0",Subs.traeFecha,usuario,e.GetString("RUTA"),c.GetString("CAT_GP_PRECIO"),"ABORDO") - End If - Next - Starter.skmt.ExecNonQuery("delete from CUENTAA") - Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) - Starter.tipov = "ABORDO" - B4XPages.ShowPage("Productos") + Starter.skmt.ExecNonQuery("delete from CUENTAA") + Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) ' Ponemos el cliente actual en 0 + For i = 0 To e.RowCount - 1 + e.Position = i + c = Starter.skmt.ExecQuery2("SELECT * FROM CAT_GUNAPROD WHERE CAT_GP_ID = ?",Array As String(e.GetString("ID_PRODUCTO"))) + If c.RowCount > 0 Then + c.Position = 0 + Subs.actualizaProducto(e.GetString("ALMACEN"), c.GetString("CAT_GP_PRECIO"),e.GetString("PROMEDIO"), c.GetString("CAT_GP_NOMBRE"), e.GetString("ID_PRODUCTO"),"0",Subs.traeFecha,usuario,e.GetString("RUTA"),c.GetString("CAT_GP_PRECIO"),"ABORDO") + End If + Next + Starter.skmt.ExecNonQuery("delete from CUENTAA") + Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) + Starter.tipov = "ABORDO" + B4XPages.ShowPage("Productos") ' End If Else If result = DialogResponse.NEGATIVE Then ' If horaentrada Then diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 6ab5d74..f63d088 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1071,11 +1071,12 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object) If c.GetString("TOTAL_CLIE") < 1 Then Starter.skmt.ExecNonQuery("delete from pedido where PE_PRONOMBRE like 'CAMBIO%' and PE_CLIENTE In (select cuenta from cuentaa)"$) End If - + Log("###### delete from pedido_cliente") Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Else + Log("###### delete from pedido_cliente") Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") End If diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index e38e332..4f2c3ab 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -869,7 +869,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.05.01 + #VersionName: 4.05.02 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 6b0e55b..3644c4e 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=kms_helperSubs,traeVentaAbordo,791,0,kms_helperSubs,traeLimiteAbordoXInventario,778,0,B4XMainPage,Class_Globals,23,0,Visual Designer,productos.bal,-100,1,C_Principal,B_PROXIMA_Click,2518,4,C_Principal,horaentrada,2595,0,Subs,actualizaProducto,952,0,C_Principal,B4XPage_Appear,436,6,Main,Globals,25,0,Main,Process_Globals,22,0 +NavigationStack=C_Nota,B4XPage_Appear,102,1,Subs,actualizaProducto,955,6,C_Principal,B_PROXIMA_Click,2563,6,kms_helperSubs,clienteConDOE,898,0,C_Cliente,B4XPage_Created,348,3,C_Nota,B4XPage_Created,74,0,C_Cliente,B_IMP_Click,1085,0,C_Cliente,B4XPage_Appear,401,1,kms_helperSubs,traeDisponibleAbordo,796,0,C_Cliente,B_IMP2_Click,1087,6,Main,Process_Globals,22,0 SelectedBuild=0 -VisibleModules=1,27,11,3,12,4,28,17,23,29 +VisibleModules=1,27,11,3,12,4,28,17,23,29,7 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 0f6eda1..935ac20 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -933,7 +933,9 @@ Sub guardaProductoSinGestion(cedis As String, costoU As String, cant As String, If cedis <> "DUR" Then Starter.skmt.ExecNonQuery2($"update ${traeTablaProds(tipoVenta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId)) c=Starter.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 - Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + Log("###### delete from pedido_cliente - " & traeCliente & "|" & clienteId) + Log($"delete from pedido_cliente where PC_CLIENTE = '${traeCliente}'"$) + Starter.skmt.ExecNonQuery($"delete from pedido_cliente where PC_CLIENTE = '${traeCliente}'"$) Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clienteId, fecha, usuario, c.GetString("CANT_CLIE"), c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, cedis, rutaV, c.GetString("TOTAL_CLIE_SIN"))) End Sub @@ -947,6 +949,7 @@ Sub guardaProductoSin(cedis As String, costoTot As String, costoU As String, can Private sTime As String =DateTime.Time(DateTime.Now) Private c As Cursor = Starter.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 + Log("###### delete from pedido_cliente - " & traeCliente & "|" & clienteId) Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clienteId, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps, cedis, rutaV, c.GetString("TOTAL_CLIE_SIN"))) Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") @@ -956,7 +959,7 @@ End Sub Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String) If nombre.Length < 6 Then ToastMessageShow("(actualizaProducto) El nombre del producto no es valido " & nombre, True) - LogColor($"actualizaProducto, p=${prodId}, nombre=${nombre}, cant=${cant}, cedis=${cedis}, tipo=${tipoVenta}"$, Colors.Magenta) + LogColor($"actualizaProducto, c=${clienteId}, p=${prodId}, nombre=${nombre}, cant=${cant}, cedis=${cedis}, tipo=${tipoVenta}"$, Colors.Magenta) ' Private tablaProds As String = "cat_gunaprod2" ' If tipoVenta = "ABORDO" Then tablaProds = "cat_gunaprod" Private c As Cursor=Starter.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}'"$) @@ -974,7 +977,11 @@ Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre Log($"Borramos pe_cedis='${cedis}' and pe_proid='${prodId}' and pe_cliente='${clienteId}'"$) Private pe As Cursor = Starter.skmt.ExecQuery("select count(pe_cliente) as cuantosPedidos from pedido where pe_cliente In (select cuenta from cuentaa)") pe.Position=0 - If pe.GetString("cuantosPedidos") = 0 Then Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + If pe.GetString("cuantosPedidos") = 0 Then + Log("###### delete from pedido_cliente - " & traeCliente & "|" & clienteId) + Log($"delete from pedido_cliente where PC_CLIENTE = '${traeCliente}'"$) + Starter.skmt.ExecNonQuery($"delete from pedido_cliente where PC_CLIENTE = '${traeCliente}'"$) + End If End If Else 'INSERTAMOS @@ -1502,7 +1509,7 @@ Sub borraPedidoClienteActual As String 'la intencion es que al borrar el pedido, y queda doe o normal, no se borre el cliente de pedido_cliente thisC = Starter.skmt.ExecQuery($"select pe_cedis from pedido where pe_cliente in (Select CUENTA from cuentaa)"$) If thisC.RowCount < 1 Then Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") - + Log("###### delete from pedido_cliente - " & traeCliente) Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Return 1 End Sub @@ -1526,6 +1533,7 @@ Sub borraPedidoDOEClienteActual As String Next End If thisC = Starter.skmt.ExecQuery($"select pe_cedis from pedido where pe_cliente in (Select CUENTA from cuentaa)"$) + Log("###### delete from pedido_cliente - " & traeCliente) If thisC.RowCount < 1 Then Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)") Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa) and PE_CEDIS = 'DOE'") Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") @@ -1659,7 +1667,7 @@ End Sub Sub fechanormal(fecha As String) As String 'ignore ' Log(fecha) Dim OrigFormat As String = DateTime.DateFormat 'save orig date format - DateTime.DateFormat = "HH:mm:ss" + DateTime.DateFormat = "YYYY/MM/dd HH:mm:ss" Dim nuevaFecha As String=DateTime.Date(fecha) DateTime.DateFormat = OrigFormat 'return to orig date format ' Log(nuevaFecha) @@ -1685,7 +1693,7 @@ Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As cmd.Initialize If eventob <> "Termina Venta" Then cmd.Name = "mandaBitacora3" - Log("BITACORA2") + Log("BITACORA3") Log($"'${almacenb}', '${usuariob}', '${rutab}', '${eventob}', '${clienteb}', '${traeNombreCliente(clienteb)}','${ iniciob}', '${finb}','${ latitudb}','${ longitudb}', '${precision}', '${motivonoventa}', '${motivonovisita}', '${fechab}'"$) ' TMP_ALMACEN, TMP_USUARIO, TMP_RUTA, TMP_EVENTO, TMP_ID_CLIENTE, TMP_NOMBRE_CLIENTE, TMP_INICIO, TMP_FINAL, TMP_LATITUD, TMP_LONGITUD, TMP_PRESICION, TMP_MOTIVO_NO_VENTA, TMP_MOTIVO_NO_VISITA, TMP_FECHA_SINC cmd.Parameters = Array As Object(almacenb, usuariob, rutab, eventob, clienteb, traeNombreCliente(clienteb), iniciob, finb, latitudb, longitudb, precision, motivonoventa, motivonovisita, fechab) diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas index afd09c6..5a437e1 100644 --- a/B4A/kms_helperSubs.bas +++ b/B4A/kms_helperSubs.bas @@ -800,7 +800,7 @@ End Sub Sub traeDisponibleAbordo As Double ' Log("Venta abordo") Private disp As Double = 0 - Log($"${traeLimiteAbordoWeb} - ${traeLimiteAbordoXInventario} - ${traeVentaAbordo}"$) +' Log($"${traeLimiteAbordoWeb} - ${traeLimiteAbordoXInventario} - ${traeVentaAbordo}"$) disp = NumberFormat2(((traeLimiteAbordoWeb - traeLimiteAbordoXInventario) - traeVentaAbordo), 0, 2, 2, False) Return disp End Sub