From 79fda54144947e477cebb14989c9d3364f0ea807 Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <ja.guerra@keymonsoft.com>
Date: Mon, 18 Nov 2024 15:01:09 -0600
Subject: [PATCH] =?UTF-8?q?-=20VERSION=204.11.18=20-=20Se=20agreg=C3=B3=20?=
 =?UTF-8?q?que=20cuando=20se=20revisa=20una=20venta=20de=20Kelloggs,=20tam?=
 =?UTF-8?q?bi=C3=A9n=20revise=20si=20hay=20duplicados=20en=20la=20venta=20?=
 =?UTF-8?q?y=20si=20los=20hay,=20da=20la=20opci=C3=B3n=20de=20borrarlos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Files/layout1.bal   | Bin 77341 -> 77947 bytes
 Subs.bas            |   2 +-
 soporteKMS.b4a      |  41 ++++++++++++++++++++++++++++++++++++++++-
 soporteKMS.b4a.meta |   2 +-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/Files/layout1.bal b/Files/layout1.bal
index 23a2587329eb30915bef9b45f637a39cdc46e9f4..c7c29aa8a9517d08ddcb6114349206ac102b2d2c 100644
GIT binary patch
delta 2127
zcmZwI>r+f|9LMqV+qMU-i3b~bV#Y9Cg>Ej<MHDHQvLu(J8zOB=lw`{_mqdrwEkZ<u
zEF#z3Z!`V@4|u@vH#BB^&t}{A12g;C^ZK6e?(cWb@9gZa?W=j<o7vx2)3nY2O|!`H
zQ;&b7DbOk^$g3!>OsOg_Eh)?|vR7slmzKH`OhJCC&s8`~R}LTfj9C&S36_LNLM366
zaLEKX0-gv@f+xd~a1<QvwL^>X7FsMk1)d5|gQvrB;u(^el6W{loG3|>%z~5Mb__OV
zqcI0gfm7kR@H{vTo)4$P8Sny`f9UEK!i(U=a3-7uFM)0FQg|7h{m%|#S(c-b1FwKr
z!mHrba4x(C&V$#&`I_b!y88k&3gIHS7+wdjhd00_@J4vkkY)W#hYC&G441)nxE$UB
zSHP9<R=5h@X4rWC#v|B{Mm1am?-18Yc1r5tU1DRLdPxJk8{Px&g&q4)?1vA)jqpME
z5PTRu0yn`&;pRa*+*f@JjpJ|&tivbZlW;5Sgipbz;WNg%d6w=h8t33P_&j_8Zig?z
zm*C5AhsVa`S3HFrufm=1HTXK*1>b;g!rkyK__krs-QPi@2fhot;Ct|W_yODtKZGB7
z?a=zXh4vVJ0zVZ$lRTHafcxQ>@GJN={04sOcFf?Q@6dP;e}F%V-5ZQPBA`x{yP5(_
zqr$9m@;_Vba5-%&DI4qEcwNom)dQvwrT5rsee8C-o*$Rm`#D%eE35IpA1F~j<ZZNp
z250U#6{<)6w&-6P^Lsl&mCHxf^yWk;yHeTCU*RfBw?|v_^e&s9j5Xf)jz!NZNOH=E
z1*%N%>9?v(JvlL6l{xD}RIJIa^zYqi&Oc+6pT+pSxu<D&Pt!V51+@J1b-&CerTqo{
C6BV=o

delta 1983
zcmZA0M^F<{9LMqZGV8%)I5@MTjyDe)L_|O=fW2bxAlM={Y}gf}xTx3*>Z%bH#a>Zx
z)fjuhdcw2L=*fdK9z5sbe-o2@$HQ;-^UrTHFYmoc^oP;#%}8sfl&UqA^2+mbOIo(a
z4s<b{3QvdjI^qO<wzj%S(_P}1q)U28GT@$YCfp0of_uZ+a1NZCvZeZ@29*c*h5Nz%
z;Q``&Nr9vg9w;6p87vtB4~2)tY{g$1j$#Bn5*`JQhR47~@K|^pJRY7P>nDHdM0gTB
z8J+@9g{Q&O;TiBuxcHwf_lQbR%z{hdGI%yT2c8ShgXhBmc!5$@a`)vZ7Q&0*#qbh%
zDO>?BgO|fAl9uydnH-c_1y{nW;WhADcpbbR-T-feH@SB2-@Ss(D5~Hs;-F-!WE)&9
z-Y#*!Ujy%ecfz~iTG-l+VGq0)-Usi855NcEL-1kv2wWGp72Cm46vyD>unnJpPr|3*
z5PTZ0htIgHCywzfigR!Sd>+04H^LX;OYmj*O2Y2_T}=$~yar!~Z@@R<Tkvi84%`Ia
zh3|>2#O|9>w7~aa2YvuQgdf3S_%R$w*-}qZgL(=-6F--{ki3Ln!LQ*r@LRYQeh0sg
z*&kov1B#FECvm={z|J+Rb*0m6dOA8^GpeHcr`<K$8v2!`%R@oGZu6GPTb(4j$^H^4
v4A-S=)9|_f+|KTYhPM9{`R%qGZ}@wr&eOh<|C+|%W~fGMuN^2eJX-w)PpInq

diff --git a/Subs.bas b/Subs.bas
index 07c5eec..330ab14 100644
--- a/Subs.bas
+++ b/Subs.bas
@@ -185,8 +185,8 @@ End Sub
 
 'Muestra en el Log los campos y valores que regresan en el JobDone.
 Sub logJobDoneResultados(resultado As DBResult)
+	LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0))
 	For Each records() As Object In resultado.Rows
-		LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0))
 		For Each k As String In resultado.Columns.Keys
 			LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0))
 		Next
diff --git a/soporteKMS.b4a b/soporteKMS.b4a
index 32c67fd..1246017 100644
--- a/soporteKMS.b4a
+++ b/soporteKMS.b4a
@@ -34,7 +34,7 @@ Version=12.8
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Soporte Keymonsoft
-	#VersionName:  4.08.11
+	#VersionName:  4.11.18
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
@@ -197,6 +197,7 @@ Sub Globals
 	Private p_resVenta As Panel
 	Private p_resVentaTransparente As Panel
 	Private l_version1 As Label
+	Private b_resDuplicadosKell As Button
 End Sub
 
 Sub Activity_Create(FirstTime As Boolean)
@@ -1191,6 +1192,23 @@ Sub JobDone(Job As HttpJob)
 '				p_resVentaTransparente.BringToFront
 '				p_resVentaTransparente.Visible = True
 			End If
+			
+			If result.Tag = "revisaDuplicados_Kelloggs" Then
+'				Subs.logJobDoneResultados(result)
+				If result.Rows.Size > 0 Then
+					Log("=====>   Hay Duplicados   <======")
+					b_resDuplicadosKell.Enabled = True
+					b_resDuplicadosKell.Text = "HAY DUPLICADOS"& CRLF &"=> QUITARLOS <="
+				Else
+					Log("=====>   NO Hay Duplicados   <======")
+					b_resDuplicadosKell.Enabled = False
+					b_resDuplicadosKell.Text = "Sin duplicados"
+				End If
+			End If
+			
+			If result.Tag = "quitarDuplicados_Kelloggs" Then
+				Subs.logJobDoneResultados(result)
+			End If
 		End If
 		Job.Release
 	End If
@@ -1288,6 +1306,16 @@ Private Sub b_revisaVenta2_Click
 	Log($"mandamos: ruta=${rut}, almacen=${almacenKelloggs}"$)
 	reqManager.ExecuteQuery(cmd, 0 , "select_ventaXrutaKelloggs_soporte", 0)
 	
+	
+	reqManager.Initialize(Me, DBRS_1781)
+	cmd.Name = "revisaDuplicados_Kelloggs"
+	cmd.Parameters = Array As Object(almacenKelloggs, rut)
+	b_resDuplicadosKell.Enabled = False
+	b_resDuplicadosKell.Text = "Buscando duplicados ..."
+	Log($"mandamos: ruta=${rut}, almacen=${almacenKelloggs}"$)
+	reqManager.ExecuteQuery(cmd, 0 , "revisaDuplicados_Kelloggs", 0)
+	Log($"################  REVISAMOS DUPLICADOS ${almacenKelloggs}, ${rut}   ########################"$)
+	
 	reqManager.Initialize(Me, DBRS_1781)
 	cmd.Name = "revisaArqueoYLiquidacion_Kelloggs"
 	cmd.Parameters = Array As Object(almacenKelloggs, rut, almacenKelloggs, rut)
@@ -1582,4 +1610,15 @@ End Sub
 
 Private Sub p_resVentaTransparente_Click
 	p_resVentaTransparente.Visible = False
+End Sub
+
+Private Sub b_resDuplicadosKell_Click
+	reqManager.Initialize(Me, DBRS_1781)
+	cmd.Name = "quitarDuplicados_Kelloggs"
+	cmd.Parameters = Array As Object(almacenKelloggs, et_ruta2.text.Trim, "appSoporte")
+	b_resDuplicadosKell.Enabled = False
+	b_resDuplicadosKell.Text = "Sin Duplicados"
+	Log($"mandamos: ruta=${et_ruta2.text.Trim}, almacen=${almacenKelloggs}"$)
+	reqManager.ExecuteCommand(cmd, "quitarDuplicados_Kelloggs")
+	Log($"################  QUITAMOS DUPLICADOS ${almacenKelloggs}, ${et_ruta2.text.Trim}   ########################"$)
 End Sub
\ No newline at end of file
diff --git a/soporteKMS.b4a.meta b/soporteKMS.b4a.meta
index dfe9084..eb1b26c 100644
--- a/soporteKMS.b4a.meta
+++ b/soporteKMS.b4a.meta
@@ -10,6 +10,6 @@ ModuleClosedNodes0=2
 ModuleClosedNodes1=
 ModuleClosedNodes2=1
 ModuleClosedNodes3=1,9,11
-NavigationStack=Main,Activity_Create,256,6,Main,b_revisaVenta2_Click,1257,6,Visual Designer,layout1.bal,-100,6,Main,Process_Globals,33,0,Main,b_revisaVenta_Click,1236,0,Main,b_cerrar_Click,1538,0,Main,p_resVentaTransparente_Click,1542,0,Main,b_pasarInfoMovilDurakeloRep_Click,1523,0,Main,Globals,123,0,Main,JobDone,934,6
+NavigationStack=Main,b_forzarVenta1_Click,530,0,Main,b_forzarVenta2_Click,549,0,Main,borrarVentaForzadaKelloggs,560,0,Main,p_resVentaTransparente_Click,1573,0,Subs,generaSaludo,171,0,Main,b_borrarVenta2_Click,535,0,Visual Designer,layout1.bal,-100,6,Main,b_revisaVenta2_Click,1275,6,Main,b_resDuplicadosKell_Click,1581,4,Main,JobDone,1173,6
 SelectedBuild=0
 VisibleModules=2,3,1