From 56c80c69ed5b1037bdab57b7a063157feef94c24 Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Tue, 7 Jan 2025 18:03:25 -0600 Subject: [PATCH] Verion 05_01_05 Se agrega apartado de productos Se agrega leyenda de texto en el ticket Se agrega listado de resumen dia por producto Se agrega limitador de venta por monto Se agrega que no se pueda editar ninguna venta una vez guardada --- B4A/B4XMainPage.bas | 2 + B4A/C_Bitacora.bas | 3 + B4A/C_Cliente.bas | 424 ++++++++++++++++++++++++++----------- B4A/C_Clientes.bas | 6 +- B4A/C_Historico.bas | 2 +- B4A/C_NoVenta.bas | 2 +- B4A/C_Nota.bas | 143 +++++++------ B4A/C_NuevoCliente.bas | 8 +- B4A/C_Principal.bas | 240 +++++++++++++++------ B4A/C_Productos.bas | 155 ++++++++------ B4A/C_RespaldoDiario.bas | 3 +- B4A/C_TicketsDia.bas | 3 +- B4A/Files/login.bal | Bin 22762 -> 22762 bytes B4A/Files/nuevocliente.bal | Bin 15029 -> 15029 bytes B4A/Files/principal.bal | Bin 50024 -> 51893 bytes B4A/Files/productos.png | Bin 0 -> 6577 bytes B4A/Files/resdia.bal | Bin 44790 -> 47837 bytes B4A/MAPA_RUTAS.bas | 4 +- B4A/MAZAPA.b4a | 44 ++-- B4A/MAZAPA.b4a.meta | 4 +- B4A/Subs.bas | 10 +- 21 files changed, 679 insertions(+), 374 deletions(-) create mode 100644 B4A/Files/productos.png diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 4a44ef6..a0edf4a 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -209,6 +209,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PICK_CIEGO (PC_ID_PROD TEXT, PC_NOM_PROD TEXT, PC_CANT TEXT, PC_ALMACEN TEXT, PC_RUTA TEXT, PC_FECHA TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ENV_MONTO_LIQ (EML_MONTO TEXT, EML_ALMACEN TEXT, EML_RUTA TEXT, EML_USUARIO TEXT, EML_FECHA_PED TEXT)") Subs.agregaColumna("PEDIDO", "PE_ENVIO_OK", "INT") + Subs.agregaColumna("PEDIDO", "PE_IMPRESO", "INT") + Subs.agregaColumna("PEDIDO_CLIENTE", "PC_IMPRESO", "INT") Subs.agregaColumna("PEDIDO", "PE_CANTC", "TEXT") Subs.agregaColumna("PEDIDO", "PE_BCAJAS", "TEXT") Subs.agregaColumna("NOVENTA", "NV_ENVIO_OK", "INT") diff --git a/B4A/C_Bitacora.bas b/B4A/C_Bitacora.bas index 0ea3eb4..4f58dee 100644 --- a/B4A/C_Bitacora.bas +++ b/B4A/C_Bitacora.bas @@ -147,6 +147,9 @@ Private Sub b_Inicio_Fin_venta2_Click enVenta = False LogColor($">>>>>> EN VENTA: ${enVenta}"$, Colors.red) iniciamosVenta + Starter.skmt.ExecNonQuery($"UPDATE PEDIDO SET PE_IMPRESO = '${B4XPages.MainPage.cliente.siimprimio}' WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) "$) + Starter.skmt.ExecNonQuery($"UPDATE PEDIDO_CLIENTE SET PC_IMPRESO = '${B4XPages.MainPage.cliente.siimprimio}' WHERE PC_CLIENTE IN (SELECT CUENTA FROM CUENTAA) "$) + B4XPages.MainPage.cliente.siimprimio = 0 B4XPages.ShowPageAndRemovePreviousPages("Principal") ' guardadoventa Else if b_Inicio_Fin_venta2.Text = "INICIAR VENTA" Then diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 2148047..850c80c 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -169,6 +169,10 @@ Sub Class_Globals Dim motivoNoVenta, motivoNoVisita As String + Dim imprimirsolo As String = 0 + Dim siimprimio As String = 0 + + End Sub 'You can add more parameters here. @@ -254,7 +258,7 @@ End Sub Sub B4XPage_Appear ' banderaimp = 0 - bitacora.inicioFin +' bitacora.inicioFin Guardar.Enabled = True gest.Enabled = True b_cxc.Enabled = False @@ -268,8 +272,8 @@ Sub B4XPage_Appear cercavalor = 0 Tels.Visible = False gest.Visible = False - bitacora.p_transparenteInicioFin2.Visible = False - bitacora.b_Inicio_Fin_venta2.Visible = False +' bitacora.p_transparenteInicioFin2.Visible = False +' bitacora.b_Inicio_Fin_venta2.Visible = False b_ventaabordo.Visible = False If Subs.hayPedido Then 'Si hay pedido, deshabilitamos el boton de "No Venta" @@ -353,6 +357,7 @@ Sub B4XPage_Appear End If la_saldotot.Text = MONTO_COMPRA + If MONTO_COMPRA <> "0" Then META2 = 300 - MONTO_COMPRA Else @@ -444,42 +449,45 @@ Sub B4XPage_Appear Log("2") End If - pre_act = Subs.traeTotalClientepreventaparacredito + pre_act = Subs.traeTotalClientepreventaparacredito(la_cuenta.Text) + Log(la_cuenta.Text) + LogColor(Subs.traeTotalClientepreventaparacredito(la_cuenta.Text),Colors.Blue) 'SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) - - Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM kmt_info INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If credi2.RowCount > 0 Then - credi2.Position = 0 - If credi2.GetString ("CAT_CL_BCREDITO") = "1" Then - Log(2) - Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM kmt_info INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If credi3.RowCount > 0 Then - credi3.Position = 0 - If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then - MsgboxAsync("La venta sera en efectivo porque el pago del pagare en menor al total de la deuda.","Atención") - Else If credi2.GetString ("SALDO_PENDIENTE") = credi3.GetString ("a_abono") Then - End If - Else - MsgboxAsync("La venta sera en efectivo por que hay un pagare pendiente de pago","Atención") - End If - credi3.Close - Else - Log(1) - Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM kmt_info INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - If credi3.RowCount > 0 Then - credi3.Position = 0 - If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then - MsgboxAsync("La venta sera en efectivo porque el pago del pagare en menor al total de la deuda.","Atención") - Else If credi2.GetString ("SALDO_PENDIENTE") = credi3.GetString ("a_abono") Then - End If - Else - MsgboxAsync("La venta sera en efectivo por que hay un pagare pendiente de pago","Atención") - End If - credi3.Close - End If - End If - credi2.Close + ''descomentar para creditos +' Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM kmt_info INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") +' If credi2.RowCount > 0 Then +' credi2.Position = 0 +' If credi2.GetString ("CAT_CL_BCREDITO") = "1" Then +' Log(2) +' Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM kmt_info INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") +' If credi3.RowCount > 0 Then +' credi3.Position = 0 +' If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then +' MsgboxAsync("La venta sera en efectivo porque el pago del pagare en menor al total de la deuda.","Atención") +' Else If credi2.GetString ("SALDO_PENDIENTE") = credi3.GetString ("a_abono") Then +' End If +' Else +' MsgboxAsync("La venta sera en efectivo por que hay un pagare pendiente de pago","Atención") +' End If +' credi3.Close +' Else +' Log(1) +' Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM kmt_info INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") +' If credi3.RowCount > 0 Then +' credi3.Position = 0 +' If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then +' MsgboxAsync("La venta sera en efectivo porque el pago del pagare en menor al total de la deuda.","Atención") +' Else If credi2.GetString ("SALDO_PENDIENTE") = credi3.GetString ("a_abono") Then +' End If +' Else +' MsgboxAsync("La venta sera en efectivo por que hay un pagare pendiente de pago","Atención") +' End If +' credi3.Close +' End If +' End If +' credi2.Close +''fin comentado credito If la_cuenta.Text = "0" Then gest.Text = "Abordo" B4XPages.MainPage.recarga = "0" @@ -497,8 +505,8 @@ Sub B4XPage_Appear Tels.Visible = False gest.Visible = False - bitacora.p_transparenteInicioFin2.Visible = False - bitacora.b_Inicio_Fin_venta2.Visible = False +' bitacora.p_transparenteInicioFin2.Visible = False +' bitacora.b_Inicio_Fin_venta2.Visible = False b_ventaabordo.Visible = False CallSubDelayed(Tracker, "Track") @@ -509,7 +517,7 @@ Sub B4XPage_Appear ' Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$) GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation) End If - +Log(imprimirsolo) End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -520,9 +528,14 @@ Sub GPS_LocationChanged (Location1 As Location) Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps) End If + If m_lat.Length < 5 Then + + Else + + Dim l1, l2 As Location l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps) -' Log($"Coordenadas de la tienda - lat:${m_lat}, lon:${m_lon}"$) + Log($"Coordenadas de la tienda - lat:${m_lat}, lon:${m_lon}"$) l2.Initialize2(m_lat, m_lon) BT_QR.Enabled = True @@ -532,22 +545,26 @@ Sub GPS_LocationChanged (Location1 As Location) 'now we need the distance between our location and the target location distance = l1.DistanceTo(l2) 'the result is in meter gest.Visible = True - If distance < 50000000000000000000000000000000000000000000 Then + If distance < 500000000000000000000000000000000000000000000000000000000000 Then LA_GEO.TextColor = Colors.Blue Tels.Visible = True gest.Visible = True - bitacora.p_transparenteInicioFin2.Visible = True - bitacora.b_Inicio_Fin_venta2.Visible = True + bitacora.inicioFin +' bitacora.p_transparenteInicioFin2.Visible = True +' bitacora.b_Inicio_Fin_venta2.Visible = True b_ventaabordo.Visible = True Else Tels.Visible = False gest.Visible = False bitacora.p_transparenteInicioFin2.Visible = False - bitacora.b_Inicio_Fin_venta2.Visible = False +' bitacora.b_Inicio_Fin_venta2.Visible = False b_ventaabordo.Visible = False LA_GEO.TextColor = Colors.Red End If LA_GEO.Text= $"$1.2{distance/1000} kms"$ + + End If + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) CallSubDelayed(Tracker, "CreateLocationRequest") @@ -608,6 +625,11 @@ Private Sub B4XPage_CloseRequest As ResumableSub ' BACK key pressed ' Return True To close, False To cancel ' Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$) + If l_total.Text = "null" Then + Dim comprarar As String = 0 + Else + comprarar = l_total.Text + End If If bitacora.p_transparenteInicioFin2.Visible And bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" Then ToastMessageShow("Por favor presione el botón de TERMINAR VENTA", True) Return False @@ -666,50 +688,65 @@ Sub DATOS_Click End Sub Sub Guardar_Click - bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" - bitacora.enVenta = False - bitacora.inicioFin +' bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" +' bitacora.enVenta = False +' bitacora.inicioFin + + If l_total.Text = "null" Then + Dim comprarar As String = 0 + Else + comprarar = l_total.Text + End If c = B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) and PE_FOLIO = ?", Array As String("PREVENTA_24")) c.Position = 0 - If c.GetString("CUANTOS") > 0 Then - If la_cuenta.Text <> 0 Then - Credi = B4XPages.MainPage.skmt.ExecQuery("Select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP) UNION Select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP)") - 'INNER JOIN kmt_info ON CAT_CL_CODIGO = CL_CUENTA - If Credi.RowCount > 0 Then - Credi.Position = 0 - If Credi.GetString("CAT_CL_BCREDITO") = "1" Then - If l_total.Text <> "null" Then - If pre_act <> Starter.pre_viejo Then - + If c.GetString("CUANTOS") > 0 Then + Log("1") + If la_cuenta.Text <> 0 Then + Log("2") + Credi = B4XPages.MainPage.skmt.ExecQuery("Select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP) UNION Select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP)") + 'INNER JOIN kmt_info ON CAT_CL_CODIGO = CL_CUENTA + If Credi.RowCount > 0 Then + Log("3") + Credi.Position = 0 + If Credi.GetString("CAT_CL_BCREDITO") = "1" Then + Log("4") + If l_total.Text <> "null" Then + Log("5") + If pre_act <> Starter.pre_viejo Then + Log("6") ' Msgbox2Async("La venta es a credito?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) ' Wait For Msgbox_Result (resultado As Int) ' If resultado = DialogResponse.POSITIVE Then - p_credito.Visible = False - Dim limitcred As Cursor - limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - limitcred.Position = 0 - l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO") - If Subs.traeTotalClientepreventaparacredito >= limitcred.GetString("CAT_CL_LIMITECREDITO") Then - et_montoacredito.Text = limitcred.GetString("CAT_CL_LIMITECREDITO") - Else - et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito - End If - limitcred.Close +' p_credito.Visible = False +' Dim limitcred As Cursor +' limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") +' limitcred.Position = 0 +' l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO") +' If Subs.traeTotalClientepreventaparacredito >= limitcred.GetString("CAT_CL_LIMITECREDITO") Then +' et_montoacredito.Text = limitcred.GetString("CAT_CL_LIMITECREDITO") +' Else +' et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito +' End If +' limitcred.Close ' Else GuardaVenta + ' End If Else If pre_act = Starter.pre_viejo Then + Log("7") GuardaVenta End If Else If l_total.Text = "null" Then + Log("8") GuardaVenta End If Else If Credi.GetString("CAT_CL_BCREDITO") = "0" Then + Log("9") GuardaVenta End If Else @@ -722,38 +759,48 @@ Sub Guardar_Click ' Msgbox2Async("La venta es a credito?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) ' Wait For Msgbox_Result (resultado As Int) ' If resultado = DialogResponse.POSITIVE Then - p_credito.Visible = False - Dim limitcred As Cursor - limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") - limitcred.Position = 0 - l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO") - If Subs.traeTotalClientepreventaparacredito >= limitcred.GetString("CAT_CL_LIMITECREDITO") Then - et_montoacredito.Text = limitcred.GetString("CAT_CL_LIMITECREDITO") - Else - et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito - End If - limitcred.Close +' p_credito.Visible = False +' Dim limitcred As Cursor +' limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") +' limitcred.Position = 0 +' l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO") +' If Subs.traeTotalClientepreventaparacredito >= limitcred.GetString("CAT_CL_LIMITECREDITO") Then +' et_montoacredito.Text = limitcred.GetString("CAT_CL_LIMITECREDITO") +' Else +' et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito +' End If +' limitcred.Close ' Else - GuardaVenta + Log("10") + GuardaVenta ' End If Else If pre_act = Starter.pre_viejo Then + Log("11") GuardaVenta End If Else If l_total.Text = "null" Then + Log("11") GuardaVenta End If Else + Log("12") GuardaVenta End If Else + Log("13") GuardaVenta End If End If ' Credi.Close Else If la_cuenta.Text = 0 Then + Log("14") GuardaVenta End If Else If c.GetString("CUANTOS") = 0 Then + Log("15") +' bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" +' bitacora.enVenta = False +' bitacora.inicioFin GuardaVenta End If ' c.Close @@ -772,7 +819,7 @@ Private Sub b_acred_Click limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") limitcred.Position = 0 l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO") - If Subs.traeTotalClientepreventaparacredito >= limitcred.GetString("CAT_CL_LIMITECREDITO") Then + If Subs.traeTotalClientepreventaparacredito(la_cuenta.Text) >= limitcred.GetString("CAT_CL_LIMITECREDITO") Then If et_montoacredito.Text > limitcred.GetString("CAT_CL_LIMITECREDITO") Then MsgboxAsync("El monto del pagare no puede ser mayor al limite del credito","Atención") @@ -792,10 +839,10 @@ Private Sub b_acred_Click p_credito.Visible = False End If End If - Else If Subs.traeTotalClientepreventaparacredito < limitcred.GetString("CAT_CL_LIMITECREDITO") Then - If et_montoacredito.Text > Subs.traeTotalClientepreventaparacredito Then + Else If Subs.traeTotalClientepreventaparacredito(la_cuenta.Text) < limitcred.GetString("CAT_CL_LIMITECREDITO") Then + If et_montoacredito.Text > Subs.traeTotalClientepreventaparacredito(la_cuenta.Text) Then MsgboxAsync("El monto del pagare no puede ser mayor a la preventa registrada","Atención") - et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito + et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito(la_cuenta.Text) Else c = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) As REGISTRADO FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)") c.Position = 0 @@ -820,22 +867,114 @@ Private Sub b_cancred_Click End Sub Sub GuardaVenta - If pre_act <> Starter.pre_viejo Then - B_IMP_Click - Guardar.Enabled = False - bitacora.b_Inicio_Fin_venta2.Enabled = False - gest.Enabled = False - b_cxc.Enabled = False - Tar.Enabled = False - Tels.Enabled = False - b_ventaabordo.Enabled = False - HIST.Enabled = False - banderaimp = 1 - Else If pre_act = Starter.pre_viejo Then - If banderaimp = 1 Then - B_IMP_Click + imprimirsolo = 0 + If l_total.Text = "null" Then + Dim comprarar As String = 0 + Else + comprarar = l_total.Text + End If + LogColor(comprarar,Colors.Green) + If comprarar = Starter.pre_viejo Then + If bitacora.enVenta Then + bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" + bitacora.enVenta = False + bitacora.inicioFin + banderaimp = 0 + Log("2.1") Else GUADAVENTA2 + B4XPages.ShowPage("Principal") + banderaimp = 0 + Log("2.2") + End If + + Else + Dim minimocompra As Int + Dim mini As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES where CAT_VA_DESCRIPCION = 'minimoventa'") + If mini.RowCount > 0 Then + mini.Position = 0 + minimocompra = mini.GetString("CAT_VA_VALOR") + Else + minimocompra = 0 + End If + If minimocompra > 0 Then + If comprarar < minimocompra Then + + Msgbox2Async("La venta es menor al monto minimo permitido."&CRLF& "La venta se eliminara."&CRLF&"¿Deseas continuar?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + Subs.borraPedidoClienteActual + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta,sDate & sTime, usuario, "Monto de venta menor a 190","", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, "Monto de venta menor a 190", "") + B4XPages.ShowPage("Principal") + Log("si entre") + End If + + + + Else If comprarar >= minimocompra Then + + Log("1.2") + Log(pre_act) + If comprarar <> Starter.pre_viejo Then + Log("1.3") + imprimirsolo = 1 + B_IMP_Click + Guardar.Enabled = False + gest.Enabled = False + b_cxc.Enabled = False + Tar.Enabled = False + Tels.Enabled = False + b_ventaabordo.Enabled = False + HIST.Enabled = False + banderaimp = 1 + Else If comprarar = Starter.pre_viejo Then + Log("1.4") + If banderaimp = 1 Then + Log("1.5") + imprimirsolo = 1 + B_IMP_Click + Else + Log("1.6") + + GUADAVENTA2 + End If + + End If + End If + Else If minimocompra = 0 Then + + Log("1.2") + If comprarar <> Starter.pre_viejo Then + Log("1.3") + imprimirsolo = 1 + B_IMP_Click + Guardar.Enabled = False + gest.Enabled = False + b_cxc.Enabled = False + Tar.Enabled = False + Tels.Enabled = False + b_ventaabordo.Enabled = False + HIST.Enabled = False + banderaimp = 1 + Else If comprarar = Starter.pre_viejo Then + Log("1.4") + If banderaimp = 1 Then + Log("1.5") + imprimirsolo = 1 + B_IMP_Click + Else + Log("1.6") + + GUADAVENTA2 + End If + + End If + End If End If @@ -895,9 +1034,10 @@ Sub GUADAVENTA2 ' LogColor($"actualizamos "${la_cuenta.text}, hora_final=${DateTime.now}"$,Colors.Red) Subs.actualizaTET(la_cuenta.text) DateTime.TimeFormat = "HH:mm:ss" - - mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! - mandapiezas + + Log("para mostrar que aqui me quedo ") +' mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! +' mandapiezas B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize B4XPages.MainPage.promos.promosMap.Initialize @@ -910,6 +1050,10 @@ Sub GUADAVENTA2 b_ventaabordo.Enabled = False HIST.Enabled = True banderaimp = 0 + bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" + bitacora.enVenta = False + bitacora.inicioFin + imprimirsolo = 0 ' B4XPages.ShowPage("Principal") Else If B4XPages.MainPage.recarga = "1" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -964,13 +1108,15 @@ Sub GUADAVENTA2 ' mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! ' mandapiezas - mandaPendientesrecarga - mandapiezasrecarga +' mandaPendientesrecarga +' mandapiezasrecarga B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize B4XPages.MainPage.promos.promosMap.Initialize ' B4XPages.ShowPage("login") B4XPages.MainPage.recarga = "0" + imprimirsolo = 0 + End If End Sub @@ -1045,7 +1191,10 @@ Sub b_mapa_Click End Sub Sub B_IMP_Click - + If imprimirsolo <> 1 Then + imprimirsolo = 0 + End If + Log(imprimirsolo) c = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)",Array As String("PREVENTA_48")) If c.RowCount > 0 Then imprime_venta @@ -1150,32 +1299,32 @@ Sub imprime_preventa k1 = NumberFormat(s.GETSTRING("PE_COSTOU"),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ESPACIO = ESPACIO - TAMANO ESPACIO = ESPACIO / 2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) TAMANO = 0 - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " Else Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) k1 = NumberFormat((s.GETSTRING("PE_COSTOU")/s.GETSTRING("PE_CANT")),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ESPACIO = ESPACIO - TAMANO ESPACIO = ESPACIO / 2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) TAMANO = 0 - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " End If End If @@ -1198,29 +1347,29 @@ Sub imprime_preventa k1 = NumberFormat(s.GETSTRING("PE_COSTOU"),0,2) k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ESPACIO = ESPACIO - TAMANO ESPACIO = ESPACIO / 2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) TAMANO = 0 - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " End If Next Printer1.WriteString(" " & CRLF) End If s.Close - s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_ C ON P.PE_PROID = C.CAT_GP_ID And P.PE_CEDIS = P.PE_PROID WHERE PE_CLIENTE IN (Select cuenta FROM CUENTAA) And PE_FOLIO = 'PREVENTA_24'"$) + s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID And P.PE_CEDIS = P.PE_PROID WHERE PE_CLIENTE IN (Select cuenta FROM CUENTAA) And PE_FOLIO = 'PREVENTA_24'"$) Dim subtotal As Double s.Position = 0 subtotal = s.GetDouble("SUBTOTAL") s.Close - Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_ C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_24' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") + Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_24' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") subtot.Position = 0 subtotal = subtotal + subtot.GetDouble("TOTAL_SIN_PROMO") subtot.Close @@ -1280,7 +1429,15 @@ Sub imprime_preventa If resultado = DialogResponse.POSITIVE Then B_IMP_Click Else - GUADAVENTA2 + If imprimirsolo = 0 Then + + Else If imprimirsolo = 1 Then + bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" + bitacora.enVenta = False + bitacora.inicioFin + GUADAVENTA2 + End If + End If End Sub @@ -1432,7 +1589,7 @@ Sub imprime_venta k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ESPACIO = ESPACIO - TAMANO ESPACIO = ESPACIO / 2 @@ -1440,10 +1597,10 @@ Sub imprime_venta BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) TAMANO = 0 - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ' Printer1.Justify = 0 Else @@ -1495,7 +1652,7 @@ Sub imprime_venta k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ESPACIO = ESPACIO - TAMANO ESPACIO = ESPACIO / 2 @@ -1503,10 +1660,10 @@ Sub imprime_venta BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) TAMANO = 0 - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ' Printer1.Justify = 0 End If @@ -1574,7 +1731,7 @@ Sub imprime_venta k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2) TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ESPACIO = ESPACIO - TAMANO ESPACIO = ESPACIO / 2 @@ -1582,10 +1739,10 @@ Sub imprime_venta BLANCO = " " & BLANCO Next - Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + Printer1.WriteString(s.GETSTRING("PE_CANT")& " " & "Piezas" & BLANCO & k1 & BLANCO & k2& CRLF ) TAMANO = 0 - ESPACIO = 30 + ESPACIO = 23 BLANCO = " " ' Printer1.Justify = 0 End If @@ -1593,13 +1750,13 @@ Sub imprime_venta Printer1.WriteString(" " & CRLF) End If s.Close - s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_ C ON P.PE_PROID = C.CAT_GP_ID And P.PE_CEDIS = P.PE_PROID WHERE PE_CLIENTE IN (Select cuenta FROM CUENTAA) And PE_FOLIO = 'PREVENTA_48'"$) + s = skmt.ExecQuery($"SELECT SUM(CAT_GP_PRECIO * PE_CANT) As SUBTOTAL FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID And P.PE_CEDIS = P.PE_PROID WHERE PE_CLIENTE IN (Select cuenta FROM CUENTAA) And PE_FOLIO = 'PREVENTA_48'"$) Dim subtotal As Double s.Position = 0 subtotal = s.GetDouble("SUBTOTAL") s.Close - Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_ C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_48' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") + Dim subtot As Cursor = skmt.ExecQuery("SELECT SUM(P.PE_COSTO_TOT) As TOTAL_SIN_PROMO FROM PEDIDO P INNER JOIN CAT_GUNAPROD C ON P.PE_PROID = C.CAT_GP_ID WHERE P.PE_CLIENTE IN (Select cuenta FROM CUENTAA) And P.PE_FOLIO = 'PREVENTA_48' And PE_CEDIS Not IN (Select DISTINCT PE_PROID FROM PEDIDO)") subtot.Position = 0 subtotal = subtotal + subtot.GetDouble("TOTAL_SIN_PROMO") subtot.Close @@ -1672,7 +1829,14 @@ Sub imprime_venta If resultado = DialogResponse.POSITIVE Then B_IMP_Click Else - GUADAVENTA2 + If imprimirsolo = 0 Then + + Else If imprimirsolo = 1 Then + bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA" + bitacora.enVenta = False + bitacora.inicioFin + GUADAVENTA2 + End If End If End If @@ -1689,6 +1853,7 @@ Sub Printer1_Connected (Success As Boolean) LogColor("Impresora conectada", Colors.Green) ' B_IMP2.Enabled = True impresoraConectada = True + siimprimio = 1 Else ' Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") 'ignore ' ToastMessageShow("Error conectando la impresora", False) @@ -1698,6 +1863,7 @@ Sub Printer1_Connected (Success As Boolean) Starter.MAC_IMPRESORA = "0" errorImpresora = 0 End If + siimprimio = 0 End If End Sub diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index c177ef1..f634305 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -79,7 +79,7 @@ Sub B4XPage_Appear busca.Text = "" entro ="2" colonia = 0 - c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} ORDER BY CAST(CAT_CL_NUM_SERIEFISICO AS INTEGER) ASC"$) + c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} AND CAT_CL_CODIGO NOT LIKE '%N%' ORDER BY CAST(CAT_CL_NUM_SERIEFISICO AS INTEGER) ASC"$) ListView1.Clear lfila.Text = "NOMBRE" @@ -174,7 +174,7 @@ Sub ListView1_ItemClick (Position As Int, value As Object) B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(value)) DateTime.TimeFormat = "HHmmss" STIME=DateTime.Time(DateTime.Now) - Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito + Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito(value) s=B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM HIST_STAY_STORE WHERE HSS_IN = ? AND HSS_CODIGO In (select cuenta from cuentaa)", Array As String("0")) s.Position = 0 If s.GetString("CUANTOS") = 1 Then @@ -211,7 +211,7 @@ End Sub Sub BUSCA_TextChanged (Old As String, New As String) If CHECK = 0 Then q_buscar = "%" & busca.Text & "%" - c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} order by CAT_CL_CODIGO "$, Array As String(q_buscar,q_buscar,q_buscar)) + c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} AND CAT_CL_CODIGO NOT LIKE '%N%' order by CAT_CL_CODIGO "$, Array As String(q_buscar,q_buscar,q_buscar)) ListView1.Clear lfila.text = "Nombre y Calle" diff --git a/B4A/C_Historico.bas b/B4A/C_Historico.bas index ccad2cd..a277a14 100644 --- a/B4A/C_Historico.bas +++ b/B4A/C_Historico.bas @@ -101,7 +101,7 @@ End Sub Private Sub B4XPage_CloseRequest As ResumableSub ' BACK key pressed ' Return True To close, False To cancel - B4XPages.ShowPage("Principal") + B4XPages.ShowPage("Cliente") Return False End Sub diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index a93cd54..8c37049 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -142,7 +142,7 @@ Sub GUARDA_Click B4XPages.MainPage.skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, cuenta)) LogColor($"actualizamos "${cuenta}, hora_final=${DateTime.now}"$,Colors.Red) - mandaPendientesnoventa +' mandaPendientesnoventa bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, r_1.Checked) B4XPages.ShowPage("Principal") diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 7ae54ca..ce207b2 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -128,7 +128,7 @@ Sub B4XPage_Appear End If ' End If -' If Subs.pedidoGuardado Then borra.Enabled = False Else borra.Enabled = True + If Subs.pedidoGuardado Then borra.Enabled = False Else borra.Enabled = True End Sub Sub Activity_Pause (UserClosed As Boolean) @@ -153,8 +153,8 @@ End Sub Sub borra_Click ' If folio <> "" Then - result = Msgbox2("Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore - If result = DialogResponse.POSITIVE Then + result = Msgbox2("Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore + If result = DialogResponse.POSITIVE Then ' c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ") ' If c.RowCount>0 Then ' For i=0 To c.RowCount -1 @@ -167,9 +167,11 @@ Sub borra_Click ' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)") ' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") Subs.borraPedidoClienteActual - B4XPage_Appear + If B4XPages.MainPage.productos.clv_prods_ll.IsInitialized Then B4XPages.MainPage.productos.clv_prods_ll.Clear End If + B4XPage_Appear + End If ' Else ' Msgbox("CLIENTE YA SE TRANSMITIO, FAVOR DE LLAMAR A SOPORTE PARA ASISTENCIA","AVISO") 'ignore ' End If @@ -177,71 +179,78 @@ End Sub Sub ListView1_ItemLongClick (Position As Int, Value As Object) Log(Value) -' If Not(Subs.pedidoGuardado) Then - result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore - If result = DialogResponse.POSITIVE Then - c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value)) - c.Position=0 - Log(vamoaver.Get(Position)) + If Not(Subs.pedidoGuardado) Then + result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore + If result = DialogResponse.POSITIVE Then + c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO, PE_PRONOMBRE FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value)) + c.Position=0 + Log(vamoaver.Get(Position)) If vamoaver.Get(Position) = "PREVENTA_48" Then - Log("CAT_GUNAPROD2") - Log(Position) - Log(Value) - Starter.tabla = "CAT_GUNAPROD2" - Else - Log("CAT_GUNAPROD") - Log(Position) - Log(Value) - Starter.tabla = "CAT_GUNAPROD" - End If -' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) - c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value)) - c2.Position=0 - Log(c2.GetString("CUANTOS")) - If c2.GetString("CUANTOS") > 0 Then - j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ?)",Array As String(Value)) - Log(j3.RowCount) - If j3.RowCount > 0 Then - Log("estoy aqui") - For i = 0 To j3.RowCount -1 - Log("aqui tronare?") - j3.Position = i - B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) - B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(j3.GetString("PE_PRONOMBRE"), c.GetString("PE_FOLIO"))) - Next - End If - j3.Close - Else - B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) - B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, c.GetString("PE_FOLIO"))) - End If - c.Close - c2.Close - DateTime.DateFormat = "MM/dd/yyyy" - sDate=DateTime.Date(DateTime.Now) - sTime=DateTime.Time(DateTime.Now) - c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa") - c.Position=0 - clie_id = c.GetString("CUENTA") - c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa") - c.Position=0 - usuario = c.GetString("USUARIO") - c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") - c.Position=0 - If c.GetString("CUANTOS") > 0 Then - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - Else - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - End If - B4XPage_Appear + Log("CAT_GUNAPROD2") + Log(Position&",1") + Log(Value&",1") + Starter.tabla = "CAT_GUNAPROD2" + Else + Log("CAT_GUNAPROD") + Log(Position&",2") + Log(Value&",2") + Starter.tabla = "CAT_GUNAPROD" End If -' Else -' ToastMessageShow("Pedido guardado, NO se puede editar.",False) -' End If +' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) +' Log(c.GetString("PE_CANT")) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) + c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value)) + c2.Position=0 + Log("aqui entre1") + If c2.GetString("CUANTOS") > 0 Then + Log("aqui entre") + j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ? and PE_FOLIO = ?)",Array As String(Value,vamoaver.Get(Position))) + Log(j3.RowCount) + + If j3.RowCount > 0 Then + Log("estoy aqui") + For i = 0 To j3.RowCount -1 + Log("aqui tronare?") + j3.Position = i + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, vamoaver.Get(Position))) + Next + End If + j3.Close + Else + Log("aqui entre2") + + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, vamoaver.Get(Position))) + End If + c.Close + c2.Close + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa") + c.Position=0 + clie_id = c.GetString("CUENTA") + c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa") + c.Position=0 + usuario = c.GetString("USUARIO") + c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") + c.Position=0 + If c.GetString("CUANTOS") > 0 Then + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + Else + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + End If + B4XPage_Appear + End If + Else + ToastMessageShow("Pedido guardado, NO se puede editar.",False) + End If End Sub Sub b_desc_Click diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index 4f127c4..1166373 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -187,10 +187,10 @@ Sub GUARDA_Click If lat <> 0 Then If giros <> "SELECCIONA UNA OPCIÓN" Or cb_giro.SelectedItem <> "SELECCIONA UNA OPCIÓN" Then If ET_Atiende.Text <> "" Then - If et_colonia.Text <> "" Then + If et_telefono.Text <> "" Then If et_colonia.Text <> "" Then If et_referencia.Text <> "" Then - If hr_ini <> "SELECCIONA UNA OPCIÓN" Or cb_hora_ini.SelectedItem <> "SELECCIONA UNA OPCIÓN" Then + If cb_hora_fin.SelectedItem <> "SELECCIONA UNA OPCIÓN" And cb_hora_ini.SelectedItem <> "SELECCIONA UNA OPCIÓN" Then DateTime.DateFormat = "MM/dd/yyyy" DateTime.Timeformat = "HHmmss" sDate = DateTime.Date(DateTime.Now) @@ -230,10 +230,10 @@ Sub GUARDA_Click B4XPages.ShowPage("Principal") CallSubDelayed(Tracker, "StartFLP") Else - MsgboxAsync("Por favor, debe capturar la apertura del negocio.","Atención") + MsgboxAsync("Por favor, debe capturar la apertura o el cierre del negocio.","Atención") End If Else - MsgboxAsync("Por favor, debe capturar el cierre del negocio.","Atención") + MsgboxAsync("Por favor, debe capturar la referencia del negocio.","Atención") End If Else MsgboxAsync("Por favor, debe capturar la colonia el negocio.","Atención") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 0e4abb8..5408ad1 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -225,6 +225,18 @@ Sub Class_Globals Dim bitacora As C_Bitacora + Private lv_pedidos_tot As ListView + Private b_regresar As Button + Dim p_pedidos As Panel + Private p_prod As Panel + Private b_regreso As Button + Private iv_productos As ImageView + Private p_productos As Panel + Private lv_prod_Prin As ListView + Private l_prod_p As Label + Private l_prod_c As Label + Private l_tot_prod_c As Label + Private l_tot_prod_p As Label End Sub 'You can add more parameters here. @@ -540,8 +552,10 @@ Sub B4XPage_Appear End If If l_ruta.Text = "0" Then p_abordo.Visible = False + p_productos.Visible= False Else p_abordo.Visible = False + p_productos.Visible = True End If ' d = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_GP_ID, CAT_GP_NOMBRE FROM CAT_GUNAPROD2") ' CLV_PICK_CIEGO.Clear @@ -555,6 +569,7 @@ Sub B4XPage_Appear End Sub Sub Subir_Click + checaPedido CARGA = "SUBIR" p_mandaInfo.Width = Root.Width p_mandaInfo.Height = Root.Height @@ -609,37 +624,37 @@ Sub Subir_Click End If c.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 - c.Position=i - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_QR_2_mazapa" - cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"),C.GetString("CODIGOB"),C.GetString("LON"),C.GetString("LAT"),ALMACEN,l_ruta.text ) - reqManager.ExecuteCommand(cmd , "ins_QR") - Next - 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 - c.Position=i - 's=skmt.ExecQuery2("SELECT HIST_VI_IMAGEN FROM HIST_VISITAS WHERE HIST_VI_CREDITO =?", Array As String (c.GetString("HIST_VI_CREDITO"))) - 's.Position =0 - foto1 = c.GetBlob("CAT_CL_FOTO") - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_QR_mazapa" - cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"),C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_LONG"),C.GetString("CAT_CL_LAT"),ALMACEN,l_ruta.text ) - reqManager.ExecuteCommand(cmd , "ins_QR") - Next - End If - c.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 +' c.Position=i +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_QR_2_mazapa" +' cmd.Parameters = Array As Object(C.GetString("CODIGOKMTS"),C.GetString("CODIGOB"),C.GetString("LON"),C.GetString("LAT"),ALMACEN,l_ruta.text ) +' reqManager.ExecuteCommand(cmd , "ins_QR") +' Next +' 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 +' c.Position=i +' 's=skmt.ExecQuery2("SELECT HIST_VI_IMAGEN FROM HIST_VISITAS WHERE HIST_VI_CREDITO =?", Array As String (c.GetString("HIST_VI_CREDITO"))) +' 's.Position =0 +' foto1 = c.GetBlob("CAT_CL_FOTO") +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_QR_mazapa" +' cmd.Parameters = Array As Object(C.GetString("CAT_CL_NUM_SERIEFISICO"),C.GetString("CAT_CL_CODIGO"),C.GetString("CAT_CL_LONG"),C.GetString("CAT_CL_LAT"),ALMACEN,l_ruta.text ) +' reqManager.ExecuteCommand(cmd , "ins_QR") +' Next +' End If +' c.Close +' 'Envio de Pagares c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM PAGARES") If c.RowCount>0 Then @@ -704,17 +719,17 @@ Sub Subir_Click ' 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 WHERE PC_CLIENTE <> '1' ") + 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,IFNULL(PC_IMPRESO,0) AS PC_IMPRESO FROM PEDIDO_CLIENTE WHERE PC_CLIENTE <> '1' ") d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE WHERE PC_CLIENTE <> 1 ") 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_mazapa" + cmd.Name = "insert_pedido_CLIENTE_mazapa" PCNoArts = c.GetString("PC_NOART") PCMonto = c.GetString("PC_MONTO") - 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, Subs.traeRuta2(c.GetString("PC_CLIENTE")), c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) + 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, Subs.traeRuta2(c.GetString("PC_CLIENTE")), c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"), c.GetString("PC_IMPRESO")) reqManager.ExecuteCommand(cmd , "ins_pedidos") Log(">>>>>> INSERT PEDIDO_CLIENTE") Next @@ -725,16 +740,16 @@ Sub Subir_Click 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, PE_CANTC, PE_BCAJAS FROM PEDIDO WHERE PE_FOLIO <> 'RECARGA'") + 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, PE_CANTC, PE_BCAJAS,IFNULL(PE_IMPRESO,0) AS PE_IMPRESO FROM PEDIDO WHERE PE_FOLIO <> 'RECARGA'") d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO") If c.RowCount > 0 Then For i = 0 To c.RowCount - 1 c.Position = i Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_pedido2_mazapa" 'CON TOTALES INCLUIDOS + cmd.Name = "insert_pedido_PE_mazapa" 'CON TOTALES INCLUIDOS 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")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN) - 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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS")) + 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"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"), c.GetString("PE_IMPRESO")) 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 @@ -1000,6 +1015,11 @@ Sub cargar_Click cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") + cmd.Initialize + cmd.Name = "select_CAT_RU_MINVENTA_mazapa" + cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) + reqManager.ExecuteQuery(cmd , 0, "minimoventa") + ' cmd.Initialize ' cmd.Name = "select_cat_clientes_todos_mazapa" ' cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) @@ -1365,6 +1385,18 @@ Sub JobDone(Job As HttpJob) Next End If End If + + If Job.JobName = "DBRequest" Then + Dim RESULT As DBResult = reqManager.HandleJob(Job) + If RESULT.Tag = "minimoventa" Then 'query tag + For Each records() As Object In RESULT.Rows + Dim CAT_RU_MINVENTA As String = records(RESULT.Columns.Get("CAT_RU_MINVENTA")) + B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As Object("minimoventa")) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object("minimoventa", CAT_RU_MINVENTA)) + Next + + End If + End If If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = reqManager.HandleJob(Job) @@ -2044,6 +2076,11 @@ Private Sub B4XPage_CloseRequest As ResumableSub If SCROLL_RESDIA.Visible Then SCROLL_RESDIA.Visible = False B_OK_RES_Click + Return False + Else if p_prod.Visible Then + p_prod.Visible = False +' B_OK_PANEL5_Click + Return False Else if Panel5.Visible Then B_OK_PANEL5_Click @@ -2637,37 +2674,106 @@ Sub e_ruta_TextChanged (Old As String, New As String) End Sub Sub B_COMM_Click - Btn_Ubicar.Visible=False - SCROLL_RESDIA.Visible = True - SCROLL_RESDIA.Panel.LoadLayout("COMIS") - SCROLL_RESDIA.Panel.Height = Panel_C.Height - Panel4.Visible = False - Panel_C.Visible = True - -' trabajar.Visible = False - NUEVO.Visible =False - BUSCA.Visible=False - connecta.Visible=False - Subir.Visible=False - cargar.Visible=False - Resumen.Visible= False -' - If l_ruta.Text <> 0 Then - c=B4XPages.MainPage.skmt.ExecQuery("Select HCM_TOTAL_V , HCM_TOTAL_VIVE , HCM_TOTAL_GUNA , HCM_TOTAL_BEB from HIST_COMISIONES_MOVIL ") - c.Position = 0 - L_TOTAL_BA.Text = c.GetString("HCM_TOTAL_BEB") - L_TOTAL_GUNA.Text = c.GetString("HCM_TOTAL_GUNA") - L_TOTAL_MM.Text = c.GetString("HCM_TOTAL_V") - L_TOTAL_VIVE.Text = c.GetString("HCM_TOTAL_VIVE") - c.Close - L_TOTAL_COMIS.Text = 0 + Dim label1 As Label + label1 = lv_pedidos_tot.SingleLineLayout.Label + label1.TextSize = 14 + SCROLL_RESDIA.Panel.Height = p_pedidos.Height + p_pedidos.Width = Root.Width + b_regresar.Left = (p_pedidos.Width - b_regresar.Width) / 2 + b_regresar.Top = p_pedidos.Height - b_regresar.Height + p_pedidos.Visible = True + + ' Llamar al método para cargar y mostrar los datos + MostrarDatosPedidos +End Sub + +Private Sub lv_pedidos_tot_ItemClick (Position As Int, Value As Object) + ' Llamar al método para cargar y mostrar los datos + MostrarDatosPedidos +End Sub + +Private Sub MostrarDatosPedidos + Private sumP As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT PE_PRONOMBRE, PE_PROID, SUM(CASE WHEN PE_BCAJAS <> 1 THEN PE_CANT ELSE 0 END) AS PE_CANT, SUM(CASE WHEN PE_BCAJAS = 1 THEN PE_CANTC ELSE 0 END) AS PE_CANTC FROM PEDIDO GROUP BY PE_PRONOMBRE,PE_PROID") + lv_pedidos_tot.SingleLineLayout.Label.TextColor = Colors.Black + lv_pedidos_tot.Clear + If sumP.RowCount > 0 Then + For i = 0 To sumP.RowCount - 1 + sumP.Position = i + Dim itemText As String + itemText = $"Nombre: ${sumP.GetString("PE_PRONOMBRE")} ${CRLF} N° Piezas: ${sumP.GetInt("PE_CANT")}, "N° Cajas: ${sumP.GetString("PE_CANTC")}"$ + lv_pedidos_tot.AddSingleLine(itemText) + Next Else - L_TOTAL_BA.Text = 0 - L_TOTAL_GUNA.Text = 0 - L_TOTAL_MM.Text = 0 - L_TOTAL_VIVE.Text = 0 - L_TOTAL_COMIS.Text = 0 + lv_pedidos_tot.AddSingleLine("No hay datos disponibles.") End If + sumP.Close + Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT SUM(PE_CANT) AS PE_CANT FROM PEDIDO WHERE PE_BCAJAS <> 1") + If c.RowCount > 0 Then + c.Position = 0 + l_tot_prod_p.Text = c.GetString("PE_CANT") + End If + c.Close + Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT SUM(PE_CANTC) AS PE_CANTC FROM PEDIDO WHERE PE_BCAJAS = 1") + If c.RowCount > 0 Then + c.Position = 0 + l_tot_prod_c.Text = c.GetString("PE_CANTC") + End If + c.Close +End Sub + +Private Sub b_regresar_Click + p_pedidos.Visible = False + SCROLL_RESDIA.Panel.Height = Panel4.Height +End Sub + +Private Sub iv_productos_Click + Dim label1 As Label + label1 = lv_prod_Prin.SingleLineLayout.Label + label1.TextSize = 14 + p_prod.Width = Root.Width + p_prod.Height = Root.Height + b_regreso.Left = (p_prod.Width - b_regreso.Width) / 2 + b_regreso.Top = p_prod.Height - b_regreso.Height + + p_prod.Visible = True + p_prod.BringToFront + MostrarProductos +End Sub + +Private Sub lv_prod_Prin_ItemClick (Position As Int, Value As Object) + MostrarProductos +End Sub + +Private Sub MostrarProductos + Dim marcas As String = "" + Dim m As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'MARCAS'") + If m.RowCount > 0 Then + m.Position = 0 + marcas = m.GetString("CAT_VA_VALOR") + End If + + Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_DP_PRECIO4 from CAT_GUNAPROD LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' AND CAT_GP_CLASIF IN(${marcas}) AND CAT_GP_CLASIF <> 'ALEN PROMOCIONES' union all Select CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_DP_PRECIO4 from CAT_GUNAPROD LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN = 0 And CAT_GP_CLASIF <> 'PROMOS' AND CAT_GP_CLASIF IN(${marcas}) AND CAT_GP_CLASIF <> 'ALEN PROMOCIONES' and cat_gp_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 1"$) + + lv_prod_Prin.SingleLineLayout.Label.TextColor = Colors.Black + lv_prod_Prin.Clear + If c.RowCount > 0 Then + For i = 0 To c.RowCount - 1 + c.Position = i + Dim itemText As String + Dim precioFormateado As String = NumberFormat2(c.GetDouble("CAT_GP_PRECIO"), 0, 2, 2, False) + Dim precioCaja As String = NumberFormat2(c.GetDouble("CAT_DP_PRECIO4"), 0, 2, 2, False) + itemText = $"${c.GetString("CAT_GP_NOMBRE")} ${CRLF}Existencias: ${c.GetInt("CAT_GP_ALMACEN")}, P/C: ${precioCaja}, P/U: ${precioFormateado}"$ + lv_prod_Prin.AddSingleLine(itemText) + Next + Else + lv_prod_Prin.AddSingleLine("No hay datos disponibles.") + End If + c.Close +End Sub + + +Private Sub b_regreso_Click + p_prod.Visible = False End Sub Sub B_OK_COMISS_Click @@ -2796,8 +2902,6 @@ Private Sub p_mandaInfo_Click End Sub - - Private Sub iv_abordo_Click Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 6deda48..41f5124 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -896,7 +896,7 @@ Sub b_terminar1_Click p_vistaPreviaTrans.Width = Root.Width p_vistaPreviaTrans.Height = Root.Height Subs.centraPanel(p_vistaPrevia, Root.Width) -' If Subs.pedidoGuardado Then b_rechazar.Enabled = False Else b_rechazar.Enabled = True + If Subs.pedidoGuardado Then b_rechazar.Enabled = False Else b_rechazar.Enabled = True p_vistaPrevia.Visible=True p_vistaPreviaTrans.Visible=True End Sub @@ -1021,84 +1021,90 @@ End Sub Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object) Private sDate,sTime, clie_id, usuario As String -' If Not(Subs.pedidoGuardado) Then - result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore + If Not(Subs.pedidoGuardado) Then + result = Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore If result = DialogResponse.POSITIVE Then - c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value)) - c.Position=0 - Log(vamoaver.Get(Position)) + c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO, PE_PRONOMBRE FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value)) + c.Position=0 + Log(vamoaver.Get(Position)) If vamoaver.Get(Position) = "PREVENTA_48" Then Log("CAT_GUNAPROD2") - Log(Position) - Log(Value) + Log(Position&",1") + Log(Value&",1") Starter.tabla = "CAT_GUNAPROD2" Else Log("CAT_GUNAPROD") - Log(Position) - Log(Value) - Starter.tabla = "CAT_GUNAPROD" - End If + Log(Position&",2") + Log(Value&",2") + Starter.tabla = "CAT_GUNAPROD" + End If ' B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID"))) ' Log(c.GetString("PE_CANT")) - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) - c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value)) - c2.Position=0 - If c2.GetString("CUANTOS") > 0 Then - j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ?)",Array As String(Value)) - Log(j3.RowCount) - If j3.RowCount > 0 Then - Log("estoy aqui") - For i = 0 To j3.RowCount -1 - Log("aqui tronare?") - j3.Position = i - B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) - B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(j3.GetString("PE_PRONOMBRE"), c.GetString("PE_FOLIO"))) - Next - End If - j3.Close - Else - B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) - B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, c.GetString("PE_FOLIO"))) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1)) + c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value)) + c2.Position=0 + Log("aqui entre1") + If c2.GetString("CUANTOS") > 0 Then + Log("aqui entre") + j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ? and PE_FOLIO = ?)",Array As String(Value,vamoaver.Get(Position))) + Log(j3.RowCount) + + If j3.RowCount > 0 Then + Log("estoy aqui") + For i = 0 To j3.RowCount -1 + Log("aqui tronare?") + j3.Position = i + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, vamoaver.Get(Position))) + Next End If - c.Close - c2.Close - DateTime.DateFormat = "MM/dd/yyyy" - sDate=DateTime.Date(DateTime.Now) - sTime=DateTime.Time(DateTime.Now) - c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa") - c.Position=0 - clie_id = c.GetString("CUENTA") - c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa") - c.Position=0 - usuario = c.GetString("USUARIO") - c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") - c.Position=0 - If c.GetString("CUANTOS") > 0 Then - Log("aqui5") - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - Private h As Cursor = B4XPages.MainPage.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART, sum (PE_COSTO_TOT) as PC_MONTO from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") - h.Position=0 - l_cant.Text = h.GetString("PC_NOART") - l_total2.Text = h.GetString("PC_MONTO") - h.Close - Else - Log("aqui6") - B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") - B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") - Private h As Cursor = B4XPages.MainPage.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART, sum (PE_COSTO_TOT) as PC_MONTO from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") - h.Position=0 - l_cant.Text = 0 - l_total2.Text = 0 - h.Close - End If - b_terminar1_Click + j3.Close + Else + Log("aqui entre2") + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$) + B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, vamoaver.Get(Position))) End If -' Else -' ToastMessageShow("Esta venta ya esta guardada, no se puede editar ni borrar.", False) -' End If + c.Close + c2.Close + DateTime.DateFormat = "MM/dd/yyyy" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa") + c.Position=0 + clie_id = c.GetString("CUENTA") + c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa") + c.Position=0 + usuario = c.GetString("USUARIO") + c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") + c.Position=0 + If c.GetString("CUANTOS") > 0 Then + Log("aqui5") + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps)) + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + Private h As Cursor = B4XPages.MainPage.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART, sum (PE_COSTO_TOT) as PC_MONTO from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") + h.Position=0 + l_cant.Text = h.GetString("PC_NOART") + l_total2.Text = h.GetString("PC_MONTO") + h.Close + Else + Log("aqui6") + B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") + B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)") + Private h As Cursor = B4XPages.MainPage.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART, sum (PE_COSTO_TOT) as PC_MONTO from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") + h.Position=0 + l_cant.Text = 0 + l_total2.Text = 0 + h.Close + End If + b_terminar1_Click + End If + Else + ToastMessageShow("Esta venta ya esta guardada, no se puede editar ni borrar.", False) + End If End Sub Private Sub clv_prods_ll_ItemClick (Index As Int, Value As Object) @@ -1154,6 +1160,15 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In End If + If Subs.pedidoGuardado Then +' Log("YA SE GUARDO") + et_pCant.Enabled = False + b_prodMas.Enabled = False + b_prodMenos.Enabled = False + b_prodMasc.Enabled = False + b_prodMenosc.Enabled = False + End If + Private precio As String=NumberFormat2(clv_prods_ll.GetValue(i).As(Map).Get("precio").As(Double),1,2,2,False) ' Log(clv_prods_ll.GetValue(i).As(Map)) @@ -1280,7 +1295,7 @@ Sub LlenaProdsLL(p As ResultSet) If hayPedido Then 'Si hay pedido obtenemos las cantidades de los productos para agregarlos al CLV. Dim cantsMap As Map cantsMap.Initialize - Dim pe As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID, PE_CANT, PE_CANTC, PE_BCAJAS from PEDIDO where PE_CLIENTE = '${clienteId}' and PE_CEDIS = '${Subs.traeAlmacen}' and PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$) + Dim pe As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct PE_PROID, PE_CANT, PE_CANTC, PE_BCAJAS from PEDIDO where PE_CLIENTE = '${clienteId}' and PE_CEDIS = '${Subs.traeAlmacen}' and PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$) ' LogColor("Ponemos productos de pedido anterior: "&pe.RowCount, Colors.red) LogColor("||||||||||||||||||||||||||>"&B4XPages.MainPage.tipo_venta, Colors.Yellow) diff --git a/B4A/C_RespaldoDiario.bas b/B4A/C_RespaldoDiario.bas index 5a601fd..638746c 100644 --- a/B4A/C_RespaldoDiario.bas +++ b/B4A/C_RespaldoDiario.bas @@ -39,6 +39,7 @@ Public Sub Initialize As Object rkmt.ExecNonQuery($"create table if not exists pedidos (pe_folio NUMERIC, pe_desc NUMERIC, pe_costo_sin TEXT, pe_ruta TEXT, pe_cedis TEXT, pe_costo_tot NUMERIC, pe_costou NUMERIC, pe_cant NUMERIC, pe_pronombre TEXT, pe_proid TEXT, pe_cliente TEXT, pe_fecha TEXT, pe_usuario TEXT)"$) agregaColumna2(rkmt,"pedidos","pe_cantc","text") agregaColumna2(rkmt,"pedidos","pe_bcajas","text") + agregaColumna2(rkmt,"pedidos", "PE_IMPRESO", "INT") Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna en la tabla Private c As Cursor = rkmt.ExecQuery($"SELECT COUNT(*) AS fCol FROM pragma_table_info('pedidos') WHERE name='pe_envio_ok'"$) c.Position = 0 @@ -87,7 +88,7 @@ Sub respaldaPedido ' Log("copiando pedidos ...") rkmt.BeginTransaction rkmt.ExecNonQuery($"delete from pedidos where substr(pe_fecha, 1, 10) = '${fechaHoy}'"$) - rkmt.ExecNonQuery($"insert into pedidos (pe_folio, pe_desc, pe_costo_sin, pe_ruta, pe_cedis, pe_costo_tot, pe_costou, pe_cant, pe_pronombre, pe_proid, pe_cliente, pe_fecha, pe_usuario, pe_envio_ok,pe_cantc,pe_bcajas) select * from skmt1.pedido where substr(pe_fecha, 1, 10) = '${fechaHoy}'"$) + rkmt.ExecNonQuery($"insert into pedidos (pe_folio, pe_desc, pe_costo_sin, pe_ruta, pe_cedis, pe_costo_tot, pe_costou, pe_cant, pe_pronombre, pe_proid, pe_cliente, pe_fecha, pe_usuario, pe_envio_ok,pe_cantc,pe_bcajas,PE_IMPRESO) select * from skmt1.pedido where substr(pe_fecha, 1, 10) = '${fechaHoy}'"$) rkmt.TransactionSuccessful 'Si no se pone TransactionSuccessful no se escribe NADA!! rkmt.EndTransaction ' Log(((DateTime.Now - inicio)/1000) & " segs") diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index 2100f9d..d9adfd1 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -101,7 +101,8 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(Value)) DateTime.TimeFormat = "HHmmss" STIME=DateTime.Time(DateTime.Now) - Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito + + Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito(Value) s=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS FROM HIST_STAY_STORE WHERE HSS_IN = 0 AND HSS_CODIGO In (select cuenta from cuentaa)") s.Position = 0 If s.GetString("CUANTOS") = 1 Then diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index 9e72daefcce47ae057a324e717f40fcfe1efb204..0ff3acbad42271b641e15a1408e87645ff73d9a8 100644 GIT binary patch delta 115 zcmaF0k@3|=#tqw8C3EuA^WzOIjVgdxFRLJ(kAZ;!B$m7RJgc+xWDjMd%`S@187CK* ziA=Uv=49M4xn9+9bCoiZ(EH8xsuD~v6-;VOlN(eGCim+&Og-W(ELzj|pc0 diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 42526e866bc3bdcd2171f4fc99131885e090d246..fb3d9b3b1bc60ee4a5a0830bc79ac41fa9d98365 100644 GIT binary patch delta 2528 zcmajh?N3`(90%}w?%Kuzr5)>JtUxPImgfS6f`c(shEu0qC-aG|a~nh4q)=cgo0j>& z!`Niw7v0`C7ft%YWQ66yB1m|c|AXe`OIK_|HY?*;INI42?d*@-8jT1?8rO863HL@LCkBrX zMEbSA#4oB|dpc1Y4o16s=tomWmW5M$^~}_y5`FyUW+8@Xz|tQR+@x~YIMO+Ibj883 zl_P^=8;6nOWN+tqlp~YF$ln3ZV(;W|ab$yYz`5&=Dem=x;sHMf&I9Lz3&4eJ<3x*~ z{&BFEZCpUH?pWe#N}!<>Tm~)&SAZ+oK8`AmYN)RP`@yx~IvziHMged=xB>hGco(=4 z+yveYZU*mp;Fz4t7HD`9{1o_Ua4UE(xDEUacpvy#@NK~Y`?zXE<0{2KUma0mD>_y{-*J}NEeUrxarvhcviz{kNSz@6Ze z;4ZeY7~fUqq7u*Mqg8RV(;6d;i@H+{|^s{&u8r}mB zfzN`^f!}9;z#;GCF!(&%xXKUN#?^nsHtx#D3a=33wtvD6hDX4o>@kjUjtd+{=LxoP z(2HziH_X=lOx-VRazkC;rJHOwg{aqlOZVD+sj_8#2j7rb(c9CN#_b!n_-(m4qCw@_ z>KaS3ugtagl>&R-hTa|$OCFI=zVAYG z`P(>o7sEV?tSi*(tP62bL^BIPd(kHSWX?U>x$LCI#U?tn%)>$7zZc`eORnXh-MdNO zV*U67OL0-6=ag)cQ>y3uu^bm=dQRCUIpuoJ$<@ZJ3T~CNY^`L-=`@QJS@hABJKM{v zxYDdIGQC~CbM@BIJqs~>*+>W3Xa6eQkSDh4ecdVHgLOo6VK^CmNIQK delta 1933 zcmajg%TE(Q90%~7V$~uo6^epD3oS)nrT78?E4}~~Q67pSDB>F*pdhHI6nr2D)R3Qg zGkR)blpxs$u`rF;=u7>JJu6nXM=OVx!?_84|pRu54>sGUgf)P zhQb!`R`51(KDYo}2;L6f0p1BNk|b|n^}C=@4Bidi112s9*V zKllK+5_}L`1+E4k0v`s~fR89vzQ6JbYL&*ckAjbZkAqLJwg3E+Z0+ZFihY_>$2kK& z3qA+-o`*&~xB+|td=cCTZUSEdH-lTim#6GiXL^MjS2?YmYvAi_Z8bO8+A7=F+Uk`z zsJ*#%a0mD%`xfUm=MG1^w^QP6OdIqr7qs0iT5bs`7V=l)b0IS1w$P+d`I|LX$Z2s) z9xPHfRYL?#j5(;bFPHMhE%K|r!UYuC6|9REl+j%$Vz`<>^^J>Jrg0nf4uo;PO3JmT zP{Zpi5v$ed-hfFLBWR>6lb*aV$o4ncLRcx@7fua+kJ-voRd%fqWp6gb3hMAVsl6hY ze)@k28+S{i_Q3?RZFaZP9Gi%vRiDbJ_nnWb{1*B?IlhmjgZ2f?nk9^NvAA7jbUKug>tMJTr|-e;Y#O=di4lX>&jWAmX!m|;F>+^@2n*H e(`}-X&-wF?>;C_^?)k?xkbA6vo_#U#l>Y()tl}R4 diff --git a/B4A/Files/productos.png b/B4A/Files/productos.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae13d9d57b30b941b7263ff8f6285eb0f82722f GIT binary patch literal 6577 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 K#`T6?iT?%N(02#` literal 0 HcmV?d00001 diff --git a/B4A/Files/resdia.bal b/B4A/Files/resdia.bal index c548eeaea440061f4aedf0f7dc628726c000fd59..44e6f569f7dfa14e4c4ca8cc69de4141585cb159 100644 GIT binary patch literal 47837 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 literal 44790 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 diff --git a/B4A/MAPA_RUTAS.bas b/B4A/MAPA_RUTAS.bas index 6687d0c..df9f9bd 100644 --- a/B4A/MAPA_RUTAS.bas +++ b/B4A/MAPA_RUTAS.bas @@ -156,7 +156,7 @@ Sub MapFragment1_Ready '''''''----------------------------MARKER AZUL - POR VISITAR If azul = 1 Or todos = 1 Then c.IsInitialized - c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_NOMBRE,CAT_CL_LAT,CAT_CL_LONG from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_LAT <> ' ' and CAT_CL_LONG <> ' ' and CAT_CL_CODIGO <> 0 and CAT_CL_CODIGO <> 1") + c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_NOMBRE,CAT_CL_LAT,CAT_CL_LONG from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_LAT <> ' ' and CAT_CL_LONG <> ' ' and CAT_CL_CODIGO <> 0 and CAT_CL_CODIGO <> 1 AND CAT_CL_CODIGO NOT LIKE '%N%'") ' skmt.Initialize(ruta,"kmt.db", True) Log($"============== Resultados = ${c.RowCount}"$) If c.RowCount > 0 Then @@ -275,7 +275,7 @@ Sub OnInfoWindowClickListener1_click(Marker1 As Marker) skmt.ExecNonQuery("delete from CUENTAA") skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?) ", Array As Object(Marker1.Title)) Activity.Finish - Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito + Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito(Marker1.Title) B4XPages.ShowPage("Cliente") End Sub diff --git a/B4A/MAZAPA.b4a b/B4A/MAZAPA.b4a index 11c9e27..1bc90ec 100644 --- a/B4A/MAZAPA.b4a +++ b/B4A/MAZAPA.b4a @@ -44,26 +44,27 @@ File47=proditem1.bal File48=proditem2.bal File49=productos.bal File5=bus-ar.png -File50=profina.jpg -File51=PROFINA.png -File52=promociones.bal -File53=resdia.bal -File54=ResDia.jpg -File55=resdia20.png -File56=resumendia.jpg -File57=salma.jpg -File58=salma.png -File59=scrollpromos.bal +File50=productos.png +File51=profina.jpg +File52=PROFINA.png +File53=promociones.bal +File54=resdia.bal +File55=ResDia.jpg +File56=resdia20.png +File57=resumendia.jpg +File58=salma.jpg +File59=salma.png File6=carrito.png -File60=senial.jpg -File61=sync.png -File62=tache_rojo.png -File63=Ticket dia.jpg -File64=ticketdia20.jpg -File65=ticketdia20.png -File66=ticketsdia.bal -File67=Tiendita.jpg -File68=verde.png +File60=scrollpromos.bal +File61=senial.jpg +File62=sync.png +File63=tache_rojo.png +File64=Ticket dia.jpg +File65=ticketdia20.jpg +File66=ticketdia20.png +File67=ticketsdia.bal +File68=Tiendita.jpg +File69=verde.png File7=celltitle.bal File8=cliente.bal File9=clientes.bal @@ -132,6 +133,7 @@ FileGroup65=Default Group FileGroup66=Default Group FileGroup67=Default Group FileGroup68=Default Group +FileGroup69=Default Group FileGroup7=Default Group FileGroup8=Default Group FileGroup9=Default Group @@ -201,7 +203,7 @@ Module6=C_Clientes Module7=C_Cuestionario Module8=C_Historico Module9=C_Mapas -NumberOfFiles=68 +NumberOfFiles=69 NumberOfLibraries=33 NumberOfModules=31 Version=12.8 @@ -209,7 +211,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: mazapa #VersionCode: 1 - #VersionName: 4.12.16 + #VersionName: 5.01.05_S/G 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MAZAPA.b4a.meta b/B4A/MAZAPA.b4a.meta index 3842615..3a3c240 100644 --- a/B4A/MAZAPA.b4a.meta +++ b/B4A/MAZAPA.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,Class_Globals,0,0,C_Productos,b_prodMas_Click,670,0,Subs,actualizaProducto,807,0,Subs,actualizaProducto2,850,0,Subs,guardaProductoSinGestion,786,0,Subs,guardaProductoSinGestion2,832,0,Main,Activity_Create,32,0,C_Cliente,b_ventaabordo_Click,2412,0,C_Cliente,B4XPage_Appear,498,0,C_Cliente,GPS_LocationChanged,528,0 +NavigationStack=C_Principal,Subir_Click,725,0,Subs,traeRuta2,726,0,C_Cliente,GUADAVENTA2,1034,0,C_Cliente,b_acred_Click,833,0,C_Cliente,Guardar_Click,768,0,C_Cliente,GuardaVenta,961,0,C_Cliente,imprime_venta,1810,0,C_Cliente,B_IMP_Click,1190,2,C_Cliente,B4XPage_Appear,513,2,C_Cliente,GPS_LocationChanged,541,0 SelectedBuild=0 -VisibleModules=29,1,2,14,5,12,3,6,7,8,30,15 +VisibleModules=29,1,14,2,12,3,6,7,8,26,15,10,11,5,30,17,4,22,19 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 4c2c027..cb56f72 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -914,9 +914,10 @@ Sub traeTotalClientepreventa As Double Return sumaTotal End Sub -Sub traeTotalClientepreventaparacredito As Double - Private sumaTotal As Double - Private cursorprueba As Cursor = B4XPages.MainPage.skmt.ExecQuery2("Select PE_COSTO_TOT from pedido where PE_FOLIO = ? AND PE_CLIENTE <> 0 AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)", Array As String ("PREVENTA_24")) +Sub traeTotalClientepreventaparacredito(clientepedido As String) As Double + Private sumaTotal As Double = 0 + LogColor(clientepedido,Colors.Red) + Private cursorprueba As Cursor = B4XPages.MainPage.skmt.ExecQuery2("Select PE_COSTO_TOT from pedido where PE_CLIENTE = ? and PE_IMPRESO IS NOT NULL", Array As String(clientepedido)) For i= 0 To cursorprueba.RowCount -1 cursorprueba.Position = i ' LogColor(cursorprueba.GetString("PE_COSTO_TOT"),Colors.Red) @@ -1460,7 +1461,8 @@ Sub borraPedidoClienteActual As String For i=0 To thisC.RowCount -1 thisC.Position = i ' Log(thisC.GetString("PE_TIPO") & "|" & traeTablaProds(thisC.GetString("PE_TIPO"))) - Starter.skmt.ExecNonQuery($"update ${traeTablaProds(thisC.GetString("PE_FOLIO"))} set cat_gp_almacen = cat_gp_almacen + ${thisC.GetString("PE_CANT")} where cat_gp_id = '${thisC.GetString("PE_PROID")}'"$) + Starter.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${thisC.GetString("PE_CANT")} where cat_gp_id = '${thisC.GetString("PE_PROID")}'"$) + Starter.skmt.ExecNonQuery($"update CAT_GUNAPROD2 set cat_gp_almacen = cat_gp_almacen + ${thisC.GetString("PE_CANT")} where cat_gp_id = '${thisC.GetString("PE_PROID")}'"$) LogColor($"update ${traeTablaProds(thisC.GetString("PE_FOLIO"))} set cat_gp_almacen = cat_gp_almacen + ${thisC.GetString("PE_CANT")} where cat_gp_id = '${thisC.GetString("PE_PROID")}'"$, Colors.red) ' Starter.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1)) Next