mirror of
https://github.com/KeymonSoft/Salma_Venta.git
synced 2026-04-20 06:09:25 +00:00
-VERSION 5.07.05.1
- Se cambo el tipoVenta de DISTRIBUCION a PREVENTA. - Se corrigio codigo de promos.
This commit is contained in:
33
B4A/Subs.bas
33
B4A/Subs.bas
@@ -737,7 +737,7 @@ Sub borraPedidoClienteActual As String
|
||||
' End If
|
||||
' B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
|
||||
' 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)")
|
||||
' B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
|
||||
' Return 1
|
||||
Private thisC As Cursor
|
||||
' Private tablaProds As String = "cat_gunaprod2"
|
||||
@@ -753,7 +753,7 @@ Sub borraPedidoClienteActual As String
|
||||
End If
|
||||
Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
|
||||
Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
|
||||
Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
|
||||
Starter.skmt.ExecNonQuery("UPDATE kmt_info3 set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
|
||||
Return 1
|
||||
End Sub
|
||||
|
||||
@@ -779,7 +779,7 @@ End Sub
|
||||
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}'"$)
|
||||
c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info3 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
|
||||
@@ -863,6 +863,7 @@ End Sub
|
||||
|
||||
Sub guardaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String)
|
||||
LogColor("guardaProducto: "&prodId&", cant="&cant&" - TV:"&tipoVenta, Colors.Magenta)
|
||||
If tipoVenta = "DISTRIBUCION" Then tipoVenta = "PREVENTA"
|
||||
Private c As Cursor
|
||||
B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, traeRutaBitacora, precioSin, tipoVenta))
|
||||
B4XPages.MainPage.skmt.ExecNonQuery2($"update ${traeTablaProds(traeTipoVentaDeBD)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId))
|
||||
@@ -1560,7 +1561,7 @@ Sub revisaPromoProcterPRO3009(prodsMap1 As Map)
|
||||
If invRegalo > 0 Then
|
||||
Log("Hay inventario para regalo")
|
||||
If totalRegalos = 0 Then
|
||||
guardaProducto("PRO3009", 1, 1, traeProdNombre(idRegalo), idRegalo, traeCliente, traeFecha, traeUsuarioDeBD, traeRuta, 0, B4XPages.MainPage.tipo_venta)
|
||||
guardaProducto("PRO3009", 1, 1, traeProdNombre(idRegalo), idRegalo, traeCliente, traeFecha, traeUsuarioDeBD, traeRuta, 0, traeTipoVentaDeBD)
|
||||
' ToastMessageShow("Agregamos regalo", False)
|
||||
Private cs As CSBuilder
|
||||
cs.Initialize
|
||||
@@ -1795,6 +1796,7 @@ End Sub
|
||||
'Si "gestion=2" entonces el sistema considera que el pedido ya se guardó y ya no se debe modificar.
|
||||
Sub guardaProductoSinGestion(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String)
|
||||
If nombre.Length < 6 Then ToastMessageShow("(guardaProductoSinGestion) El nombre del producto no es valido " & nombre, True)
|
||||
if tipoVenta = "DISTRIBUCION" then tipoVenta = "PREVENTA"
|
||||
precioSin = NumberFormat2(precioSin, 1, 2, 2, False)
|
||||
costoU = NumberFormat2(costoU, 1, 2, 2, False)
|
||||
' LogColor("guardaProductoSinGestion: "&prodId&", cant="&cant&", tipo="&tipoVenta, Colors.Magenta)
|
||||
@@ -1820,7 +1822,7 @@ Sub traeTablaProds(tipoventa As String) As String
|
||||
|
||||
tablaProds = "cat_gunaprod" 'Salma solo maneja Preventa.
|
||||
|
||||
' LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0))
|
||||
LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0))
|
||||
Return tablaProds
|
||||
End Sub
|
||||
|
||||
@@ -1841,13 +1843,16 @@ End Sub
|
||||
'Trae el tipo de venta (VENTA o PREVENTA) desde CAT_VARIABLES, o "PREVENTA" por default.
|
||||
Sub traeTipoVentaDeBD As String
|
||||
Private tipoVenta As String = "PREVENTA"
|
||||
Private r As ResultSet = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'TIPO_VENTA' ")
|
||||
Do While r.NextRow
|
||||
tipoVenta = r.GetString("CAT_VA_VALOR").As(String).ToUpperCase
|
||||
Loop
|
||||
If Starter.idCliente = "0" Then
|
||||
tipoVenta = "ABORDO"
|
||||
End If
|
||||
' Private r As ResultSet = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'TIPO_VENTA' ")
|
||||
' Do While r.NextRow
|
||||
' tipoVenta = r.GetString("CAT_VA_VALOR").As(String).ToUpperCase
|
||||
' Loop
|
||||
' If Starter.idCliente = "0" Then
|
||||
' tipoVenta = "ABORDO"
|
||||
' End If
|
||||
|
||||
tipoVenta = "PREVENTA" ' Salma solo usa PREVENTA
|
||||
|
||||
' Log(">>>>>>> " & tipoVenta)
|
||||
Return tipoVenta
|
||||
End Sub
|
||||
@@ -1946,7 +1951,7 @@ End Sub
|
||||
Sub traeinventario(id As String) As String
|
||||
Dim c As Cursor
|
||||
Dim inventario As String = "0"
|
||||
c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ALMACEN from ${traeTablaProds(B4XPages.MainPage.tipo_venta)} where CAT_GP_ID = '${id}'"$)
|
||||
c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ALMACEN from ${traeTablaProds(traeTipoVentaDeBD)} where CAT_GP_ID = '${id}'"$)
|
||||
' Log($"select CAT_GP_ALMACEN from ${Starter.tabla} where CAT_GP_NOMBRE = '${id}'"$)
|
||||
If c.RowCount > 0 Then
|
||||
c.Position = 0
|
||||
@@ -2039,7 +2044,7 @@ Sub traePromo(promo As String, cliente As String) As Map
|
||||
Else
|
||||
promoMap.Put("resultado", "No hay datos de la promoción.")
|
||||
End If
|
||||
c = B4XPages.MainPage.skmt.ExecQuery2($"Select CAT_GP_STS, CAT_GP_IMP1, CAT_GP_NOMBRE from ${Starter.tabla} where CAT_GP_ID = ?"$,Array As String(promo)) 'Obtenemos las piezas requeridas de productos variables para la promoción.
|
||||
c = B4XPages.MainPage.skmt.ExecQuery2($"Select CAT_GP_STS, CAT_GP_IMP1, CAT_GP_NOMBRE from ${traeTablaProds(traeTipoVentaDeBD)} where CAT_GP_ID = ?"$,Array As String(promo)) 'Obtenemos las piezas requeridas de productos variables para la promoción.
|
||||
c.Position = 0
|
||||
Private pvr As String = 0
|
||||
Private pvr2 As String = 0
|
||||
|
||||
Reference in New Issue
Block a user