diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index c96680f..f64f1e6 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -181,7 +181,9 @@ Private Sub B4XPage_Created (Root1 As B4XView) ' Log(ruta) skmt.Initialize(ruta,"kmt.db", True) Subs.guardaAppInfo(skmt) + skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CLIENTES_NUEVOS(CN_ID TEXT, CN_FECHA TEXT, CN_USER TEXT, CN_LAT TEXT, CN_LON TEXT, CN_NOMBRE TEXT, CN_DIRECCION TEXT, CN_FOTO TEXT, CN_ALMACEN TEXT, CN_RUTA TEXT,CN_GIRO TEXT)") + skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUOTAS (HC_META6 TEXT, HC_META5 TEXT, HC_META4 TEXT, HC_META3 TEXT, HC_META2 TEXT, HC_META1 TEXT, HC_RUTA TEXT, HC_CUOTA1 TEXT, HC_CUOTA2 TEXT, HC_CUOTA3 TEXT, HC_CUOTA4 TEXT, HC_CUOTA5 TEXT, HC_CUOTA6 TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_GPS (HGDATE TEXT, HGLAT TEXT, HGLON TEXT)") skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GIRO(GIRO TEXT)") @@ -579,9 +581,9 @@ Sub JobDone(Job As HttpJob) If Job.JobName = "DBRequest" Then Dim result As DBResult = reqManager.HandleJob(Job) If result.Tag.As(String).IndexOf("PICK_C_") > -1 Then 'query tag - Subs.logJobDoneResultados(result) - Private id As String= result.Tag - id = id.SubString(id.IndexOf("_")+3) +' Subs.logJobDoneResultados(result) + Private id As String= result.Tag + id = id.SubString(id.IndexOf("_")+3) For Each records() As Object In result.Rows Dim CUENTA As String = records(result.Columns.Get("CUENTA")) Log(CUENTA) @@ -594,7 +596,7 @@ Sub JobDone(Job As HttpJob) Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_PICKCIEGO_MARQUEZ" - cmd.Parameters = Array As Object(c.GetString("PC_ID_PROD"), c.GetString("PC_NOM_PROD"), c.GetString("PC_CANT"), c.GetString("PC_ALMACEN"), c.GetString("PC_RUTA"), c.GetString("PC_FECHA")) + cmd.Parameters = Array As Object(c.GetString("PC_ID_PROD"), c.GetString("PC_NOM_PROD"), c.GetString("PC_CANT"), c.GetString("PC_ALMACEN"), c.GetString("PC_RUTA"), c.GetString("PC_FECHA"),"VENTA") reqManager.ExecuteCommand(cmd , "ins_PC") ' Next End If @@ -604,9 +606,11 @@ Sub JobDone(Job As HttpJob) If c.RowCount > 0 Then ' For i=0 To c.RowCount -1 c.Position = 0 + Dim cmd As DBCommand cmd.Initialize cmd.Name = "update_PICKCIEGO_MARQUEZ" - cmd.Parameters = Array As Object(c.GetString("PC_CANT"), c.GetString("PC_ID_PROD"), c.GetString("PC_ALMACEN"), c.GetString("PC_RUTA"), c.GetString("PC_FECHA")) + Log("FECHA" & c.GetString("PC_FECHA")) + cmd.Parameters = Array As Object(c.GetString("PC_CANT"), c.GetString("PC_ID_PROD"), c.GetString("PC_ALMACEN"), c.GetString("PC_RUTA"), c.GetString("PC_FECHA"),"VENTA") reqManager.ExecuteCommand(cmd, "update_PC") ' Next End If @@ -1128,7 +1132,7 @@ Private Sub b_terpc_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_HIST_PICKCIEGO_MARQUEZ" ' - cmd.Parameters = Array As Object(c.GetString("PC_ID_PROD"), c.GetString("PC_ALMACEN"), c.GetString("PC_RUTA"), c.GetString("PC_FECHA")) + cmd.Parameters = Array As Object(c.GetString("PC_ID_PROD"), c.GetString("PC_ALMACEN"), c.GetString("PC_RUTA"), c.GetString("PC_FECHA"), "VENTA") reqManager.ExecuteQuery(cmd , 0, $"PICK_C_${c.GetString("PC_ID_PROD")}"$) Next End If @@ -1153,7 +1157,7 @@ Private Sub b_aceptar_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_CAT_PASS_ARQUEO_MARQUEZ" - cmd.Parameters = Array As Object(f.GetString("CAT_CL_RUTA"),a.GetString("ID_ALMACEN")) + cmd.Parameters = Array As Object(f.GetString("CAT_CL_RUTA"),a.GetString("ID_ALMACEN"),"PREVENTA") reqManager.ExecuteQuery(cmd , 0, "contrasena") f.Close a.Close diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index a3fc6cc..0a859ea 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -160,6 +160,9 @@ Sub Class_Globals Private b_cancred As Button Private b_acred As Button Private p_credito As Panel + Dim banderaimp As Int = 0 + + Dim k1,k2,k3 As String End Sub 'You can add more parameters here. @@ -238,6 +241,14 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear +' banderaimp = 0 + Guardar.Enabled = True + gest.Enabled = True + b_cxc.Enabled = True + Tar.Enabled = True + Tels.Enabled = True + b_ventaabordo.Enabled = True + HIST.Enabled = True reqManager.Initialize(Me, Starter.DBReqServer) LA_GPS.TextColor = Colors.Red LA_GPS.Text = "SIN UBICACION GPS" @@ -436,6 +447,17 @@ Sub B4XPage_Appear 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_INFO2 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 @@ -450,6 +472,9 @@ Sub B4XPage_Appear B4XPages.MainPage.recarga = "0" End If LogColor(B4XPages.MainPage.recarga,Colors.Blue) +' If banderaimp = 1 Then +' Guardar_Click +' End If End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -540,25 +565,28 @@ Private Sub B4XPage_CloseRequest As ResumableSub ' Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$) If Starter.pre_viejo = pre_act Then If (la_cuenta.Text <> "0" And la_cuenta.Text <> "1") Then - cuest.encuestaIniciada = False - cuest.ocultPanelPregunta - If IsNumber(l_total.text) And Not(Subs.pedidoGuardado) Then - LogColor("Hay Venta", Colors.Red) - Private resultado1 As Int = Msgbox2($"Va salir sin haber guardado la venta, si continua, la venta se BORRARA.${CRLF}${CRLF}¿Esta seguro que desea continuar?"$, "SE VA A BORRAR LA VENTA", "Borrar Venta", "Guardar Venta", "", LoadBitmap(File.DirAssets,"alert2.png")) - If resultado1 = DialogResponse.POSITIVE Then - Log("Borrra venta") - Subs.borraPedidoClienteActual - ToastMessageShow("Venta Borrada", False) + If banderaimp = 1 Then + Else + cuest.encuestaIniciada = False + cuest.ocultPanelPregunta + If IsNumber(l_total.text) And Not(Subs.pedidoGuardado) Then + LogColor("Hay Venta", Colors.Red) + Private resultado1 As Int = Msgbox2($"Va salir sin haber guardado la venta, si continua, la venta se BORRARA.${CRLF}${CRLF}¿Esta seguro que desea continuar?"$, "SE VA A BORRAR LA VENTA", "Borrar Venta", "Guardar Venta", "", LoadBitmap(File.DirAssets,"alert2.png")) + If resultado1 = DialogResponse.POSITIVE Then + Log("Borrra venta") + Subs.borraPedidoClienteActual + ToastMessageShow("Venta Borrada", False) ' venimosDeTicketsDia = False - B4XPages.ShowPage("Principal") - else if resultado1=DialogResponse.CANCEL Then - Log("Pedido guardado") - Guardar_Click - ToastMessageShow("Venta Guardada", False) + B4XPages.ShowPage("Principal") + else if resultado1=DialogResponse.CANCEL Then + Log("Pedido guardado") + Guardar_Click + ToastMessageShow("Venta Guardada", False) + End If End If - End If ' venimosDeTicketsDia = False B4XPages.ShowPage("Clientes") + End If ' Else If la_cuenta.Text = "1" Then ' If B4XPages.MainPage.recarga = "1" Then ' B4XPages.ShowPage("login") @@ -601,40 +629,7 @@ Sub Guardar_Click - If pre_act <> Starter.pre_viejo Then - - - 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 = True - 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_info2 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 - GuardaVenta - End If - - - Else If Credi.GetString("CAT_CL_BCREDITO") = "0" Then - GuardaVenta - End If - Else - Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO2 INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_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" And credi2.GetString ("a_abono")=credi2.GetString ("SALDO_PENDIENTE") Then + If l_total.Text <> "null" Then If pre_act <> Starter.pre_viejo Then Msgbox2Async("La venta es a credito?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) @@ -654,13 +649,55 @@ Sub Guardar_Click Else GuardaVenta End If + + Else If pre_act = Starter.pre_viejo Then GuardaVenta End If + Else If l_total.Text = "null" Then + GuardaVenta + End If + + + Else If Credi.GetString("CAT_CL_BCREDITO") = "0" Then + GuardaVenta + End If + Else + Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO2 INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_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" And credi2.GetString ("a_abono")=credi2.GetString ("SALDO_PENDIENTE") Then + If l_total.Text <> "null" Then + If pre_act <> Starter.pre_viejo Then + 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 = True + 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_info2 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 + GuardaVenta + End If + Else If l_total.Text = "null" Then + GuardaVenta + End If Else GuardaVenta End If + Else + GuardaVenta End If End If ' Credi.Close @@ -679,6 +716,10 @@ Private Sub b_acred_Click usuario = c2.GetString("USUARIO") c2.Close Dim limitcred As Cursor + DateTime.DateFormat = "MM/dd/yyyy" + DateTime.TimeFormat = "HH:mm:ss" + sDate = DateTime.Date(DateTime.Now) + sTime = DateTime.Time(DateTime.Now) 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_info2 WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") limitcred.Position = 0 l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO") @@ -730,6 +771,27 @@ Private Sub b_cancred_Click End Sub Sub GuardaVenta + If pre_act <> Starter.pre_viejo Then + 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 pre_act = Starter.pre_viejo Then + If banderaimp = 1 Then + B_IMP_Click + Else + GUADAVENTA2 + End If + + End If +End Sub + +Sub GUADAVENTA2 Log(B4XPages.MainPage.recarga) If B4XPages.MainPage.recarga = "0" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -788,6 +850,14 @@ Sub GuardaVenta B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize B4XPages.MainPage.promos.promosMap.Initialize + Guardar.Enabled = True + gest.Enabled = True + b_cxc.Enabled = True + Tar.Enabled = True + Tels.Enabled = True + b_ventaabordo.Enabled = True + HIST.Enabled = True + banderaimp = 0 B4XPages.ShowPage("Principal") Else If B4XPages.MainPage.recarga = "1" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -939,7 +1009,7 @@ Sub B_IMP_Click End Sub Sub t1_tick - s = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ?",Array As String("PREVENTA")) + s = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)",Array As String("PREVENTA")) If s.RowCount > 0 Then imprime_preventa End If @@ -990,7 +1060,7 @@ Sub imprime_preventa End If TAMANO = 0 - ESPACIO = 21 + ESPACIO = 22 BLANCO = " " ' Dim bmp As Bitmap ' bmp.InitializeResize(File.DirAssets, "mariana.jpg", 192, 250, True) 'ignore @@ -1030,7 +1100,7 @@ Sub imprime_preventa Printer1.WriteString("------------------------------" & CRLF) ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. - s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA")) + s=skmt.ExecQuery2("select PE_BCAJAS,PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA")) If S.RowCount>0 Then For i=0 To S.RowCount -1 S.Position=i @@ -1039,125 +1109,224 @@ Sub imprime_preventa Else - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - LogColor(s.GetLong("L_CANT"),Colors.Magenta) - LogColor(s.GetLong("L_COSTOU"),Colors.Magenta) - LogColor(s.GetLong("L_COSTO_TOT"),Colors.Magenta) - TAMANO = s.GetLong("L_CANT") + TAMANO + If s.GetString("PE_BCAJAS") = 0 Then + - If s.GetLong("L_COSTOU") = 1 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 - Else If s.GetLong("L_COSTOU") = 2 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 - Else If s.GetLong("L_COSTOU") = 3 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 - Else If s.GetLong("L_COSTOU") = 4 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 - Else - TAMANO = s.GetLong("L_COSTOU") + TAMANO - End If + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) +' TAMANO = s.GetLong("L_CANT") + TAMANO +' If s.GetLong("L_COSTOU") = 1 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 +' Else If s.GetLong("L_COSTOU") = 2 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 3 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 +' Else If s.GetLong("L_COSTOU") = 4 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTOU") + TAMANO +' End If +' +' If s.GetLong("L_COSTO_TOT") = 1 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 +' Else If s.GetLong("L_COSTO_TOT") = 2 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 3 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 +' Else If s.GetLong("L_COSTO_TOT") = 4 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO +' End If +' +' ESPACIO = ESPACIO - TAMANO +' +' For E=0 To ESPACIO -1 +' BLANCO = " " & BLANCO +' Next +' Printer1.Justify = 0 +' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) +' Printer1.Justify = 1 +' Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) +' Printer1.Justify = 2 +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) + 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 + BLANCO = " " + ESPACIO = ESPACIO - TAMANO + ESPACIO = ESPACIO / 2 + For E=0 To ESPACIO -1 + BLANCO = " " & BLANCO + Next - If s.GetLong("L_COSTO_TOT") = 1 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 - Else If s.GetLong("L_COSTO_TOT") = 2 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 - Else If s.GetLong("L_COSTO_TOT") = 3 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 - Else If s.GetLong("L_COSTO_TOT") = 4 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 + Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + + TAMANO = 0 + ESPACIO = 30 + BLANCO = " " +' Printer1.Justify = 0 Else - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) +' TAMANO = s.GetLong("L_CANT") + TAMANO +' If s.GetLong("L_COSTOU") = 1 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 +' Else If s.GetLong("L_COSTOU") = 2 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 3 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 +' Else If s.GetLong("L_COSTOU") = 4 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTOU") + TAMANO +' End If +' +' If s.GetLong("L_COSTO_TOT") = 1 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 +' Else If s.GetLong("L_COSTO_TOT") = 2 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 3 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 +' Else If s.GetLong("L_COSTO_TOT") = 4 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO +' End If +' +' ESPACIO = ESPACIO - TAMANO +' +' For E=0 To ESPACIO -1 +' BLANCO = " " & BLANCO +' Next +' Printer1.Justify = 0 +' Printer1.Justify = 0 +' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) +' Printer1.Justify = 1 +' Printer1.WriteString((s.GETSTRING("PE_COSTOU")/s.GETSTRING("PE_CANT"))& BLANCO) +' Printer1.Justify = 2 +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' TAMANO = 0 +' ESPACIO = 22 +' BLANCO = " " + + + 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 + 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 ) + + TAMANO = 0 + ESPACIO = 30 + BLANCO = " " +' Printer1.Justify = 0 + + End If - - ESPACIO = ESPACIO - TAMANO - - For E=0 To ESPACIO -1 - BLANCO = " " & BLANCO - Next - Printer1.Justify = 0 - Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) - Printer1.Justify = 1 - Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) - Printer1.Justify = 2 - Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) - TAMANO = 0 - ESPACIO = 21 - BLANCO = " " End If Next End If - Printer1.Justify = 0 +' Printer1.Justify = 0 s.Close Printer1.WriteString(" " & CRLF) - s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("PREVENTA")) - If S.RowCount>0 Then + s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("PREVENTA")) + If s.RowCount>0 Then Printer1.WriteString("-------PROMOS PREVENTA--------" & CRLF) Printer1.WriteString("Cant. Precio Importe" & CRLF) Printer1.WriteString("------------------------------" & CRLF) For i=0 To S.RowCount -1 - S.Position=i + s.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - + Printer1.WriteString("* "& s.GetString("PE_PRONOMBRE") & CRLF) + Log("promo") Else - +' TAMANO = 0 Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - TAMANO = s.GetLong("L_CANT") + TAMANO - If s.GetLong("L_COSTOU") = 1 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 - Else If s.GetLong("L_COSTOU") = 2 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 - Else If s.GetLong("L_COSTOU") = 3 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 - Else If s.GetLong("L_COSTOU") = 4 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 - Else - TAMANO = s.GetLong("L_COSTOU") + TAMANO - End If +' TAMANO = s.GetLong("L_CANT") + TAMANO +' If s.GetLong("L_COSTOU") = 1 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 2 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 3 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 +' Else If s.GetLong("L_COSTOU") = 4 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTOU") + TAMANO +' End If +' +' If s.GetLong("L_COSTO_TOT") = 1 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 2 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 3 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 +' Else If s.GetLong("L_COSTO_TOT") = 4 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO +' End If +' +' ESPACIO = ESPACIO - TAMANO +' +' For E=0 To ESPACIO -1 +' BLANCO = " " & BLANCO +' Next +'' Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' Printer1.Justify = 0 +' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) +' Printer1.Justify = 1 +' Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) +' Printer1.Justify = 2 +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' TAMANO = 0 +' ESPACIO = 22 +' BLANCO = " " - If s.GetLong("L_COSTO_TOT") = 1 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 - Else If s.GetLong("L_COSTO_TOT") = 2 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 - Else If s.GetLong("L_COSTO_TOT") = 3 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 - Else If s.GetLong("L_COSTO_TOT") = 4 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 - Else - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO - End If - + 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 + BLANCO = " " ESPACIO = ESPACIO - TAMANO - + ESPACIO = ESPACIO / 2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next -' Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) - Printer1.Justify = 0 - Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) - Printer1.Justify = 1 - Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) - Printer1.Justify = 2 - Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) + + Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + TAMANO = 0 - ESPACIO = 21 + ESPACIO = 30 BLANCO = " " +' Printer1.Justify = 0 End If Next Printer1.WriteString(" " & CRLF) End If s.Close - Printer1.Justify = 0 +' Printer1.Justify = 0 s=skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As String("PREVENTA")) s.Position =0 ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If - Printer1.WriteString("Total preventa: $" & s.GetString("TOTAL") & CRLF) + Printer1.WriteString("Total preventa: $" & NumberFormat( s.GetString("TOTAL"),0,2) & CRLF) s.Close c= skmt.ExecQuery2("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_FOLIO = ?", Array As String("PREVENTA")) C.Position=0 - Printer1.WriteString("Total articulos preventa: " & c.GetString("PC_NOART") & CRLF) + Printer1.WriteString("Total art. preventa: " &NumberFormat( c.GetString("PC_NOART"),0,0) & CRLF) + c.Close ' Printer1.WriteString(" " & CRLF) @@ -1194,6 +1363,16 @@ Sub imprime_preventa Printer1.DisConnect ProgressDialogHide + + + Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + B_IMP_Click + Else + GUADAVENTA2 + End If + ' printer.Flush ' printer.Close End Sub @@ -1242,7 +1421,7 @@ Sub imprime_venta End If TAMANO = 0 - ESPACIO = 21 + ESPACIO = 22 BLANCO = " " ' Dim bmp As Bitmap ' bmp.InitializeResize(File.DirAssets, "mariana.jpg", 192, 250, True) 'ignore @@ -1282,7 +1461,7 @@ Sub imprime_venta Printer1.WriteString("------------------------------" & CRLF) ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. - s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("VENTA")) + s=skmt.ExecQuery2("select PE_BCAJAS, PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("VENTA")) If S.RowCount>0 Then For i=0 To S.RowCount -1 S.Position=i @@ -1291,121 +1470,224 @@ Sub imprime_venta Else - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - TAMANO = s.GetLong("L_CANT") + TAMANO - If s.GetLong("L_COSTOU") = 1 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 - Else If s.GetLong("L_COSTOU") = 2 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 - Else If s.GetLong("L_COSTOU") = 3 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 - Else If s.GetLong("L_COSTOU") = 4 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 - Else - TAMANO = s.GetLong("L_COSTOU") + TAMANO - End If + If s.GetString("PE_BCAJAS") = 0 Then + + + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) +' TAMANO = s.GetLong("L_CANT") + TAMANO +' If s.GetLong("L_COSTOU") = 1 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 +' Else If s.GetLong("L_COSTOU") = 2 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 3 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 +' Else If s.GetLong("L_COSTOU") = 4 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTOU") + TAMANO +' End If + ' +' If s.GetLong("L_COSTO_TOT") = 1 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 +' Else If s.GetLong("L_COSTO_TOT") = 2 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 3 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 +' Else If s.GetLong("L_COSTO_TOT") = 4 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO +' End If +' +' ESPACIO = ESPACIO - TAMANO +' +' For E=0 To ESPACIO -1 +' BLANCO = " " & BLANCO +' Next +' Printer1.Justify = 0 +' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) +' Printer1.Justify = 1 +' Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) +' Printer1.Justify = 2 +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) - If s.GetLong("L_COSTO_TOT") = 1 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 - Else If s.GetLong("L_COSTO_TOT") = 2 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 - Else If s.GetLong("L_COSTO_TOT") = 3 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 - Else If s.GetLong("L_COSTO_TOT") = 4 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 + 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 + 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 ) + + TAMANO = 0 + ESPACIO = 30 + BLANCO = " " +' Printer1.Justify = 0 Else - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) +' TAMANO = s.GetLong("L_CANT") + TAMANO +' If s.GetLong("L_COSTOU") = 1 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 +' Else If s.GetLong("L_COSTOU") = 2 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 3 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 +' Else If s.GetLong("L_COSTOU") = 4 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTOU") + TAMANO +' End If + ' +' If s.GetLong("L_COSTO_TOT") = 1 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 +' Else If s.GetLong("L_COSTO_TOT") = 2 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 3 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 +' Else If s.GetLong("L_COSTO_TOT") = 4 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO +' End If +' +' ESPACIO = ESPACIO - TAMANO +' +' For E=0 To ESPACIO -1 +' BLANCO = " " & BLANCO +' Next +' Printer1.Justify = 0 +' Printer1.Justify = 0 +' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) +' Printer1.Justify = 1 +' Printer1.WriteString((s.GETSTRING("PE_COSTOU")/s.GETSTRING("PE_CANT"))& BLANCO) +' Printer1.Justify = 2 +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' TAMANO = 0 +' ESPACIO = 22 +' BLANCO = " " + + + + 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 + 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 ) + + TAMANO = 0 + ESPACIO = 30 + BLANCO = " " +' Printer1.Justify = 0 End If - - ESPACIO = ESPACIO - TAMANO - - For E=0 To ESPACIO -1 - BLANCO = " " & BLANCO - Next - Printer1.Justify = 0 - Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) - Printer1.Justify = 1 - Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) - Printer1.Justify = 2 - Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) - TAMANO = 0 - ESPACIO = 21 - BLANCO = " " End If Next End If - Printer1.Justify = 0 +' Printer1.Justify = 0 s.Close Printer1.WriteString(" " & CRLF) - s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("VENTA")) + s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("VENTA")) If S.RowCount>0 Then Printer1.WriteString("-------PROMOS VENTA--------" & CRLF) Printer1.WriteString("Cant. Precio Importe" & CRLF) Printer1.WriteString("------------------------------" & CRLF) For i=0 To S.RowCount -1 - S.Position=i + s.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - + Printer1.WriteString("* "& s.GetString("PE_PRONOMBRE") & CRLF) + Log("promo") Else - +' TAMANO = 0 Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - TAMANO = s.GetLong("L_CANT") + TAMANO - If s.GetLong("L_COSTOU") = 1 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 - Else If s.GetLong("L_COSTOU") = 2 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 - Else If s.GetLong("L_COSTOU") = 3 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 - Else If s.GetLong("L_COSTOU") = 4 Then - TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 - Else - TAMANO = s.GetLong("L_COSTOU") + TAMANO - End If +' TAMANO = s.GetLong("L_CANT") + TAMANO +' If s.GetLong("L_COSTOU") = 1 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 2 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 +' Else If s.GetLong("L_COSTOU") = 3 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 2 +' Else If s.GetLong("L_COSTOU") = 4 Then +' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTOU") + TAMANO +' End If + ' +' If s.GetLong("L_COSTO_TOT") = 1 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 2 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 +' Else If s.GetLong("L_COSTO_TOT") = 3 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 +' Else If s.GetLong("L_COSTO_TOT") = 4 Then +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 +' Else +' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO +' End If +' +' ESPACIO = ESPACIO - TAMANO +' +' For E=0 To ESPACIO -1 +' BLANCO = " " & BLANCO +' Next + '' Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' Printer1.Justify = 0 +' Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) +' Printer1.Justify = 1 +' Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) +' Printer1.Justify = 2 +' Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) +' TAMANO = 0 +' ESPACIO = 22 +' BLANCO = " " - If s.GetLong("L_COSTO_TOT") = 1 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 4 - Else If s.GetLong("L_COSTO_TOT") = 2 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 3 - Else If s.GetLong("L_COSTO_TOT") = 3 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 2 - Else If s.GetLong("L_COSTO_TOT") = 4 Then - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 1 - Else - TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO - End If - + 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 + BLANCO = " " ESPACIO = ESPACIO - TAMANO - + ESPACIO = ESPACIO / 2 For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next -' Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & " $" & s.GETSTRING("PE_COSTO_TOT") & CRLF ) - Printer1.Justify = 0 - Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) - Printer1.Justify = 1 - Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) - Printer1.Justify = 2 - Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) + + Printer1.WriteString(s.GETSTRING("PE_CANT") & BLANCO & k1 & BLANCO & k2& CRLF ) + TAMANO = 0 - ESPACIO = 21 + ESPACIO = 30 BLANCO = " " +' Printer1.Justify = 0 End If Next Printer1.WriteString(" " & CRLF) End If s.Close - Printer1.Justify = 0 +' Printer1.Justify = 0 s=skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As String("VENTA")) s.Position =0 ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then ' Printer1.WriteString("Descuento: $" & (s.GetString("TOTAL2") - s.GetString("TOTAL"))) ' End If - Printer1.WriteString("Total venta: $" & s.GetString("TOTAL") & CRLF) + Printer1.WriteString("Total venta: $" & NumberFormat( s.GetString("TOTAL"),0,2) & CRLF) + s.Close c= skmt.ExecQuery2("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_FOLIO = ?", Array As String("VENTA")) C.Position=0 - Printer1.WriteString("Total articulos venta: " & c.GetString("PC_NOART") & CRLF) + Printer1.WriteString("Total art. venta: " &NumberFormat( c.GetString("PC_NOART"),0,0) & CRLF) c.Close ' Printer1.WriteString(" " & CRLF) @@ -1442,6 +1724,18 @@ Sub imprime_venta Printer1.DisConnect ProgressDialogHide + + s = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)",Array As String("PREVENTA")) + If s.RowCount = 0 Then + Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + B_IMP_Click + Else + GUADAVENTA2 + End If + End If + ' printer.Flush ' printer.Close End Sub @@ -1639,22 +1933,22 @@ Sub mandaPendientes Dim PCNoArts As String Dim PCMonto As String If usuario <> "KMTS1" Then - c = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK = 0") - Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) - If c.RowCount > 0 Then - For i = 0 To c.RowCount - 1 - c.Position = i - Log($"${c.GetString("PC_CLIENTE")}|${c.GetString("PC_FECHA")}|${c.GetString("PC_ENVIO_OK")}|"$) - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_pedidos_MARQUEZ" - 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"), Subs.traeAlmacen, B4XPages.MainPage.principal.l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) - PCNoArts = c.GetString("PC_NOART") - PCMonto = c.GetString("PC_MONTO") -' sql.insert_pedidos_INTMEX=INSERT INTO INTMEX.PEDIDO_CLIENTE(PC_FECHA_SINC,PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_IDALMACEN, PC_RUTA, PC_COSTO_SIN, PC_FACTURA) VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?)) - reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) - Next - End If +' c = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK = 0") +' Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) +' If c.RowCount > 0 Then +' For i = 0 To c.RowCount - 1 +' c.Position = i +' Log($"${c.GetString("PC_CLIENTE")}|${c.GetString("PC_FECHA")}|${c.GetString("PC_ENVIO_OK")}|"$) +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_pedidos_MARQUEZ" +' 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"), Subs.traeAlmacen, B4XPages.MainPage.principal.l_ruta.text, c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA")) +' PCNoArts = c.GetString("PC_NOART") +' PCMonto = c.GetString("PC_MONTO") +'' sql.insert_pedidos_INTMEX=INSERT INTO INTMEX.PEDIDO_CLIENTE(PC_FECHA_SINC,PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_IDALMACEN, PC_RUTA, PC_COSTO_SIN, PC_FACTURA) VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?)) +' reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) +' Next +' End If 'PEDIDO (Pendientes) c = skmt.ExecQuery($"SELECT PE_ENVIO_OK, 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_ENVIO_OK <> 1"$) @@ -1664,7 +1958,7 @@ Sub mandaPendientes c.Position=i Dim cmd As DBCommand cmd.Initialize - cmd.Name = "insert_pedido2_MARQUEZ" + cmd.Name = "insert_pedido2_MARQUEZP3" cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"),C.GetString("PE_CANTC"),c.GetString("PE_BCAJAS")) 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}"$) @@ -1950,24 +2244,24 @@ Sub JobDone(Job As HttpJob) End If End If - If Job.JobName = "DBRequest" Then - Dim resultado As DBResult = reqManager.HandleJob(Job) - If resultado.Tag.As(String).IndexOf("ins_pedidosPendientes_prods_") > -1 Then - Subs.logJobDoneResultados(resultado) - Private cliente As String= resultado.Tag - cliente = cliente.SubString(cliente.IndexOf("_")+25) - Log($"Cliente2:${cliente}"$) - For Each records() As Object In resultado.Rows -' If records(resultado.Columns.Get("AffectedRows")).As(Int) = 1 Then Log(">>>>>>>> GUARDADO") - Private pars() As String = Regex.Split("_", resultado.tag) - B4XPages.MainPage.skmt.ExecNonQuery($"update PEDIDO set PE_ENVIO_OK = 1 where PE_CLIENTE = '${pars(3)}' and PE_PROID = '${pars(4)}' and PE_ENVIO_OK = 0"$) -' Log($"update PEDIDO set PE_ENVIO_OK = 1 where PE_CLIENTE = '${pars(3)}' and PE_PROID = '${pars(4)}' and PE_ENVIO_OK = 0"$) -' For Each k As String In resultado.Columns.Keys -' Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k))) -' Next - Next - End If - End If +' If Job.JobName = "DBRequest" Then +' Dim resultado As DBResult = reqManager.HandleJob(Job) +' If resultado.Tag.As(String).IndexOf("ins_pedidosPendientes_prods_") > -1 Then +' Subs.logJobDoneResultados(resultado) +' Private cliente As String= resultado.Tag +' cliente = cliente.SubString(cliente.IndexOf("_")+25) +' Log($"Cliente2:${cliente}"$) +' For Each records() As Object In resultado.Rows +'' If records(resultado.Columns.Get("AffectedRows")).As(Int) = 1 Then Log(">>>>>>>> GUARDADO") +' Private pars() As String = Regex.Split("_", resultado.tag) +' B4XPages.MainPage.skmt.ExecNonQuery($"update PEDIDO set PE_ENVIO_OK = 1 where PE_CLIENTE = '${pars(3)}' and PE_PROID = '${pars(4)}' and PE_ENVIO_OK = 0"$) +'' Log($"update PEDIDO set PE_ENVIO_OK = 1 where PE_CLIENTE = '${pars(3)}' and PE_PROID = '${pars(4)}' and PE_ENVIO_OK = 0"$) +'' For Each k As String In resultado.Columns.Keys +'' Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k))) +'' Next +' Next +' End If +' End If 'ABONOS PENDIENTES If Job.JobName = "DBRequest" Then @@ -2034,20 +2328,19 @@ Private Sub p_abono_Click End Sub Private Sub b_abono_Click - p_abono.Visible = False +' p_abono.Visible = False If et_abono.text > l_montoabonostotal.text Then MsgboxAsync("El monto a abonar no puede ser mayor que el monto total","Atención" ) Else - If et_abono.Text <> "" Then - Msgbox2Async($"¿Seguro que quieres realizar un abono de $${et_abono.text} para este cliente?"$, "Guardar Abono", "Guardar", "Cancelar", "", Null, True) - Wait For Msgbox_Result (resultado As Int) - If resultado = DialogResponse.POSITIVE Then - skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) - ToastMessageShow("Abono guardado", False) + If et_abono.Text <> "" Then + Msgbox2Async($"¿Seguro que quieres realizar un abono de $${et_abono.text} para este cliente?"$, "Guardar Abono", "Guardar", "Cancelar", "", Null, True) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + imprime_pagare + End If End If End If - End If - et_abono.Text = "" + ime.HideKeyboard End Sub @@ -2122,7 +2415,7 @@ Sub cuest_preguntaContestada(m As Map) DateTime.DateFormat = "dd/MM/yyyy" DateTime.TimeFormat = "HH:mm:ss" Starter.skmt.ExecNonQuery($"delete from CUESTIONARIO where Q_IDCLIENTE = '${Subs.traeCliente}' and Q_IDPREGUNTA = '${m.Get("idPregunta")}'"$) - Starter.skmt.ExecNonQuery($"insert into CUESTIONARIO (Q_RUTA, Q_ALMACEN, Q_IDCLIENTE, Q_IDPREGUNTA, Q_PREGUNTA, Q_IDRESPUESTA, Q_RESPUESTA, Q_FECHA) values ('${Subs.traeRuta}', '${Subs.traeAlmacen}', '${Subs.traeCliente}', '${m.Get("idPregunta")}', '${m.Get("pregunta")}', '${m.Get("idRespuesta")}', '${m.Get("respuesta")}', '${DateTime.Date(DateTime.now)} ${DateTime.time(DateTime.now)}')"$) + Starter.skmt.ExecNonQuery($"insert into CUESTIONARIO (Q_RUTA, Q_ALMACEN, Q_IDCLIENTE, Q_IDPREGUNTA, Q_PREGUNTA, Q_IDRESPUESTA, Q_RESPUESTA, Q_FECHA) values ('${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeAlmacen}', '${Subs.traeCliente}', '${m.Get("idPregunta")}', '${m.Get("pregunta")}', '${m.Get("idRespuesta")}', '${m.Get("respuesta")}', '${DateTime.Date(DateTime.now)} ${DateTime.time(DateTime.now)}')"$) Select Case m.Get("idPregunta") Case "1" If m.Get("respuesta") = "No, está enrejado o no se tiene acceso" Then @@ -2227,8 +2520,112 @@ Private Sub b_ventaabordo_Click Else If c.RowCount = 0 Then - MsgboxAsync("No puedes hacer venta porque no tienes inventario abordo","Atención") + MsgboxAsync("No puedes hacer venta porque no tienes inventario abordo","Atención") End If +End Sub + +Sub imprime_pagare + c=skmt.ExecQuery("select USUARIO from usuarioa") + c.Position=0 + usuario = c.GetString("USUARIO") + DateTime.DateFormat = "MM/dd/yyyy" + DateTime.TimeFormat = "HH:mm:ss" + sDate=DateTime.Date(DateTime.Now) + sTime=DateTime.Time(DateTime.Now) + c.Close + + ProgressDialogShow("Imprimiendo, un momento ...") + Printer1.DisConnect + If Not(Printer1.IsConnected) Then + Log("Conectando a impresora ...") + Printer1.Connect + Private cont As Int = 0 + Do While Not(impresoraConectada) + Sleep(1000) + Log("++++++ " & cont) + cont = cont + 1 + If cont = 2 Then Printer1.Connect 'Tratamos de reconectar + If cont > 3 Then impresoraConectada = True + Loop + Sleep(500) + impresoraConectada = False + Else + Log("conectando 2") + Printer1.Connect + Private cont As Int = 0 + Do While Not(impresoraConectada) Or Not(Printer1.IsConnected) + Sleep(1000) + Log("****** " & cont) + cont = cont + 1 + If cont = 2 Then Printer1.Connect + If cont > 3 Then impresoraConectada = True + Loop + Sleep(500) + impresoraConectada = False + End If + + TAMANO = 0 + ESPACIO = 22 + BLANCO = " " + + Printer1.WriteString("Marquez Distribuciones" & CRLF) +' Printer1.WriteString(sucursal & CRLF) + Printer1.WriteString(sDate & CRLF) + Printer1.WriteString(sTime & CRLF) + Printer1.WriteString("Vendedor:" & usuario & CRLF) + Printer1.WriteString("Tienda: " & La_nombre.Text & CRLF) + Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & CRLF) + Printer1.WriteString("Calle: " & la_Calle.Text & CRLF) + Printer1.WriteString("Colonia: " & la_col.Text & CRLF) + Printer1.WriteString(" " & CRLF) + Dim notaabono As String + c = Starter.skmt.ExecQuery("SELECT NOTA FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") + If c.RowCount > 0 Then + c.Position = 0 + notaabono = c.GetString("NOTA") + End If + Printer1.WriteString("Comprobante de pago del pagare" & CRLF) + Printer1.WriteString("con folio: " & notaabono & CRLF) + Printer1.WriteString("por el monto: " &(NumberFormat(et_abono.Text,0,2)) & CRLF) + Printer1.WriteString("el dia: " & sDate & CRLF) + + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + + Printer1.WriteString("------------------------------" & CRLF) + Printer1.WriteString("-------------FIRMA------------" & CRLF) + + Printer1.WriteString(" " & CRLF) + Printer1.WriteString(" " & CRLF) + Sleep(1000) + Printer1.DisConnect + + ProgressDialogHide + + + Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False) + Wait For Msgbox_Result (resultado As Int) + If resultado = DialogResponse.POSITIVE Then + imprime_pagare + Else + p_abono.Visible = False + + skmt.ExecNonQuery($"INSERT INTO ABONOS(a_usuario, a_ruta, a_cliente, a_abono, a_fecha) VALUES ('${Subs.traeUsuarioDeBD}', '${Subs.traeRuta(Subs.traeCliente)}', '${Subs.traeCliente}' ,'${et_abono.text}', '${Subs.fechaKMT(DateTime.now)}')"$) + ToastMessageShow("Abono guardado", False) + et_abono.Text = "" + End If + +' printer.Flush + ' printer.Close +End Sub + +Private Sub b_cxc_LongClick +' imprime_pagare End Sub \ No newline at end of file diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index 5b0ec58..e2b1058 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -38,6 +38,7 @@ Sub Class_Globals Private CHECK As Int Private l_baseodia As Label + Private CREDITO As Label End Sub 'You can add more parameters here. @@ -75,7 +76,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 CAT_CL_CODIGO"$) + 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"$) ListView1.Clear lfila.Text = "NOMBRE" @@ -89,7 +90,21 @@ Sub B4XPage_Appear Else cxc.Visible = True End If - d.Close + + + d = B4XPages.MainPage.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info WHERE CAT_CL_CODIGO = '${c.GetString("CAT_CL_CODIGO")}'"$) +' LogColor(d.RowCount,Colors.Blue) + If d.RowCount > 0 Then + d.Position = 0 + If d.GetString("CAT_CL_BCREDITO") = "1" Then + CREDITO.Visible = True + Else + CREDITO.Visible = False + End If + d.Close + Else + CREDITO.Visible = False + End If Next If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -187,7 +202,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_NOMBRE "$, 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"} order by CAT_CL_CODIGO "$, Array As String(q_buscar,q_buscar,q_buscar)) ListView1.Clear lfila.text = "Nombre y Calle" @@ -201,7 +216,22 @@ Sub BUSCA_TextChanged (Old As String, New As String) Else cxc.Visible = True End If - d.Close + + + d = B4XPages.MainPage.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info WHERE CAT_CL_CODIGO = '${c2.GetString("CAT_CL_CODIGO")}'"$) +' LogColor(d.RowCount,Colors.Blue) + If d.RowCount > 0 Then + d.Position = 0 +' LogColor(d.GetString("CAT_CL_BCREDITO"),Colors.Blue) + If d.GetString("CAT_CL_BCREDITO") = "1" Then + CREDITO.Visible = True + Else + CREDITO.Visible = False + End If + d.Close + Else + CREDITO.Visible = False + End If Next @@ -223,7 +253,7 @@ Sub BUSCA_TextChanged (Old As String, New As String) c2.Close Else If CHECK = 1 Then q_buscar = "%" & busca.Text & "%" - c2=B4XPages.MainPage.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info2 where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 order by CAT_CL_NOMBRE ", 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_info2 where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 order by CAT_CL_CODIGO ", Array As String(q_buscar,q_buscar,q_buscar)) ListView1.Clear lfila.text = "Nombre y Calle" @@ -237,7 +267,20 @@ Sub BUSCA_TextChanged (Old As String, New As String) Else cxc.Visible = True End If - d.Close + d = B4XPages.MainPage.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info2 WHERE CAT_CL_CODIGO = '${c2.GetString("CAT_CL_CODIGO")}'"$) +' LogColor(d.RowCount,Colors.Blue) + If d.RowCount > 0 Then + d.Position = 0 + LogColor(d.GetString("CAT_CL_BCREDITO"),Colors.Blue) + If d.GetString("CAT_CL_BCREDITO") = "1" Then + CREDITO.Visible = True + Else + CREDITO.Visible = False + End If + d.Close + Else + CREDITO.Visible = False + End If Next @@ -383,7 +426,22 @@ Private Sub b_buscar_Click Else cxc.Visible = True End If - d.Close + + d = B4XPages.MainPage.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info2 WHERE CAT_CL_CODIGO = '${c.GetString("CAT_CL_CODIGO")}'"$) +' LogColor(d.RowCount,Colors.Blue) + If d.RowCount > 0 Then + d.Position = 0 + LogColor(d.GetString("CAT_CL_BCREDITO"),Colors.Blue) + If d.GetString("CAT_CL_BCREDITO") = "1" Then + CREDITO.Visible = True + + Else + CREDITO.Visible = False + End If + d.Close + Else + CREDITO.Visible = False + End If Next If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -422,7 +480,21 @@ Private Sub b_buscar_Click Else cxc.Visible = True End If - d.Close + + d = B4XPages.MainPage.skmt.ExecQuery($"select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info WHERE CAT_CL_CODIGO = '${c.GetString("CAT_CL_CODIGO")}'"$) +' LogColor(d.RowCount,Colors.Blue) + If d.RowCount > 0 Then + d.Position = 0 + LogColor(d.GetString("CAT_CL_BCREDITO"),Colors.Blue) + If d.GetString("CAT_CL_BCREDITO") = "1" Then + CREDITO.Visible = True + Else + CREDITO.Visible = False + End If + d.Close + Else + CREDITO.Visible = False + End If Next If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -442,4 +514,4 @@ Private Sub b_buscar_Click entro = "4" End If -End Sub \ No newline at end of file +End Sub diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index db27b32..4f7ed2c 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -146,7 +146,7 @@ Sub mandaPendientesnoventa Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_noventa_MARQUEZ" - cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"), C.GetString("NV_FECHA"), C.GetString("NV_USER"), C.GetString("NV_MOTIVO"), C.GetString("NV_COMM"), C.GetString("NV_LAT"), C.GetString("NV_LON"), Subs.traeAlmacen, Subs.traeRuta) + cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"), C.GetString("NV_FECHA"), C.GetString("NV_USER"), C.GetString("NV_MOTIVO"), C.GetString("NV_COMM"), C.GetString("NV_LAT"), C.GetString("NV_LON"), Subs.traeAlmacen, Subs.traeRuta(C.GetString("NV_CLIENTE"))) reqManager.ExecuteCommand(cmd , $"insert_noventa_${c.GetString("NV_CLIENTE")}"$) ' insert_noventa_INTMEX=INSERT INTO INTMEX.NOVENTA (NV_FECHA_SINC,NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON,NV_IDALMACEN,NV_RUTA) VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?)) Next diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 05be972..ddd9e6d 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) @@ -177,7 +177,7 @@ End Sub Sub ListView1_ItemLongClick (Position As Int, Value As Object) Log(Value) - If Not(Subs.pedidoGuardado) Then +' 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)) @@ -239,9 +239,9 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) End If B4XPage_Appear End If - Else - ToastMessageShow("Pedido guardado, NO se puede editar.",False) - 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 d5ac939..584d72f 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -45,6 +45,9 @@ Sub Class_Globals Dim giros As String Private L_Atiende As Label Private ET_Atiende As EditText + Private Label5 As Label + Private et_colonia As EditText + Private et_telefono As EditText End Sub 'You can add more parameters here. @@ -97,6 +100,8 @@ Sub B4XPage_Appear et_direccion.Text = "" E_NOMBRE.Text = "" ET_Atiende.Text = "" + et_colonia.Text = "" + et_telefono.Text = "" If Not(Starter.gps.GPSEnabled) Then ToastMessageShow("Es necesario tener el GPS encendido", True) StartActivity(Starter.gps.LocationSettingsIntent) @@ -106,13 +111,15 @@ Sub B4XPage_Appear p_nuevoCliente.Height = Root.Height p_nuevoCliente.Width = Root.Width Subs.centraEtiqueta(Label1, Root.Width) + Subs.centraEtiqueta(Label5, Root.Width) Subs.centraEtiqueta(Label2, Root.Width) Subs.centraEtiqueta(Label3, Root.Width) Subs.centraEtiqueta(l_sinUbicacion, Root.Width) Subs.centraEtiqueta(b_ubicacion, Root.Width) Subs.centraPanel(p_botones, Root.Width) E_NOMBRE.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2) - et_direccion.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2) + et_colonia.Left = Round(Root.Width/2)-(et_colonia.Width/2) + et_direccion.Left = Round(Root.Width/2)-(et_direccion.Width/2) If B4XPages.MainPage.lat_gps <> "0.0" Then GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar. l_sinUbicacion.Visible = True diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 134efc8..944d36c 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -364,6 +364,7 @@ Sub getTableColumnList(db As SQL, table As String) As String 'ignore End Sub Sub B4XPage_Appear + nvo_cliente.Enabled = False rd.respaldaPedido rd.respaldaInventarios rd.respaldaPaquetes @@ -535,6 +536,20 @@ Sub B4XPage_Appear l_rutasuplencia.Visible = True l_rutasuplencia.Text = s.GetString("RS_RUTA") + End If + s.Close + + s = B4XPages.MainPage.skmt.ExecQuery("select RUTAA FROM RUTAA") + s.Position = 0 + If s.RowCount = 0 Then + + + l_ruta.Text = 0 + + Else If s.RowCount > 0 Then + + l_ruta.Text = s.GetString("RUTAA") + End If If l_ruta.Text = "0" Then @@ -649,7 +664,7 @@ Sub Subir_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_pagares_MARQUEZ" - cmd.Parameters = Array As Object(C.GetString("PA_ALMACEN"),C.GetString("PA_RUTA"),C.GetString("PA_FECHA"),C.GetString("PA_CAPTURA"),C.GetString("PA_MONTO"),C.GetString("PA_USUARIO"),C.GetString("PA_CLIENTE") ) + cmd.Parameters = Array As Object(C.GetString("PA_ALMACEN"),Subs.traeRuta2(c.GetString("PA_CLIENTE")),C.GetString("PA_FECHA"),C.GetString("PA_CAPTURA"),C.GetString("PA_MONTO"),C.GetString("PA_USUARIO"),C.GetString("PA_CLIENTE") ) reqManager.ExecuteCommand(cmd , "ins_pagares") Next End If @@ -715,7 +730,7 @@ Sub Subir_Click cmd.Name = "insert_pedidos_MARQUEZ" 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, l_ruta.text, 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")) reqManager.ExecuteCommand(cmd , "ins_pedidos") Log(">>>>>> INSERT PEDIDO_CLIENTE") Next @@ -734,8 +749,8 @@ Sub Subir_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_pedido2_MARQUEZ" '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")&", "&C.GetString("PE_RUTA")&", "& 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"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"),C.GetString("PE_CANTC"),c.GetString("PE_BCAJAS")) + 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")) 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 @@ -757,7 +772,7 @@ Sub Subir_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_noventa_MARQUEZ" - cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, l_ruta.Text) + cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, Subs.traeRuta2(c.GetString("NV_CLIENTE"))) reqManager.ExecuteCommand(cmd , "inst_noventa") Next End If @@ -804,7 +819,7 @@ Sub Subir_Click Dim cmd As DBCommand cmd.Initialize cmd.Name ="insert_drop_MARQUEZ" - cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",ALMACEN) + cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",ALMACEN,Application.VersionName) reqManager.ExecuteCommand(cmd , "inst_noventa") img2.Visible =True PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1)) @@ -897,6 +912,8 @@ Sub cargar_Click 'c=skmt.ExecQuery("CREATE TABLE kmt_info (pr_cd_credito NUMERIC,pr_cd_nombre TEXT,pr_cd_calle TEXT,pr_cd_numero TEXT,pr_cd_num_int TEXT,pr_cd_entrecalle1 TEXT,pr_cd_entrecalle2 TEXT,pr_cd_colonia TEXT,pr_cd_poblacion TEXT,pr_cd_edo TEXT,pr_cd_cp TEXT,pr_cd_zona TEXT,pr_cf_credito NUMERIC,pr_cf_saldotot NUMERIC,pr_cf_saldooper NUMERIC,pr_cf_saldof1 NUMERIC, pr_cf_penalizacion NUMERIC)") TOPE = 0 ' NUEVOS CLIENTE + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTAA") B4XPages.MainPage.skmt.ExecNonQuery("delete from CLIENTE_NUEVO") B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info") B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2") @@ -945,7 +962,7 @@ Sub cargar_Click imei = "xxxx" cmd.Initialize cmd.Name ="insert_drop_MARQUEZ" - cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN) + cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN,Application.VersionName) reqManager.ExecuteCommand(cmd , "inst_noventa") cmd.Initialize @@ -1021,7 +1038,7 @@ Sub cargar_Click If E_RUTA2.text <> "" Then - B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text)) +' B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text)) E_RUTA2.Visible = False Panel11.Visible = False @@ -1539,7 +1556,7 @@ Sub JobDone(Job As HttpJob) ' Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV")) Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_GP_TIPOPROD")) Dim CAT_GP_INICIATIVA As Int = records(RESULT.Columns.Get("CAT_GP_INICIATIVA")) - Dim CAT_DP_PRECIO4 As Int = records(RESULT.Columns.Get("CAT_DP_PRECIO4")) + Dim CAT_DP_PRECIO4 As Float = records(RESULT.Columns.Get("CAT_DP_PRECIO4")) Dim CAT_DP_CONVERSION1 As Int = records(RESULT.Columns.Get("CAT_DP_CONVERSION1")) ' CAT_GP_INICIATIVA = 5 ' skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_DEV)) @@ -1585,7 +1602,7 @@ Sub JobDone(Job As HttpJob) ' Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV")) Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_GP_TIPOPROD")) Dim CAT_GP_INICIATIVA As Int = records(RESULT.Columns.Get("CAT_GP_INICIATIVA")) - Dim CAT_DP_PRECIO4 As Int = records(RESULT.Columns.Get("CAT_DP_PRECIO4")) + Dim CAT_DP_PRECIO4 As Float = records(RESULT.Columns.Get("CAT_DP_PRECIO4")) Dim CAT_DP_CONVERSION1 As Int = records(RESULT.Columns.Get("CAT_DP_CONVERSION1")) ' CAT_GP_INICIATIVA = 5 @@ -2036,7 +2053,8 @@ Sub connecta_Click Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_ruta_MARQUEZ" + + cmd.Name = "select_ruta_MARQUEZ8" cmd.Parameters = Array As Object(ALMACEN, e_ruta.text) ' Log($"${ALMACEN},${e_ruta.text},${imei}"$) reqManager.ExecuteQuery(cmd , 0, "ruta") @@ -2110,6 +2128,7 @@ Sub e_ruta_EnterPressed B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ABONOS") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM PICK_CIEGO") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA") + B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTAA") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM CLIENTES_NUEVOS") B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENV_MONTO_LIQ") B4XPage_Appear @@ -2238,6 +2257,32 @@ Sub B_OK_PAS_Click Resumen.Visible= True img2.Visible=False Subs.panelVisible(p_principal, 0, 0) + If E_RUTA2.Text <> "" Then + + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text)) + End If + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTAA(RUTAA) VALUES(?)",Array As String(e_ruta.Text)) + checaPedido + + Dim c12 As Cursor = Starter.skmt.ExecQuery("Select PE_PRONOMBRE, PE_PROID, PE_CANT FROM PEDIDO WHERE PE_FOLIO = 'PREVENTA'") + If c12.RowCount > 0 Then + For i = 0 To c12.RowCount - 1 + c12.Position = i + Starter.skmt.ExecNonQuery($"UPDATE CAT_GUNAPROD SET CAT_GP_ALMACEN = CAT_GP_ALMACEN - ${c12.GetString("PE_CANT")} WHERE CAT_GP_ID = '${c12.GetString("PE_PROID")}'"$) + Next + End If + c12.Close + + Dim c13 As Cursor = Starter.skmt.ExecQuery("Select PE_PRONOMBRE, PE_PROID, PE_CANT FROM PEDIDO WHERE PE_FOLIO = 'VENTA'") + If c13.RowCount > 0 Then + For i = 0 To c13.RowCount - 1 + c13.Position = i + Starter.skmt.ExecNonQuery($"UPDATE CAT_GUNAPROD2 SET CAT_GP_ALMACEN = CAT_GP_ALMACEN - ${c13.GetString("PE_CANT")} WHERE CAT_GP_ID = '${c13.GetString("PE_PROID")}'"$) + Next + End If + c13.Close + + B4XPage_Appear Else if CARGA = "CARGAR" And (S_CP.Text <> "LISTO" Or S_CC.Text <> "LISTO" Or S_CH.Text <> "LISTO") Then RES = Msgbox2("Seguro que desea abortar el proceso","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore If RES = DialogResponse.POSITIVE Then @@ -2702,3 +2747,14 @@ Private Sub iv_abordo_Click B4XPages.MainPage.tipo_venta = "ABORDO" B4XPages.ShowPage("Productos") End Sub + +Sub checaPedido + Private c As Cursor = Starter.skmt.ExecQuery("SELECT PC_CLIENTE FROM PEDIDO_CLIENTE") + If c.RowCount > 0 Then + Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 2 WHERE CAT_CL_CODIGO IN (SELECT PC_CLIENTE FROM PEDIDO_CLIENTE)") + End If + Private c As Cursor = Starter.skmt.ExecQuery("SELECT NV_CLIENTE FROM NOVENTA") + If c.RowCount > 0 Then + Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 3 WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA)") + End If +End Sub \ No newline at end of file diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index a4ebfab..b00db96 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -149,7 +149,7 @@ Sub B4XPage_Appear Starter.tabla = "CAT_GUNAPROD2" End If clienteId = Subs.traeCliente - rutaUsuario = Subs.traeRuta + rutaUsuario = Subs.traeRuta(Subs.traeCliente) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("PRIORITARIO","1")) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("ESTRATEGICO","2")) B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("COMPLEMENTARIO","3")) @@ -323,7 +323,7 @@ Sub lv_catalogos2_ItemClick (Position As Int, Value As Object) End If If Value = "PROMOS" Then LogColor("Promos", Colors.red) - c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String(Value, marca, tipo)) + c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) ) ORDER BY 1"$, Array As String(Value, marca, tipo)) Else LogColor("Catalogo", Colors.red) c2=B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD <> 'PROMOS' "$) @@ -756,6 +756,7 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) If New > 0 Then panelcajas.Visible = False Else If New = 0 Then + panelcajas.Visible = True End If @@ -800,6 +801,17 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) Log("cajas no a 0") End If lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & (Subs.traeinventario(id))).Color(0xFF017F01).Append($" $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas}"$).Popall + + If New > 0 Then + panelcajas.Visible = False + Else If New = 0 Then + If maxcajas = 0 Then + panelcajas.Visible = False + Else + panelcajas.Visible = True + End If + End If + End If End If End Sub @@ -878,7 +890,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 @@ -1003,7 +1015,7 @@ 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 +' 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)) @@ -1078,9 +1090,9 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object) End If b_terminar1_Click End If - Else - ToastMessageShow("Esta venta ya esta guardada, no se puede editar ni borrar.", False) - 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) @@ -1183,7 +1195,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In 'aqui si lo comentamos aparece la parte de cajas '' por aqui vamos a corregir ''Or clv_prods_ll.GetValue(i).As(Map).Get("almacen") < clv_prods_ll.GetValue(i).As(Map).Get("conversion") - If clv_prods_ll.GetValue(i).As(Map).Get("conversion") = "1" Or clv_prods_ll.GetValue(i).As(Map).Get("precio_caja") = "0" Then + If clv_prods_ll.GetValue(i).As(Map).Get("conversion") = "1" Or clv_prods_ll.GetValue(i).As(Map).Get("precio_caja") = "0.0" Then p_botMasMenc.Visible = False End If If clv_prods_ll.GetValue(i).As(Map).Get("almacen") < clv_prods_ll.GetValue(i).As(Map).Get("conversion") Then @@ -1219,7 +1231,7 @@ Sub Busca_TextChanged (Old As String, New As String) listaHints.Initialize Sleep(0) ' Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} where CAT_GP_NOMBRE like '%${New}%' and CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$) - Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_NOMBRE like '%${New}%' AND CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' union all select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS from ${Starter.tabla} 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_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 2"$) + Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select DISTINCT CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_NOMBRE like '%${New}%' AND CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' union all select DISTINCT CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS from ${Starter.tabla} 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_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 2"$) Log("Llamamos LlenaProdsLL") LlenaProdsLL(p) ' Do While p.NextRow diff --git a/B4A/C_Promos.bas b/B4A/C_Promos.bas index 6a4eea1..616019f 100644 --- a/B4A/C_Promos.bas +++ b/B4A/C_Promos.bas @@ -535,11 +535,11 @@ Private Sub b_terminar1_Click Log("====================================================================") For t = 0 To prodsIds.Size - 1 'Guardamos los productos fijos de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds.Get(t)) - If prodsCants.Get(t) > 0 Then Subs.guardaProductoSinGestion(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta,0,0) + If prodsCants.Get(t) > 0 Then Subs.guardaProductoSinGestion(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta(Subs.traeCliente), 0, B4XPages.MainPage.tipo_venta,0,0) Next For t = 0 To prodsIds2.Size - 1 'Guardamos los productos variables de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds2.Get(t)) - Subs.guardaProductoSinGestion(estaPromo, prodsPrecios2.Get(t), prodsCants2.Get(t), pn, prodsIds2.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta,0,0) + Subs.guardaProductoSinGestion(estaPromo, prodsPrecios2.Get(t), prodsCants2.Get(t), pn, prodsIds2.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta(Subs.traeCliente), 0, B4XPages.MainPage.tipo_venta,0,0) Next ' Log(B4XPages.MainPage.productos.prodsMap) ' For o=0 To prodsIds.Size - 1 'Ponemos los productos fijos en el mapa de la compra. @@ -564,11 +564,11 @@ Private Sub b_continuar_Click Log("====================================================================") For t = 0 To prodsIds.Size - 1 'Guardamos los productos fijos de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds.Get(t)) - Subs.guardaProductoSinGestion(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta,0,0) + Subs.guardaProductoSinGestion(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta(Subs.traeCliente), 0, B4XPages.MainPage.tipo_venta,0,0) Next For t = 0 To prodsIds2.Size - 1 'Guardamos los productos variables de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds2.Get(t)) - Subs.guardaProductoSinGestion(estaPromo, prodsPrecios2.Get(t), prodsCants2.Get(t), pn, prodsIds2.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta,0,0) + Subs.guardaProductoSinGestion(estaPromo, prodsPrecios2.Get(t), prodsCants2.Get(t), pn, prodsIds2.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta(Subs.traeCliente), 0, B4XPages.MainPage.tipo_venta,0,0) Next ' Log(B4XPages.MainPage.productos.prodsMap) ' For o=0 To prodsIds.Size - 1 'Ponemos los productos fijos en el mapa de la compra. diff --git a/B4A/C_Subs.bas b/B4A/C_Subs.bas index 1b0cc4e..aeae5f7 100644 --- a/B4A/C_Subs.bas +++ b/B4A/C_Subs.bas @@ -534,68 +534,68 @@ Sub traeRuta As String 'ignore Return r End Sub -'Mandamos los pedidos pendientes (pc_envio_ok <> 1). -Sub mandaPendientes 'ignore - Private logger As Boolean = False - 'PEDIDO_CLIENTE (Pendientes) - Private c As Cursor = db.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_envio_ok <> 1") - If logger Then Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) - Private almacen As String = traeAlmacen - Private ruta As String = traeRuta - If c.RowCount>0 Then - For i = 0 To c.RowCount - 1 - c.Position = i +''Mandamos los pedidos pendientes (pc_envio_ok <> 1). +'Sub mandaPendientes 'ignore +' Private logger As Boolean = False +' 'PEDIDO_CLIENTE (Pendientes) +' Private c As Cursor = db.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_envio_ok <> 1") +' If logger Then Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$) +' Private almacen As String = traeAlmacen +' Private ruta As String = traeRuta +' If c.RowCount>0 Then +' For i = 0 To c.RowCount - 1 +' c.Position = i +'' Dim cmd As DBCommand +'' cmd.Initialize +'' cmd.Name = "DELETE_PEDIDO_MARDS_PC" +'' cmd.Parameters = Array As Object(almacen, ruta, c.GetString("PC_CLIENTE") ) +'' reqManager.ExecuteCommand(cmd , "DEL_PC") +' ' Dim cmd As DBCommand ' cmd.Initialize -' cmd.Name = "DELETE_PEDIDO_MARDS_PC" -' cmd.Parameters = Array As Object(almacen, ruta, c.GetString("PC_CLIENTE") ) -' reqManager.ExecuteCommand(cmd , "DEL_PC") - - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_pedidos_MARQUEZ" - If logger Then Log($"${c.GetString("PC_CLIENTE")}, ${almacen}"$) - 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, ruta, C.GetString("PC_COSTO_SIN"), C.GetString("PC_FACTURA")) - reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) - Next - End If - - 'PEDIDO (Pendientes) - c=Starter.skmt.ExecQuery("SELECT PC_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM pedido_cliente left join PEDIDO where pc_cliente = pe_cliente and pc_envio_ok <> 1") - If logger Then Log($"Pedido PENDIENTE: ${c.RowCount}"$) - If c.RowCount>0 Then - For i = 0 To c.RowCount - 1 - c.Position = i - Dim cmd As DBCommand - +' cmd.Name = "insert_pedidos_MARQUEZ" +' If logger Then Log($"${c.GetString("PC_CLIENTE")}, ${almacen}"$) +' 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, ruta, C.GetString("PC_COSTO_SIN"), C.GetString("PC_FACTURA")) +' reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$) +' Next +' End If +' +' 'PEDIDO (Pendientes) +' c=Starter.skmt.ExecQuery("SELECT PC_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM pedido_cliente left join PEDIDO where pc_cliente = pe_cliente and pc_envio_ok <> 1") +' If logger Then Log($"Pedido PENDIENTE: ${c.RowCount}"$) +' If c.RowCount>0 Then +' For i = 0 To c.RowCount - 1 +' c.Position = i +' Dim cmd As DBCommand +' +'' cmd.Initialize +'' cmd.Name = "DELETE_PEDIDO_MARDS_PE" +'' cmd.Parameters = Array As Object(almacen, ruta,c.GetString("PE_CLIENTE") ) +'' reqManager.ExecuteCommand(cmd , "DEL_PE") +' ' cmd.Initialize -' cmd.Name = "DELETE_PEDIDO_MARDS_PE" -' cmd.Parameters = Array As Object(almacen, ruta,c.GetString("PE_CLIENTE") ) -' reqManager.ExecuteCommand(cmd , "DEL_PE") - - cmd.Initialize - cmd.Name = "insert_pedido2_MARQUEZ" - cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"), almacen, c.GetString("PE_COSTO_TOT"), c.GetString("PE_COSTOU"), c.GetString("PE_CANT"), c.GetString("PE_PRONOMBRE"), c.GetString("PE_PROID"), c.GetString("PE_CLIENTE"), c.GetString("PE_FECHA"), c.GetString("PE_USUARIO"), c.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"), c.GetString("PE_DESC"), c.GetString("PE_FOLIO")) - reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}"$) - Next - End If - - 'ABONOS - Dim ab As Cursor = db.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) - If logger Then Log(ab.RowCount) - If ab.RowCount > 0 Then - For i = 0 To ab.RowCount - 1 - ab.Position = i - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_abono_MARQUEZ" - cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha") ) - reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) - If logger Then Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) - Next - End If - ab.Close -End Sub +' cmd.Name = "insert_pedido2_MARQUEZ" +' cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"), almacen, c.GetString("PE_COSTO_TOT"), c.GetString("PE_COSTOU"), c.GetString("PE_CANT"), c.GetString("PE_PRONOMBRE"), c.GetString("PE_PROID"), c.GetString("PE_CLIENTE"), c.GetString("PE_FECHA"), c.GetString("PE_USUARIO"), c.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"), c.GetString("PE_DESC"), c.GetString("PE_FOLIO")) +' reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}"$) +' Next +' End If +' +' 'ABONOS +' Dim ab As Cursor = db.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$) +' If logger Then Log(ab.RowCount) +' If ab.RowCount > 0 Then +' For i = 0 To ab.RowCount - 1 +' ab.Position = i +' Dim cmd As DBCommand +' cmd.Initialize +' cmd.Name = "insert_abono_MARQUEZ" +' cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha") ) +' reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) +' If logger Then Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$) +' Next +' End If +' ab.Close +'End Sub 'Revisa si la aplicación tiene permiso para acceder a las notificaciones. Sub CheckNotificationAccess As Boolean 'ignore diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index c74da71..21b616d 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/clientes.bal b/B4A/Files/clientes.bal index a1dd544..c17c49f 100644 Binary files a/B4A/Files/clientes.bal and b/B4A/Files/clientes.bal differ diff --git a/B4A/Files/datoscliente.bal b/B4A/Files/datoscliente.bal index d122f9f..81e7a6e 100644 Binary files a/B4A/Files/datoscliente.bal and b/B4A/Files/datoscliente.bal differ diff --git a/B4A/Files/nuevocliente.bal b/B4A/Files/nuevocliente.bal index 7adcd14..37821a9 100644 Binary files a/B4A/Files/nuevocliente.bal and b/B4A/Files/nuevocliente.bal differ diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a index a5cb959..d39e486 100644 --- a/B4A/MARQUEZ.b4a +++ b/B4A/MARQUEZ.b4a @@ -194,7 +194,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Marquez #VersionCode: 1 - #VersionName: 4.08.05 + #VersionName: 4.10.19 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta index b06a1a0..20e9e78 100644 --- a/B4A/MARQUEZ.b4a.meta +++ b/B4A/MARQUEZ.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=B4XMainPage,B_Can_Monto_Click,1222,0,B4XMainPage,b_recarga_Click,1244,0,B4XMainPage,b_envioBD_Click,1226,0,B4XMainPage,b_CargarMonto_Click,1259,4,B4XMainPage,b_arqueocieego_Click,917,0,B4XMainPage,B4XPage_Created,293,0,B4XMainPage,JobDone,661,6,Diseñador Visual,login.bal,-100,6,B4XMainPage,B4XPage_CloseRequest,738,0,B4XMainPage,Class_Globals,29,0 +NavigationStack=C_Cliente,b_abono1_Click,2340,0,C_Cliente,b_cancelar_Click,2337,0,C_Cliente,b_abono_Click,2325,0,C_Cliente,b_cxc_LongClick,2616,1,C_Cliente,imprime_pagare,2579,6,Main,Globals,24,0,Main,Activity_Create,31,0,C_Cliente,MODS,0,0,Diseñador Visual,cliente.bal,-100,6,C_Cliente,Guardar_Click,688,6 SelectedBuild=0 VisibleModules=1,2,13,4,7,8,9,10,14,28 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 35bee40..8beddcd 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -708,10 +708,24 @@ Sub totalPedido As String End Sub 'Regresa la ruta actual de la base de datos. -Sub traeRuta As String 'ignore +Sub traeRuta (cliente As String) As String 'ignore Private c As Cursor Private r As String - c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}' UNION ALL select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO = '${cliente}'"$) + r = "0" + If c.RowCount > 0 Then + c.Position=0 + r = c.GetString("CAT_CL_RUTA") + End If + c.Close + Return r +End Sub + +'Regresa la ruta actual de la base de datos. +Sub traeRuta2 (cliente As String) As String 'ignore + Private c As Cursor + Private r As String + c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}' UNION ALL select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO = '${cliente}'"$) r = "0" If c.RowCount > 0 Then c.Position=0