6.03.16

se agrega en la descarga el usuario para que si hay duplicados si los tome el movil

B4A/B4XMainPage.bas

@@ -205,6 +205,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("RECHAZOS", "R_PRECIO", "TEXT")
 	Subs.agregaColumna("VENTAS", "V_PRECIO", "TEXT")
 	Subs.agregaColumna("HIST_VENTAS","PLACA","TEXT")
+	Subs.agregaColumna("HIST_VENTAS","HVD_USUARIO","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","HVD_BCREDITO","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","HVD_RECHAZOCANT","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","CONSECUTIVO","TEXT")

B4A/C_Principal.bas

@@ -1329,21 +1329,21 @@ Sub envioinfo
 '	End If
 	
 	
-'	c=Starter.skmt.ExecQuery("SELECT  CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO FROM REPARTO_GEO")
-'	Log($"REPARTO_Cliente PENDIENTE: ${c.RowCount}"$)
-'	If c.RowCount>0 Then
-'		For i=0 To c.RowCount -1
-'			c.Position=i
-'			
-'			Dim cmd As DBCommand
-'			cmd.Initialize
-'			cmd.Name = "insert_REPARTO_IZCA"
-'			cmd.Parameters = Array As Object(c.GetString("CLIENTE"), c.GetString("USUARIO"), c.GetString("FECHA_PUNTEO"), c.GetString("LATITUD"), c.GetString("LONGITUD"), c.GetString("ALMACEN"), c.GetString("RUTA_REPARTO"), c.GetString("RUTA_PREV"), c.GetString("FECHA_PREVENTA"), c.GetString("MOTIVO"), c.GetString("COMENTARIO"),c.GetString("TIPO"))
-'			reqManager.ExecuteCommand(cmd , $"ins_REPARTOPendientes_head_${c.GetString("CLIENTE")}"$)
-'			
-'		Next
-'	End If
-'	c.Close
+	c=Starter.skmt.ExecQuery("SELECT  CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO FROM REPARTO_GEO")
+	Log($"REPARTO_Cliente PENDIENTE: ${c.RowCount}"$)
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_REPARTO_IZCA"
+			cmd.Parameters = Array As Object(c.GetString("CLIENTE"), c.GetString("USUARIO"), c.GetString("FECHA_PUNTEO"), c.GetString("LATITUD"), c.GetString("LONGITUD"), c.GetString("ALMACEN"), c.GetString("RUTA_REPARTO"), c.GetString("RUTA_PREV"), c.GetString("FECHA_PREVENTA"), c.GetString("MOTIVO"), c.GetString("COMENTARIO"),c.GetString("TIPO"))
+			reqManager.ExecuteCommand(cmd , $"ins_REPARTOPendientes_head_${c.GetString("CLIENTE")}"$)
+			
+		Next
+	End If
+	c.Close
 
 '	PCIK CIEGO
 	c = Starter.skmt.ExecQuery("SELECT PC_ID_PROD, PC_ALMACEN, PC_RUTA, PC_FECHA FROM PICK_CIEGO")
@@ -2204,6 +2204,7 @@ Sub JobDone(Job As HttpJob)
 					Dim HVD_NUM_REGISTRO As String = records(result.Columns.Get("HVD_NUM_REGISTRO"))
 					Dim HVD_RECHAZO As String = records(result.Columns.Get("HVD_RECHAZO"))
 					Dim HVD_BCREDITO As String = records(result.Columns.Get("HVD_BCREDITO"))
+					Dim HVD_USUARIO As String = records(result.Columns.Get("HVD_USUARIO"))
 '					Dim HVD_PLACA As String = records(result.Columns.Get("HVD_PLACA"))
 					Dim bcajas As String = 0 ' records(result.Columns.Get("HVD_BCAJAS"))
 					Dim cantc As String = 0 'records(result.Columns.Get("HVD_CANTC"))
@@ -2212,14 +2213,14 @@ Sub JobDone(Job As HttpJob)
 					Log(HVD_PRONOMBRE & ", " & HVD_CANT & ", " &HVD_CLIENTE)
 					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, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO) 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, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO))
+						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, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO,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, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO,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, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO) 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, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO))
+							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, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO,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, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO,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
@@ -2603,7 +2604,7 @@ Sub connecta_Click
 		cmd.Initialize
 		
 		
-		cmd.Name = "select_ruta_re_REPG_IZCA5"
+		cmd.Name = "select_ruta_re_REPG_IZCA6"
 		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, usuario)
 		Log($"${ALMACEN}, ${e_ruta.text}, ${usuario}"$)
 		reqManager.ExecuteQuery(cmd , 0, "ruta")

B4A/Izca_Reparto.b4a

@@ -3018,7 +3018,7 @@ Version=12.8
 #Region Project Attributes 
 	#ApplicationLabel: Izca Reparto
 	#VersionCode: 1
-	#VersionName: 5.09.26
+	#VersionName: 6.03.16
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Izca_Reparto.b4a.meta

@@ -91,6 +91,6 @@ ModuleClosedNodes6=18,19,20,21
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Clientes,caculaRutaGPS,590,0,C_Productos,Class_Globals,0,0,C_Principal,Class_Globals,0,0,C_Principal,b_venta_emp_Click,3039,0,C_Principal,b_aceptar_Click,3890,0,B4XMainPage,JobDone,380,0,Diseñador Visual,principal.bal,-100,6,C_Principal,b_terpc_Click,3535,0,C_Principal,JobDone,2484,0,C_Principal,CreateListItem,3840,0,C_Principal,connecta_Click,2599,0
+NavigationStack=C_Principal,b_terpc_Click,3535,0,C_Principal,CreateListItem,3840,0,C_Cliente,Class_Globals,0,0,C_Principal,e_ruta_EnterPressed,2626,0,B4XMainPage,B4XPage_Created,201,1,C_Principal,JobDone,2213,3,C_Principal,Subir_Click,902,0,C_Principal,envioinfo,1310,0,C_Principal,B4XPage_CloseRequest,2583,0,C_Principal,connecta_Click,2600,0
 SelectedBuild=0
 VisibleModules=1,2,3,4,5,6,7,8,9,10,16

B4A/Objects/AndroidManifest.xml

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="reparto_izca.keymon.lat"
 	android:versionCode="1"
-	android:versionName="5.09.26"
+	android:versionName="6.03.16"
 	android:installLocation="internalOnly">
 	
 	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>