...

2026-04-17 21:06:08 +00:00 · 2024-07-22 16:28:26 -06:00
parent 1479b9f56d
commit 731a37ccb4
6 changed files with 42 additions and 37 deletions
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -688,8 +688,10 @@ Sub B4XPage_Appear
 				Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT SUM(PE_CANT) AS PIEZAS FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA)")
 				If c.RowCount > 0 Then
 					c.Position = 0
+					
 					Private des As Float = NumberFormat2(150/c.GetString("PIEZAS"),0,2,2,False)
 					Log( NumberFormat2(des,0,2,2,False))
+					
 					Private c2 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT Ifnull(SUM(PE_CANT),0) AS PE_CANT FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU < ?",Array As String(des))
 					If c2.RowCount > 0 Then
 						c2.Position = 0
@@ -697,7 +699,7 @@ Sub B4XPage_Appear
 						
 					End If
 					
-					Private c3 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT SUM(PE_CANT) AS PE_CANT FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU > ?",Array As String(des))
+					Private c3 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT SUM(PE_CANT) AS PE_CANT FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU >= ?",Array As String(des))
 					If c3.RowCount > 0 Then
 						c3.Position = 0
 						Log(c3.GetString("PE_CANT"))
@@ -706,13 +708,15 @@ Sub B4XPage_Appear
 						Private cantres As Float = des + rec
 						Log( NumberFormat2(cantres,0,2,2,False))
 						
-						Private c4 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU > ?",Array As String(des))
+						Private c4 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND PE_COSTOU >= ?",Array As String(NumberFormat2(cantres,0,2,2,False)))
 						If c4.RowCount > 0 Then
 							For i = 0 To c4.RowCount -1
 								c4.Position = i
 								Private recalculo As Float = c4.GetString("PE_COSTOU") - NumberFormat2(cantres,0,2,2,False) 
+								LogColor(recalculo,Colors.Blue)
 								Private recalculototal As Float = c4.GetString("PE_CANT") * NumberFormat2(recalculo,0,2,2,False) 
-								Log(recalculo&"|||||"&recalculototal)
+								
+'								Log(recalculo&"|||||"&recalculototal)
 								B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE PEDIDO set PE_RECALCULO = ?, PE_RECALCULOTOT = ? WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_PROID = ? ",Array As String(NumberFormat2(recalculo,0,2,2,False) ,NumberFormat2(recalculototal,0,2,2,False), c4.GetString("PE_PROID")))
 								
 							Next
@@ -729,7 +733,7 @@ Sub B4XPage_Appear
 		
 		If Not(Subs.traemontoprod) Then
 						
-			Private c4 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND (PE_RECALCULO <> ? OR PE_RECALCULO <> ?)",Array As String("null",Null))
+			Private c4 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA) AND (PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("null"))
 			If c4.RowCount > 0 Then
 				For i = 0 To c4.RowCount -1
 					c4.Position = i
@@ -748,14 +752,14 @@ Sub B4XPage_Appear
 	End If
 	
 	'AQUI CAMBIAR
-	Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+	Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
 	LogColor(s3.RowCount,Colors.Yellow)
 	If s3.RowCount > 0 Then
 		c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO  from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
 		
-		s=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",Null))
+		s=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
 		s.Position=0
-		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
 		s5.Position = 0
 		If c.RowCount > 0 Then
 			c.Position=0
@@ -3927,6 +3931,8 @@ Sub Cuestionario
 		CUANTOS2 = s.GetString("CUANTOS2")
 		If logger Then LogColor($"Hist:encuesta=${CUANTOS}, hist_encuesta2 = ${CUANTOS2}"$, Colors.Magenta)
 	End If
+'	CUANTOS = 0
+'	CUANTOS2 = 0
 	If logger Then Log(CUANTOS & "|" & CUANTOS2)
 	If CUANTOS = 0 And CUANTOS2 = 0 Then
 		Private enc As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_EP_ID, CAT_EP_IDTIPOPREGUNTA, CAT_CE_DESCRIPCION, CAT_EP_PREGUNTA, CAT_EP_RES1_PRED, CAT_EP_RES2_PRED, CAT_EP_RES3_PRED, CAT_EP_ORDEN_PREGUNTA FROM CAT_ENCUESTA_PREGUNTA ORDER BY CAT_CE_DESCRIPCION, CAST(CAT_EP_ORDEN_PREGUNTA AS DECIMAL)")
--- a/B4A/C_Nota.bas
+++ b/B4A/C_Nota.bas
@@ -107,14 +107,13 @@ Sub B4XPage_Appear
 		b_desc.Visible = False
 		
 		'AQUI CAMBIAR
-		Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+		Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
 		LogColor(s3.RowCount,Colors.Yellow)
 		If s3.RowCount > 0 Then
-			
-		
-			Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",Null))
-			s.Position = 0
-			Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+				
+			Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+			s.Position=0
+			Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
 			s5.Position = 0
 			
 				
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -926,10 +926,10 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object( ALMACEN,e_ruta.text )
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "carga_encuesta")
 	
-	cmd.Initialize
-	cmd.Name = "SELECT_HIST_ENCUESTA_GUNA"
-	cmd.Parameters = Array As Object( e_ruta.text, ALMACEN)
-	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "HIST_ENCUESTA2")
+'	cmd.Initialize
+'	cmd.Name = "SELECT_HIST_ENCUESTA_GUNA"
+'	cmd.Parameters = Array As Object( e_ruta.text, ALMACEN)
+'	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "HIST_ENCUESTA2")
 	
 	cmd.Initialize
 	cmd.Name = "SELECT_HIST_PRODPROM_GUNA"
@@ -1003,10 +1003,10 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object(ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO")
 	
-	cmd.Initialize
-	cmd.Name = "select_CLIENTE_ENCUESTA"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ENCUESTA_CLIENTE")
+'	cmd.Initialize
+'	cmd.Name = "select_CLIENTE_ENCUESTA"
+'	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+'	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ENCUESTA_CLIENTE")
 	
 	
 	cmd.Initialize
@@ -1911,6 +1911,7 @@ Sub e_ruta_EnterPressed
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VENTAS")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VERIFICACION")
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA")
+			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA2")
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_STAY_OUT")
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS")
 			B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_FACE")
@@ -2180,14 +2181,13 @@ Sub resdia_Click
 	c.Close
 	
 	'AQUI CAMBIAR
-	Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+	Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
 	LogColor(s3.RowCount,Colors.Yellow)
 	If s3.RowCount > 0 Then
-			
-		
-		Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",Null))
-		s.Position = 0
-		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+				
+		Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+		s.Position=0
+		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
 		s5.Position = 0
 			
 				
--- a/B4A/C_TicketsDia.bas
+++ b/B4A/C_TicketsDia.bas
@@ -62,16 +62,16 @@ Sub B4XPage_Appear
 			c.Position=i
 			
 			'AQUI CAMBIAR
-			Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ? and PE_CLIENTE = ?",Array As String("","null",Null,c.GetString("PC_CLIENTE")))
+			
+						
+			Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
 			LogColor(s3.RowCount,Colors.Yellow)
 			If s3.RowCount > 0 Then
-			
-		
-				Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ? and PE_CLIENTE = ?",Array As String("","null",Null,c.GetString("PC_CLIENTE")))
-				s.Position = 0
-				Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ? and PE_CLIENTE = ?",Array As String("","null",Null,c.GetString("PC_CLIENTE")))
+				
+				Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+				s.Position=0
+				Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
 				s5.Position = 0
-			
 				
 				Private suma As Float =NumberFormat2( s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False)
 				
--- a/V3.1.b4a
+++ b/V3.1.b4a
@@ -190,7 +190,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Guna V3.1
 	#VersionCode: 1
-	#VersionName: 4.07.10.E_PR2
+	#VersionName: 4.07.15.E_PR2_ENCPED
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/V3.1.b4a.meta
+++ b/V3.1.b4a.meta
@@ -73,6 +73,6 @@ ModuleClosedNodes6=6,8,9,10
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,resdia.bal,-100,1,C_TicketsDia,Class_Globals,0,0,C_Productos,Class_Globals,0,0,C_TicketsDia,B4XPage_Appear,97,6,C_Cliente,B_ACEPTA_GALLINA_Click,3148,0,C_Nota,B4XPage_Appear,102,5,C_Principal,resdia_Click,2176,3,C_Cliente,Guardar_Click,1868,6,C_Principal,cargar_Click,873,0,C_Cliente,B4XPage_Appear,638,6,C_Cliente,GPS_LocationChanged,877,0
+NavigationStack=C_TicketsDia,B4XPage_Appear,60,0,C_Nota,Class_Globals,0,0,C_Nota,B4XPage_Appear,94,5,C_Principal,Class_Globals,0,0,C_Principal,resdia_Click,2117,0,C_Principal,JobDone,1415,0,C_Principal,cargar_Click,797,0,C_Principal,e_ruta_EnterPressed,1907,0,C_Cliente,Cuestionario,3928,0,C_Cliente,GPS_LocationChanged,882,0
 SelectedBuild=0
-VisibleModules=22,2,23,13,14,4,6,9,12,5,16
+VisibleModules=22,2,23,13,14,4,6,9,12,5