JSOTO QA G6 (.250): arreglos CG/Activos/Repuestos/Informatica, DBDATE, imagenes de reportes y cgprrp008
Programas (bugs encontrados en las pruebas funcionales en la .250): - acprmt004/acprmt005: MIN/MAX sobre la fecha real (no sobre texto CONVERT 103); acprmt004 alinea rowid. - cgprrp008: lee cgtb00004 (no la copia cgtb00004_tmp del 14-mar-2026) y solo regenera cgtb00016 cuando se corre sin filtro de cuenta. - cgprrp014: CONSTRUCT con los nombres de campo del form (cod_sp_sc). - cgfmrp013: defaultValue del combo = cgprrp012.4rp. - cgprrp022/edprrp029: salida getPreviewDevice() en lugar de SVG fijo. - edprrp080: no consume numero ED con afecta = NO. - cgprmt004/022/037, segprmt0001: sin CONNECT "IFMX" (-6366); EXTERIOR via cross-DB. - irprcs001: agrega CONNECT; irprmt021: columna idestado; irprmt066: la anulacion sin MaintainX ya no se deshace (-255); otrodir/bodegas: rama '2' llena origen y destino. - teprmt001: ajustes G6. Despliegue G6: - DBDATE=dmy4 en config/Application.xcf, config/Main_prg.xcf, resources/Application.xcf y en el grupo MODULOS del .4pw (los programas lanzados por el menu heredan el entorno). - 31 .4rp: IMAGEBOX con rutas absolutas file:///E:|F:|C: -> relativas IMAGENES/...; se agregan IMAGENES/LOGO.JPG y genero_logo.png. - Paquete mbs: incluye bin/*.4rp y bin/IMAGENES (antes el GAR no llevaba los reportes). - resources/TopMenu.4st (irprcs008 daba -8014); bin/cgprcs024.4rp. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -76,7 +76,7 @@ MAIN
|
||||
CALL ARG_VAL(3) RETURNING impresor
|
||||
# LET usuarios = "jsoto"
|
||||
# LET clave = "1234"
|
||||
CONNECT TO "marmotech" AS "IFMX" USER usuarios USING clave
|
||||
# CONNECT TO "marmotech" AS "IFMX" USER usuarios USING clave -- G6: -6366; EXTERIOR se lee cross-DB (exterior.dbo.*)
|
||||
CONNECT TO "smarmotech" AS "MSSQL" USER usuarios USING clave
|
||||
SELECT a.* INTO p_compania.* FROM companias a
|
||||
|
||||
@@ -126,6 +126,7 @@ FUNCTION cgpcad004()
|
||||
fecha1, fecha2 DATE,
|
||||
|
||||
pdescripcion CHAR(30)
|
||||
DEFINE l_sql STRING, l_cnt INTEGER -- G6: SQL dinamico cross-DB a EXTERIOR
|
||||
|
||||
LET hoy = TODAY
|
||||
LABEL vuelve:
|
||||
@@ -199,17 +200,18 @@ FUNCTION cgpcad004()
|
||||
CALL transac.clear()
|
||||
END IF
|
||||
IF cheques = "ED" THEN
|
||||
SET CONNECTION "IFMX"
|
||||
-- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
|
||||
INPUT BY NAME xentrada
|
||||
AFTER FIELD xentrada
|
||||
IF xentrada IS NULL THEN
|
||||
CALL msg(16)
|
||||
NEXT FIELD xentrada
|
||||
END IF
|
||||
SELECT DISTINCT a.ref
|
||||
FROM cgtb00004 a
|
||||
WHERE a.ref = xentrada AND a.status_t IS NULL
|
||||
IF STATUS = NOTFOUND THEN
|
||||
LET l_sql = "SELECT COUNT(*) FROM exterior.dbo.cgtb00004 a",
|
||||
" WHERE a.ref = ? AND a.status_t IS NULL"
|
||||
PREPARE p_ex_ed FROM l_sql
|
||||
EXECUTE p_ex_ed USING xentrada INTO l_cnt
|
||||
IF l_cnt = 0 OR l_cnt IS NULL THEN
|
||||
CALL msg(3)
|
||||
NEXT FIELD xentrada
|
||||
END IF
|
||||
@@ -219,19 +221,14 @@ FUNCTION cgpcad004()
|
||||
LET INT_FLAG = FALSE
|
||||
EXIT INPUT
|
||||
ELSE
|
||||
DECLARE busca_entrada1 CURSOR FOR
|
||||
SELECT A.CUENTA_NO,
|
||||
c.DEPARTAMENTO,
|
||||
SUM(c.DEBITO),
|
||||
SUM(c.CREDITO)
|
||||
FROM cgtb00001 a, cgtb00004 c
|
||||
WHERE a.cuenta_no = c.cuenta_no
|
||||
AND c.status_t IS NULL
|
||||
AND c.ref = xentrada
|
||||
GROUP BY A.CUENTA_NO, c.DEPARTAMENTO
|
||||
LET l_sql = "SELECT a.cuenta_no, c.departamento, SUM(c.debito), SUM(c.credito)",
|
||||
" FROM exterior.dbo.cgtb00001 a, exterior.dbo.cgtb00004 c",
|
||||
" WHERE a.cuenta_no = c.cuenta_no AND c.status_t IS NULL AND c.ref = ?",
|
||||
" GROUP BY a.cuenta_no, c.departamento"
|
||||
DECLARE busca_entrada1 CURSOR FROM l_sql
|
||||
|
||||
LET idx = 1
|
||||
FOREACH busca_entrada1
|
||||
FOREACH busca_entrada1 USING xentrada
|
||||
INTO transac[idx].cuenta,
|
||||
transac[idx].departamento,
|
||||
transac[idx].debito,
|
||||
@@ -244,15 +241,16 @@ FUNCTION cgpcad004()
|
||||
END IF
|
||||
|
||||
IF cheques = "CK" THEN
|
||||
SET CONNECTION "IFMX"
|
||||
-- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
|
||||
INPUT BY NAME fecha1, fecha2, pcuenta_no
|
||||
AFTER FIELD pcuenta_no
|
||||
SELECT a.descripcion
|
||||
INTO pdescripcion
|
||||
FROM cgtb00001 a
|
||||
WHERE a.cuenta_no = pcuenta_no AND a.status_t IS NULL
|
||||
LET l_sql = "SELECT a.descripcion FROM exterior.dbo.cgtb00001 a",
|
||||
" WHERE a.cuenta_no = ? AND a.status_t IS NULL"
|
||||
PREPARE p_ex_ck FROM l_sql
|
||||
LET pdescripcion = NULL
|
||||
EXECUTE p_ex_ck USING pcuenta_no INTO pdescripcion
|
||||
|
||||
IF STATUS = NOTFOUND THEN
|
||||
IF pdescripcion IS NULL THEN
|
||||
CALL msg(3)
|
||||
NEXT FIELD pcuenta_no
|
||||
END IF
|
||||
@@ -262,18 +260,15 @@ FUNCTION cgpcad004()
|
||||
EXIT INPUT
|
||||
END INPUT
|
||||
|
||||
DECLARE busca_cheques CURSOR FOR
|
||||
SELECT A.CUENTA_NO, c.DEPARTAMENTO, SUM(c.DEBITO), SUM(c.CREDITO)
|
||||
FROM cgtb00001 a, cgtb00004 c
|
||||
WHERE a.cuenta_no = c.cuenta_no
|
||||
AND c.status_t IS NULL
|
||||
AND c.fecha BETWEEN fecha1 AND fecha2
|
||||
AND detalles = pcuenta_no
|
||||
GROUP BY A.CUENTA_NO, c.DEPARTAMENTO
|
||||
ORDER BY a.cuenta_no
|
||||
LET l_sql = "SELECT a.cuenta_no, c.departamento, SUM(c.debito), SUM(c.credito)",
|
||||
" FROM exterior.dbo.cgtb00001 a, exterior.dbo.cgtb00004 c",
|
||||
" WHERE a.cuenta_no = c.cuenta_no AND c.status_t IS NULL",
|
||||
" AND c.fecha BETWEEN ? AND ? AND c.detalles = ?",
|
||||
" GROUP BY a.cuenta_no, c.departamento ORDER BY a.cuenta_no"
|
||||
DECLARE busca_cheques CURSOR FROM l_sql
|
||||
|
||||
LET idx = 1
|
||||
FOREACH busca_cheques
|
||||
FOREACH busca_cheques USING fecha1, fecha2, pcuenta_no
|
||||
INTO transac[idx].cuenta,
|
||||
transac[idx].departamento,
|
||||
transac[idx].debito,
|
||||
@@ -283,7 +278,7 @@ FUNCTION cgpcad004()
|
||||
|
||||
END IF
|
||||
IF cheques = "CP" THEN
|
||||
SET CONNECTION "IFMX"
|
||||
-- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
|
||||
INPUT BY NAME pcod_sp, fecha1, fecha2
|
||||
AFTER FIELD pcod_sp
|
||||
IF pcod_sp IS NULL THEN
|
||||
@@ -291,12 +286,10 @@ FUNCTION cgpcad004()
|
||||
NEXT FIELD pcod_sp
|
||||
END IF
|
||||
AFTER FIELD fecha2
|
||||
SELECT COUNT(*)
|
||||
INTO registros
|
||||
FROM cptb00003 a
|
||||
WHERE a.fecha BETWEEN fecha1 AND fecha2
|
||||
AND a.cod_sp = pcod_sp
|
||||
AND a.status_t IS NULL
|
||||
LET l_sql = "SELECT COUNT(*) FROM exterior.dbo.cptb00003 a",
|
||||
" WHERE a.fecha BETWEEN ? AND ? AND a.cod_sp = ? AND a.status_t IS NULL"
|
||||
PREPARE p_ex_cxp FROM l_sql
|
||||
EXECUTE p_ex_cxp USING fecha1, fecha2, pcod_sp INTO registros
|
||||
|
||||
IF registros < 0 OR registros IS NULL THEN
|
||||
CALL msg(3)
|
||||
@@ -306,27 +299,15 @@ FUNCTION cgpcad004()
|
||||
EXIT INPUT
|
||||
END INPUT
|
||||
|
||||
DECLARE busca_cxp CURSOR FOR
|
||||
SELECT A.CUENTA_NO,
|
||||
a.DEPARTAMENTO,
|
||||
a.cod_aux,
|
||||
a.cod_sec,
|
||||
a.num_doc,
|
||||
SUM(a.DEBITO),
|
||||
SUM(a.CREDITO)
|
||||
FROM cptb00003 a
|
||||
WHERE a.status_t IS NULL
|
||||
AND a.cod_sp = pcod_sp
|
||||
AND a.fecha BETWEEN fecha1 AND fecha2
|
||||
GROUP BY A.CUENTA_NO,
|
||||
a.DEPARTAMENTO,
|
||||
a.cod_aux,
|
||||
a.cod_Sec,
|
||||
a.num_doc
|
||||
ORDER BY a.num_doc DESC, 6 DESC, 2
|
||||
LET l_sql = "SELECT a.cuenta_no, a.departamento, a.cod_aux, a.cod_sec, a.num_doc,",
|
||||
" SUM(a.debito), SUM(a.credito) FROM exterior.dbo.cptb00003 a",
|
||||
" WHERE a.status_t IS NULL AND a.cod_sp = ? AND a.fecha BETWEEN ? AND ?",
|
||||
" GROUP BY a.cuenta_no, a.departamento, a.cod_aux, a.cod_sec, a.num_doc",
|
||||
" ORDER BY a.num_doc DESC, 6 DESC, 2"
|
||||
DECLARE busca_cxp CURSOR FROM l_sql
|
||||
|
||||
LET idx = 1
|
||||
FOREACH busca_cxp
|
||||
FOREACH busca_cxp USING pcod_sp, fecha1, fecha2
|
||||
INTO transac[idx].cuenta,
|
||||
transac[idx].departamento,
|
||||
transac[idx].cod_aux,
|
||||
@@ -711,18 +692,22 @@ FUNCTION cgpcad004()
|
||||
END IF
|
||||
|
||||
LET r_filename = "cgprmt004.4rp"
|
||||
LET r_output = "SVG"
|
||||
-- G6: el visor SVG (GRV) solo existe en GDC; en el navegador (GBC) se cuelga -> PDF
|
||||
LET r_output = getPreviewDevice()
|
||||
#LET preview = 1
|
||||
|
||||
-- configure report engine; the functions prefixed fgl that are called here are part of the GRW API
|
||||
IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
|
||||
CALL fgl_report_selectDevice(r_output) -- changing default
|
||||
IF preview = 0 THEN
|
||||
IF r_output <> "SVG" THEN
|
||||
CALL fgl_report_selectPreview(1)
|
||||
ELSE IF preview = 0 THEN
|
||||
CALL fgl_report_selectPreview(1) -- changing default
|
||||
CALL fgl_report_configureSVGPreview("PrintOnDefaultPrinter")
|
||||
ELSE
|
||||
CALL fgl_report_selectPreview(preview)
|
||||
END IF
|
||||
END IF
|
||||
|
||||
LET handler = fgl_report_commitCurrentSettings() -- commit changes
|
||||
ELSE
|
||||
@@ -896,11 +881,12 @@ FUNCTION cgpcmf004()
|
||||
END IF
|
||||
|
||||
LET selec =
|
||||
"SELECT DISTINCT CONVERT(char(10),a.fecha,103),a.ref,a.tipo,a.detalle_1,a.detalle_2 ",
|
||||
-- G6: sin CONVERT(char(10),fecha,103): el texto dd/mm/aaaa no entra en un DATE (-1205)
|
||||
"SELECT DISTINCT a.fecha,a.ref,a.tipo,a.detalle_1,a.detalle_2 ",
|
||||
"FROM cgtb00004 a ",
|
||||
"WHERE ",
|
||||
criterio CLIPPED,
|
||||
" AND a.tipo IN(1,3) ORDER BY CONVERT(char(10),a.fecha,103),a.ref"
|
||||
" AND a.tipo IN(1,3) ORDER BY a.fecha,a.ref"
|
||||
DISPLAY "seleccion: ", selec
|
||||
PREPARE busca FROM selec
|
||||
DECLARE datos SCROLL CURSOR FOR busca
|
||||
@@ -1684,21 +1670,21 @@ FUNCTION cheques1()
|
||||
debito DEC(12, 2),
|
||||
credito DEC(12, 2)
|
||||
END RECORD
|
||||
DEFINE l_sql STRING -- G6: SQL dinamico cross-DB a EXTERIOR
|
||||
|
||||
OPEN WINDOW cgfmwd011
|
||||
AT 15, 10
|
||||
WITH FORM "cgfmwd011"
|
||||
ATTRIBUTE(BORDER, FORM LINE FIRST + 1, COMMENT LINE LAST)
|
||||
SET CONNECTION "IFMX"
|
||||
-- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
|
||||
INPUT BY NAME kfecha1, kfecha2, kcuenta_no
|
||||
AFTER FIELD kcuenta_no
|
||||
IF kcuenta_no IS NOT NULL THEN
|
||||
SELECT a.descripcion
|
||||
INTO kdescripcion
|
||||
FROM cgtb00001 a
|
||||
WHERE a.cuenta_no = kcuenta_no
|
||||
|
||||
IF STATUS = NOTFOUND THEN
|
||||
LET l_sql = "SELECT a.descripcion FROM exterior.dbo.cgtb00001 a WHERE a.cuenta_no = ?"
|
||||
PREPARE p_ex_cta FROM l_sql
|
||||
LET kdescripcion = NULL
|
||||
EXECUTE p_ex_cta USING kcuenta_no INTO kdescripcion
|
||||
IF kdescripcion IS NULL THEN
|
||||
CALL msg(3)
|
||||
NEXT FIELD kcuenta_no
|
||||
END IF
|
||||
@@ -1715,22 +1701,15 @@ FUNCTION cheques1()
|
||||
END IF
|
||||
END INPUT
|
||||
|
||||
DECLARE busca_ex CURSOR FOR
|
||||
SELECT A.CUENTA_NO,
|
||||
A.DESCRIPCION,
|
||||
c.DEPARTAMENTO,
|
||||
SUM(c.DEBITO),
|
||||
SUM(c.CREDITO)
|
||||
FROM cgtb00001 a, cgtb00004 c
|
||||
WHERE a.cuenta_no = c.cuenta_no
|
||||
AND c.status_t IS NULL
|
||||
AND c.fecha BETWEEN kfecha1 AND kfecha2
|
||||
AND detalles = kcuenta_no
|
||||
GROUP BY A.CUENTA_NO, A.DESCRIPCION, c.DEPARTAMENTO
|
||||
ORDER BY a.cuenta_no
|
||||
LET l_sql = "SELECT a.cuenta_no, a.descripcion, c.departamento, SUM(c.debito), SUM(c.credito)",
|
||||
" FROM exterior.dbo.cgtb00001 a, exterior.dbo.cgtb00004 c",
|
||||
" WHERE a.cuenta_no = c.cuenta_no AND c.status_t IS NULL",
|
||||
" AND c.fecha BETWEEN ? AND ? AND c.detalles = ?",
|
||||
" GROUP BY a.cuenta_no, a.descripcion, c.departamento ORDER BY a.cuenta_no"
|
||||
DECLARE busca_ex CURSOR FROM l_sql
|
||||
|
||||
LET idx = 1
|
||||
FOREACH busca_ex INTO kdetalle[idx].*
|
||||
FOREACH busca_ex USING kfecha1, kfecha2, kcuenta_no INTO kdetalle[idx].*
|
||||
LET transac[idx].cuenta = kdetalle[idx].cuenta_no
|
||||
LET transac[idx].departamento = kdetalle[idx].departamento
|
||||
LET transac[idx].debito = kdetalle[idx].debito
|
||||
|
||||
Reference in New Issue
Block a user