jsoto/MBS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.40.251:3000/jsoto/MBS

Browse Source
This commit is contained in:
jsoto
2026-08-28 08:48:12 -04:00
parent 7f975157a5 b7877d7c07
commit c4169453ce
4 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROYECTO/codir/coprmt010.4gl
+1 -1
View File
@@ -178,7 +178,7 @@ FUNCTION copcmf010()
COMMAND "Escoger"
"<Esc> Actualiza Registro <Delete> Cancela Operacion"
IF paises.status_t != "E" THEN
IF paises.status_t = "E" THEN
LET numero_msg = 36
CALL msg(numero_msg)
RETURN
PROYECTO/codir/coprmt016.4gl
+12 -2
View File
@@ -191,7 +191,16 @@ FUNCTION insertData()
BEGIN WORK
INSERT INTO cotb00024
INSERT INTO cotb00024 (
term_sp,
descrip_term,
descrip_ting,
status_t,
us_crea,
fech_crea,
us_mod,
fech_mod,
dias)
VALUES (pagos.term_sp,
pagos.descrip_term,
pagos.descrip_ting,
@@ -199,7 +208,8 @@ FUNCTION insertData()
usuarios, -- us_crea
pagos.fech_crea, -- fech_crea
NULL, -- us_mod
NULL) -- fech_mod
NULL, -- fech_mod
NULL) -- dias (no se captura en esta pantalla)
CALL integridad()
PROYECTO/codir/coprmt025.4gl
+27 -10
View File
@@ -35,7 +35,10 @@ DEFINE xusername,xsmtphost,xsmtpport,xpassword STRING,
toEmail, orden_trabajo, answer_workorder, descrip_depto STRING, depto INT
DEFINE data RECORD
-- Debe coincidir exactamente (mismos campos, mismo orden) con el RECORD
-- "data" del parametro de ApiMaintainC() en otrodir/api_test.4gl: el
-- enlazador exige la misma aridad en todos los llamadores.
DEFINE data RECORD
area_sp VARCHAR(10),
ciu_sp VARCHAR(30),
cod_pais VARCHAR(3),
@@ -43,6 +46,7 @@ DEFINE data RECORD
cod_sp_sec SMALLINT,
cont_sp VARCHAR(30),
contactID INTEGER,
cuenta_no VARCHAR(10),
dir_sp VARCHAR(60),
email VARCHAR(60),
fax_sp VARCHAR(25),
@@ -50,14 +54,18 @@ DEFINE data RECORD
fech_mod DATETIME YEAR TO FRACTION,
id_maintainx INTEGER,
nom_sp VARCHAR(41),
rnc VARCHAR(11),
status_t VARCHAR(1),
tel_sp VARCHAR(25),
term_sp SMALLINT,
tipo_doc VARCHAR(10),
us_crea VARCHAR(50),
us_mod VARCHAR(50)
END RECORD
DEFINE container RECORD
DEFINE p_reportfile STRING
DEFINE container RECORD
tipo_inv STRING,
cod_n INT,
cod_grupo INT,
@@ -110,7 +118,8 @@ FUNCTION coprmt025()
END FUNCTION
FUNCTION copcad025()
DEFINE tiene_Dato CHAR(2), answer STRING
DEFINE tiene_Dato CHAR(2), answer STRING
DEFINE answer2 INTEGER
INITIALIZE depto TO NULL
# Captura los datos que va a contener el registro
@@ -312,7 +321,7 @@ FUNCTION copcad025()
INITIALIZE data.* TO NULL
CALL ApiMaintainC('CHECK', orden_trabajo, data.*, usuarios) RETURNING answer
CALL ApiMaintainC('CHECK', orden_trabajo, data.*, usuarios) RETURNING answer, answer2
IF answer = 0 OR answer IS NULL THEN
@@ -732,8 +741,8 @@ ON ACTION guardar ATTRIBUTE(TEXT="Salvar", IMAGE="save")
ELSE
CALL ApiMaintainC('PATCH_WORKORDER',answer_workorder, Data.*, usuarios)
RETURNING answer
CALL ApiMaintainC('PATCH_WORKORDER',answer_workorder, Data.*, usuarios)
RETURNING answer, answer2
IF answer != 1 THEN
DISPLAY "AQUI PATCH_WORKORDER"
@@ -777,8 +786,12 @@ ON ACTION guardar ATTRIBUTE(TEXT="Salvar", IMAGE="save")
COMMIT WORK
CALL seleccionarsalida() RETURNING salida
CALL configureoutput(salida) RETURNING HANDLER
-- La API de configuracion de reportes (fgl_report_*) no esta
-- disponible en este FGL; se escribe el XML directo a un archivo
-- en FGLSPOOL en lugar de la vista previa/exportacion nativa.
LET p_reportfile = FGL_GETENV("FGLSPOOL"), "/coprmt025_req1.xml"
LET handler = om.XmlWriter.createFileWriter(p_reportfile)
START REPORT print_req TO XML HANDLER HANDLER
PREPARE query FROM
@@ -894,7 +907,9 @@ ON ACTION guardar ATTRIBUTE(TEXT="Salvar", IMAGE="save")
COMMIT WORK
CALL seleccionarsalida() RETURNING salida
CALL configureoutput(salida) RETURNING HANDLER
-- Ver nota sobre fgl_report_* mas arriba en este archivo.
LET p_reportfile = FGL_GETENV("FGLSPOOL"), "/coprmt025_req2.xml"
LET handler = om.XmlWriter.createFileWriter(p_reportfile)
START REPORT print_req TO XML HANDLER HANDLER
PREPARE query FROM
@@ -1177,7 +1192,9 @@ FUNCTION copcmf025()
IF salida IS NULL THEN
LET salida = 'PDF'
END IF
CALL configureoutput(salida) RETURNING HANDLER
-- Ver nota sobre fgl_report_* mas arriba en este archivo.
LET p_reportfile = FGL_GETENV("FGLSPOOL"), "/coprmt025_req3.xml"
LET handler = om.XmlWriter.createFileWriter(p_reportfile)
START REPORT print_req TO XML HANDLER HANDLER
PREPARE query FROM
PROYECTO/mbsERP.4pw
+23 -2
View File
@@ -166,7 +166,7 @@
<File filePath="../scripts/README.md"/>
</Library>
</Group>
<Group environment="value:CLASSPATH=$(ProjectDir)\\classes\\javax.mail.jar;$(CLASSPATH)" id="788649802" label="MODULOS" language="Genero">
<Group environment="value:CLASSPATH=$(ProjectDir)\\classes\\javax.mail.jar;$(CLASSPATH),file:FGLJVMPATH=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin\\server\\jvm.dll,dir:JAVA_HOME=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre,dirlist:PATH=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin;C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin\\server;$(PATH)" id="788649802" label="MODULOS" language="Genero">
<Group id="446189093" label="ACTIVOS FIJOS">
<Library binaryName="FORMULARIOS_AC" id="749078683" label="FORMULARIOS_AC"/>
<Library binaryName="FUNCIONES_AC" id="1581383228" label="FUNCIONES_AC"/>
@@ -176,6 +176,7 @@
<File filePath="codir/coprgb000.4gl"/>
<File filePath="codir/coprfu009.4gl"/>
<File filePath="codir/entrega_parciales.4gl"/>
<File filePath="codir/depto.4gl"/>
</Library>
<Library binaryName="FORMULARIOS_CO" id="-700000016" label="FORMULARIOS_CO">
<File filePath="codir/cofmmt001.4fd"/>
@@ -184,7 +185,11 @@
<File filePath="codir/cofmwd005.per"/>
<File filePath="codir/cofmwd012.per"/>
<File filePath="codir/cofmwd014.per"/>
<File filePath="codir/cofmmt016.per"/>
<File filePath="codir/cofmmt016.4fd"/>
<File filePath="codir/cofmmt010.per"/>
<File filePath="codir/cofmwd015.per"/>
<File filePath="codir/cofmmt025.per"/>
<File filePath="codir/cofmcs005.per"/>
</Library>
<Application binaryName="coprmt001" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000017" label="coprmt001">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000018" label="Configuration"/>
@@ -200,6 +205,22 @@
<Configuration commandLineArguments="alopez Lopez2023" id="-700000022" label="Configuration"/>
<File filePath="codir/coprmt016.4gl"/>
</Application>
<Application binaryName="coprmt010" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000023" label="coprmt010">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000024" label="Configuration"/>
<File filePath="codir/coprmt010.4gl"/>
</Application>
<Application binaryName="coprmt015" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000025" label="coprmt015">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000026" label="Configuration"/>
<File filePath="codir/coprmt015.4gl"/>
</Application>
<Application binaryName="coprmt025" dependencies="-1026233879,-764824792,-700000015,-700000016,-1423229125,493047263" environment="dir:FGLSPOOL=$(ProjectDir)/spool" id="-700000027" label="coprmt025">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000028" label="Configuration"/>
<File filePath="codir/coprmt025.4gl"/>
</Application>
<Application binaryName="coprcs005" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000029" label="coprcs005">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000030" label="Configuration"/>
<File filePath="codir/coprcs005.4gl"/>
</Application>
</Group>
<Group id="-1298100213" label="CONTABILIDAD GENERAL">
<Application binaryName="cgprmt001" dependencies="2055924299,-1026233879" id="-1385997751" label="cgprmt001">