diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 54d60f7..0ca1117 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -214,6 +214,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("CAT_GUNAPROD","PRECIOCONVER","TEXT") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)") + Subs.agregaColumna("HIST_VENTAS","HVD_USUARIO","TEXT") Dim server As String = "http://keymon.net:1781" ' Dim server As String = "http://192.168.100.10:1781" ' Dim server As String = "http://keymon.lat:9000" diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index c91d441..dcd0446 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1510,19 +1510,20 @@ Sub JobDone(Job As HttpJob) Dim cantc As String = records(result.Columns.Get("HVD_CANTC")) Dim HVD_RUTA As String = records(result.Columns.Get("HVD_RUTA")) Dim HVD_LISTAPRECIO As String = records(result.Columns.Get("HVD_LISTAPRECIO")) + Dim HVD_USUARIO As String = records(result.Columns.Get("HVD_USUARIO")) ' Dim HVD_LISTAPRECIO As String = 1 ' Log(" ++ insert into HIST_VENTAS: "&HVD_CLIENTE&","&HVD_PRONOMBRE&","&HVD_CANT) consecutivo = consecutivo +1 If l_ruta.Text = "0" Then 'Si no hay ruta cargada, guardamos todos los clientes ' Log("No hay ruta, guardamos todos") - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO)) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO,HVD_USUARIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO,HVD_USUARIO)) Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO)) Else 'Si ya hay ruta cargada, solo guardamos los clientes nuevos. ' Log("Hay ruta, guardamos los nuevos") - Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' "$) + Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_USUARIO='${HVD_USUARIO}' "$) If tc.RowCount = 0 Then ' Log($"Guardamos ${HVD_CLIENTE}"$) - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO)) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO,HVD_USUARIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO,HVD_USUARIO)) Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO)) End If End If diff --git a/B4A/Mazapa_Reparto.b4a b/B4A/Mazapa_Reparto.b4a index f98dae1..da3def8 100644 --- a/B4A/Mazapa_Reparto.b4a +++ b/B4A/Mazapa_Reparto.b4a @@ -3009,7 +3009,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: MAZAPA Reparto #VersionCode: 1 - #VersionName: 5.11.10 + #VersionName: 6.03.20 'Aun no la subo, suvela 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait diff --git a/B4A/Mazapa_Reparto.b4a.meta b/B4A/Mazapa_Reparto.b4a.meta index 2d0b451..d30f523 100644 --- a/B4A/Mazapa_Reparto.b4a.meta +++ b/B4A/Mazapa_Reparto.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=B4XMainPage,b_server_Click,682,0,DiseƱador Visual,principal.bal,-100,1,C_Cliente,Class_Globals,0,0,B4XMainPage,Class_Globals,26,0,C_Clientes,caculaRutaGPS,612,2,appUpdater,Process_Globals,74,1,C_Principal,Class_Globals,0,0,C_Principal,JobDone,1499,0,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,93,6 +NavigationStack=C_Cliente,Class_Globals,0,0,B4XMainPage,Class_Globals,26,0,C_Clientes,caculaRutaGPS,612,2,appUpdater,Process_Globals,74,1,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,93,6,B4XMainPage,B4XPage_Created,210,0,C_Principal,Class_Globals,61,6,C_Principal,JobDone,1481,6,C_Principal,cargar_Click,1130,0 SelectedBuild=0 VisibleModules=29,2,6,7,16,31,30,17,13,1