Se agregó que envie todos los pedidos en el envío general al final del dia (Principal/Conectar/enviar) y que envie los campos extra en PEDIDO (total arts y total venta) cuando se da guardar al final de cada compra!

2026-04-17 21:06:12 +00:00 · 2024-02-16 10:46:14 -06:00
parent a49397e3ea
commit 866024ab2d
5 changed files with 72 additions and 62 deletions
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -827,6 +827,7 @@ End Sub

 Sub mandaPendientes
 '	PEDIDO_CLIENTE (Pendientes)
+	Log(">>>>>>>  MANDA PENDIENTES")
 	Dim PCNoArts As String
 	Dim PCMonto As String
 	If usuario <> "KMTS1"  Then
@@ -858,7 +859,7 @@ Sub mandaPendientes
 				cmd.Name = "insert_pedido2_INTMEX"
 				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"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto)
 				reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
-				Log($"${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")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
+				Log($">>>>  INS_PEDIDO= ${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")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
 '				sql.insert_pedido_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?))
 '				sql.insert_pedido2_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO, PE_CANT_TOTAL, PE_VENTA_TOTAL) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?),(?),(?))
 			Next
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -601,29 +601,10 @@ Sub Subir_Click
 			Next
 		End If
 		c.Close
-		' PEDIO_CLIENTE
-
-		c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
-		d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
-		If c.RowCount>0 Then
-			For i=0 To c.RowCount -1
-				c.Position=i
-				Dim cmd As DBCommand
-				cmd.Initialize
-				cmd.Name = "insert_pedidos_INTMEX"
-				cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"))
-				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
-			Next
-		End If
-		c.Close
-		d.Position=0
-		cuantos_pedidosc = D.GetString("CUANTOS_PEDIDOSC")
-		d.Close

 		' ENVIO DE LOS CODIGOS QR
 		'c=skmt.ExecQuery2("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO = ?", Array As String("OK"))

-		
 		c=B4XPages.MainPage.skmt.ExecQuery("SELECT CODIGOKMTS, CODIGOB, LAT, LON FROM HIST_CODIGO_BARRAS" )
 		If c.RowCount>0 Then
 			For i=0 To c.RowCount -1
@@ -637,7 +618,6 @@ Sub Subir_Click
 		End If
 		c.Close

-	
 		c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO, CAT_CL_CODIGO, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info where CAT_CL_NUM_SERIEFISICO IS NOT NULL")
 		If c.RowCount>0 Then
 			For i=0 To c.RowCount -1
@@ -667,6 +647,30 @@ Sub Subir_Click
 		End If
 		c.Close
 		
+		' PEDIDO_CLIENTE
+		Dim PCNoArts As String
+		Dim PCMonto As String
+		c = B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
+		d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
+		If c.RowCount > 0 Then
+			For i = 0 To c.RowCount - 1
+				c.Position = i
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pedidos_INTMEX"
+				cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"))
+				PCNoArts = c.GetString("PC_NOART")
+				PCMonto = c.GetString("PC_MONTO")
+				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
+				Log(">>>>>>  INSERT PEDIDO_CLIENTE")
+			Next
+		End If
+		c.Close
+		d.Position = 0
+		cuantos_pedidosc = d.GetString("CUANTOS_PEDIDOSC")
+		d.Close
+
+		' PEDIDO
 		c = B4XPages.MainPage.skmt.ExecQuery("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO")
 		d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
 		If c.RowCount > 0 Then
@@ -674,9 +678,13 @@ Sub Subir_Click
 				c.Position = i
 				Dim cmd As DBCommand
 				cmd.Initialize
-				cmd.Name = "insert_pedido_INTMEX"
-				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"),c.GetString("PE_FOLIO"))
-				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				cmd.Name = "insert_pedido2_INTMEX" 'CON TOTALES INCLUIDOS
+				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"),c.GetString("PE_FOLIO"), PCNoArts, PCMonto)
+				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
+'				Log($">>>>  INS_PEDIDO= ${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")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
+'				cmd.Name = "insert_pedido_INTMEX"  ' SIN TOTALES INCLUIDOS
+'				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"),c.GetString("PE_FOLIO"))
+'				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
 			Next
 		End If
 		c.Close
@@ -747,7 +755,6 @@ Sub Subir_Click
 		PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1))
 		If Starter.marcaCel <> "Sony" Then ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True)

-				
 		'CUESTIONARIOS
 		c = B4XPages.MainPage.skmt.ExecQuery($"select * from cuestionario"$)
 		Private rutaActual As String = Subs.traeRuta
@@ -762,7 +769,6 @@ Sub Subir_Click
 			Next
 		End If
 		c.Close
-		
 		End If
 End Sub

@@ -1742,6 +1748,7 @@ Sub JobDone(Job As HttpJob)
 		End If
 	End If
 	
+	If Job.JobName = "DBRequest" Then
 		If RESULT.Tag = "ins_cuestionario" Then 'query tag
 			Subs.logJobDoneResultados(RESULT)
 		End If
@@ -1750,6 +1757,8 @@ Sub JobDone(Job As HttpJob)
 			Log(">>>>>>>>>>>>>  TEST")
 			Subs.logJobDoneResultados(RESULT)
 		End If
+	End If
+	
 	
 	Job.Release
 End Sub
--- a/B4A/INTMEX_LL.b4a
+++ b/B4A/INTMEX_LL.b4a
@@ -162,7 +162,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Intmex
 	#VersionCode: 1
-	#VersionName: 4.02.06
+	#VersionName: 4.02.14
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/B4A/INTMEX_LL.b4a.meta
+++ b/B4A/INTMEX_LL.b4a.meta
@@ -85,6 +85,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=1
-NavigationStack=C_RespaldoDiario,respaldaPedido,84,0,C_RespaldoDiario,respaldaInventarios,99,0,C_RespaldoDiario,respaldaPaquetes,105,0,DBRequestManager,HandleJob,197,0,C_Cliente,B4XPage_Created,167,0,C_Cliente,Guardar_Click,533,0,C_Cliente,mandaPendientes,842,6,Subs,logJobDoneResultados,1322,0,C_Cliente,JobDone,967,0,B4XMainPage,Initialize,100,0
+NavigationStack=C_Principal,Class_Globals,0,0,C_Principal,tickets_dia_Click,2221,0,Subs,guardaProductoSinGestion,748,1,B4XMainPage,Initialize,100,0,B4XMainPage,Class_Globals,18,0,C_Principal,cargar_Click,846,0,C_Principal,connecta_Click,1803,0,C_Principal,JobDone,1738,0,Main,Globals,25,0,C_Principal,Subir_Click,677,6
 SelectedBuild=0
-VisibleModules=2,26,24,13,16,14,4,27,15,9,18,20
+VisibleModules=2,26,24,13,16,14,4,27,15,9
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -752,7 +752,7 @@ End Sub
 Sub guardaProductoSinGestion(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)
 '	LogColor("guardaProducto: "&prodId&", cant="&cant, Colors.Magenta)
 	Private c As Cursor
-	B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta))
+	B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO,PE_ENVIO_OK) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta))
 	B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cant, prodId))
 	c=B4XPages.MainPage.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