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

Merge branch 'main' of https://git.fulldetord.com/jsoto/mbs

Browse Source
This commit is contained in:
Abel López
2026-10-27 16:07:27 -04:00
parent 5b53d994ac b09ba2374f
commit b52ccfae7f
5 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROYECTO/PRDIR/prfmmt003pr.4fd
+16 -16
View File
@@ -81,22 +81,22 @@
<Group gridHeight="8" gridWidth="257" name="group2" posX="1" posY="6" text="Detalle">
<Table gridHeight="6" gridWidth="254" name="table1" posX="2" posY="1" totalRows="5" unitWidth="characters" width="76">
<ComboBox colName="tipo" comment="Digite Codigo de la Maquina" fieldId="11" gridHeight="1" gridWidth="30" items="" name="tipo" posX="0" posY="0" scroll="true" sqlTabName="formonly" tabIndex="5" title="OPERACION" widget="ComboBox"/>
<ComboBox fieldId="5" gridHeight="1" gridWidth="30" items="" name="codigo" posX="30" posY="0" scroll="true" tabIndex="-1" title="Equipo" unhidable="true" unmovable="true" unsortable="true" widget="ComboBox"/>
<ButtonEdit action="empleado" autoNext="true" colName="emp_no" fieldId="8" gridHeight="1" gridWidth="10" name="emp_no" posX="60" posY="0" sqlTabName="formonly" sqlType="DECIMAL" tabIndex="6" title="EMPLEADO" widget="ButtonEdit"/>
<Edit autoNext="true" colName="h_directa" fieldId="12" gridHeight="1" gridWidth="6" name="h_directa" posX="70" posY="0" sqlTabName="formonly" tabIndex="7" title="N.DIRECTA" widget="Edit"/>
<Edit autoNext="true" colName="h_indirecta" fieldId="13" gridHeight="1" gridWidth="6" name="h_indirecta" posX="76" posY="0" sqlTabName="formonly" tabIndex="8" title="N.IND." widget="Edit"/>
<Edit autoNext="true" colName="e_directa" fieldId="14" gridHeight="1" gridWidth="6" name="e_directa" posX="82" posY="0" sqlTabName="formonly" tabIndex="9" title="E. DIRECTAS" widget="Edit"/>
<Edit autoNext="true" colName="e_indirecta" fieldId="15" gridHeight="1" gridWidth="5" name="e_indirecta" posX="88" posY="0" sqlTabName="formonly" tabIndex="10" title="E.INDIRECTAS" widget="Edit"/>
<ButtonEdit action="semielaborado" colName="cod_prod" fieldId="9" gridHeight="1" gridWidth="10" name="cod_prod" posX="93" posY="0" sqlTabName="formonly" tabIndex="11" title="SEMI-ELABORADO" widget="ButtonEdit"/>
<Edit fieldId="20" gridHeight="1" gridWidth="8" name="lado1" posX="103" posY="0" tabIndex="-1" title="Ancho" widget="Edit"/>
<Edit fieldId="21" gridHeight="1" gridWidth="8" name="lado2" posX="111" posY="0" tabIndex="-1" title="Largo" widget="Edit"/>
<Edit fieldId="22" gridHeight="1" gridWidth="8" name="lado3" posX="119" posY="0" tabIndex="-1" title="Espesor" widget="Edit"/>
<Edit colName="cantidad" comment="Digite Cantidad Producida" fieldId="17" gridHeight="1" gridWidth="12" name="cantidad" posX="127" posY="0" sqlTabName="formonly" tabIndex="12" title="CANTIDAD" widget="Edit"/>
<Edit fieldId="23" gridHeight="1" gridWidth="8" name="medida1" noEntry="true" posX="139" posY="0" tabIndex="-1" title="Medida" widget="Edit"/>
<Edit case="upper" colName="codigo_bloque" fieldId="2" gridHeight="1" gridWidth="20" name="codigo_bloque" posX="147" posY="0" scroll="true" sqlTabName="formonly" tabIndex="13" title="BLOQUE" widget="Edit"/>
<ComboBox colName="turno" fieldId="0" gridHeight="1" gridWidth="20" items="" name="turno" posX="167" posY="0" sqlTabName="formonly" tabIndex="14" title="TURNO" widget="ComboBox"/>
<ComboBox fieldId="24" gridHeight="1" gridWidth="13" items="" name="depto_receptor" notNull="false" posX="187" posY="0" required="false" tabIndex="-1" title="DEPTO. RECEPTOR" widget="ComboBox"/>
<ButtonEdit action="ordenped" fieldId="50" gridHeight="1" gridWidth="12" name="num_oc" posX="200" posY="0" scroll="true" tabIndex="18" title="ORDEN PED." widget="ButtonEdit"/>
<ComboBox fieldId="5" gridHeight="1" gridWidth="48" items="" name="codigo" posX="30" posY="0" scroll="true" tabIndex="-1" title="Equipo" unhidable="true" unmovable="true" unsortable="true" widget="ComboBox"/>
<ButtonEdit action="empleado" autoNext="true" colName="emp_no" fieldId="8" gridHeight="1" gridWidth="10" name="emp_no" posX="78" posY="0" sqlTabName="formonly" sqlType="DECIMAL" tabIndex="6" title="EMPLEADO" widget="ButtonEdit"/>
<Edit autoNext="true" colName="h_directa" fieldId="12" gridHeight="1" gridWidth="6" name="h_directa" posX="88" posY="0" sqlTabName="formonly" tabIndex="7" title="N.DIRECTA" widget="Edit"/>
<Edit autoNext="true" colName="h_indirecta" fieldId="13" gridHeight="1" gridWidth="6" name="h_indirecta" posX="94" posY="0" sqlTabName="formonly" tabIndex="8" title="N.IND." widget="Edit"/>
<Edit autoNext="true" colName="e_directa" fieldId="14" gridHeight="1" gridWidth="6" name="e_directa" posX="100" posY="0" sqlTabName="formonly" tabIndex="9" title="E. DIRECTAS" widget="Edit"/>
<Edit autoNext="true" colName="e_indirecta" fieldId="15" gridHeight="1" gridWidth="5" name="e_indirecta" posX="106" posY="0" sqlTabName="formonly" tabIndex="10" title="E.INDIRECTAS" widget="Edit"/>
<ButtonEdit action="semielaborado" colName="cod_prod" fieldId="9" gridHeight="1" gridWidth="10" name="cod_prod" posX="111" posY="0" sqlTabName="formonly" tabIndex="11" title="SEMI-ELABORADO" widget="ButtonEdit"/>
<Edit fieldId="20" gridHeight="1" gridWidth="8" name="lado1" posX="121" posY="0" tabIndex="-1" title="Ancho" widget="Edit"/>
<Edit fieldId="21" gridHeight="1" gridWidth="8" name="lado2" posX="129" posY="0" tabIndex="-1" title="Largo" widget="Edit"/>
<Edit fieldId="22" gridHeight="1" gridWidth="8" name="lado3" posX="137" posY="0" tabIndex="-1" title="Espesor" widget="Edit"/>
<Edit colName="cantidad" comment="Digite Cantidad Producida" fieldId="17" gridHeight="1" gridWidth="12" name="cantidad" posX="145" posY="0" sqlTabName="formonly" tabIndex="12" title="CANTIDAD" widget="Edit"/>
<Edit fieldId="23" gridHeight="1" gridWidth="8" name="medida1" noEntry="true" posX="157" posY="0" tabIndex="-1" title="Medida" widget="Edit"/>
<Edit case="upper" colName="codigo_bloque" fieldId="2" gridHeight="1" gridWidth="20" name="codigo_bloque" posX="165" posY="0" scroll="true" sqlTabName="formonly" tabIndex="13" title="BLOQUE" widget="Edit"/>
<ComboBox colName="turno" fieldId="0" gridHeight="1" gridWidth="20" items="" name="turno" posX="185" posY="0" sqlTabName="formonly" tabIndex="14" title="TURNO" widget="ComboBox"/>
<ComboBox fieldId="24" gridHeight="1" gridWidth="13" items="" name="depto_receptor" notNull="false" posX="205" posY="0" required="false" tabIndex="-1" title="DEPTO. RECEPTOR" widget="ComboBox"/>
<ButtonEdit action="ordenped" fieldId="50" gridHeight="1" gridWidth="12" name="num_oc" posX="218" posY="0" scroll="true" tabIndex="18" title="ORDEN PED." widget="ButtonEdit"/>
<Phantom fieldId="28" name="ref" widget="Phantom"/>
</Table>
</Group>
PROYECTO/bin/prprmt003.4rp
+6 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<report:Report xmlns:rtl="http://www.4js.com/2004/RTL" xmlns:report="http://www.4js.com/2007/REPORT" xmlns="http://www.4js.com/2004/PXML" gstVersion="3140a" version="6.00">
<report:Settings RWPageWidth="letterwidth" RWPageLength="letterlength" RWLeftMargin="0.5inch" RWTopMargin="0.5inch" RWRightMargin="0.5inch" RWBottomMargin="0.5inch">
<report:Settings RWPageWidth="letterlength" RWPageLength="letterwidth" RWLeftMargin="0.5inch" RWTopMargin="0.5inch" RWRightMargin="0.5inch" RWBottomMargin="0.5inch">
<report:FormatList>
<report:Format-PDF/>
<report:Format-image/>
@@ -49,7 +49,8 @@
<WORDBOX name="WordBox46" width="39.5197" alignment="baseline" baselineType="leftleft" textAlignment="left" text="ancho"/>
<WORDBOX name="WordBox119" width="34.8661" floatingBehavior="enclosed" textAlignment="left" text="largo"/>
<WORDBOX name="WordBox121" width="59.8661" length="13.3906" alignment="baseline" floatingBehavior="enclosed" text="espesor"/>
<WORDBOX name="WordBox120_2" width="57.3465" floatingBehavior="enclosed" textAlignment="left" text="medida"/>
<WORDBOX name="WordBox_cantidad" width="60" alignment="baseline" floatingBehavior="enclosed" textAlignment="right" text="cantidad"/>
<WORDBOX name="WordBox120_2" width="57.3465" floatingBehavior="enclosed" textAlignment="center" text="medida"/>
<WORDBOX name="WordBox120_1" width="77.3465" alignment="baseline" floatingBehavior="enclosed" textAlignment="center" text="bloque"/>
<LAYOUTNODE name="espacio5_1_2_2" width="16" length="6" layoutDirection="leftToRight"/>
<WORDBOX name="WordBox120_3" width="67.3465" alignment="baseline" floatingBehavior="enclosed" textAlignment="center" text="turno"/>
@@ -72,6 +73,9 @@
<rtl:input-variable name="arr_costos.lado2" type="FGLNumeric" expectedLocation="expectedHere"/>
<rtl:input-variable name="arr_costos.lado3" type="FGLNumeric" expectedLocation="expectedHere"/>
<WORDWRAPBOX name="WordWrapBox5" width="128.197" length="33.2783" alignment="baseline" baselineType="leftleft" text="{{arr_costos.lado1.format(&quot;#,###.##&quot;).trim()+&quot; X &quot;+arr_costos.lado2.format(&quot;#,###.##&quot;).trim()+&quot; X &quot;+arr_costos.lado3.format(&quot;#,###.##&quot;).trim()}}" trimText="both" textAlignment="center"/>
<LAYOUTNODE name="espacio_cant" width="27" length="5" layoutDirection="leftToRight"/>
<rtl:input-variable name="arr_costos.cantidad" type="FGLNumeric" expectedLocation="expectedHere"/>
<DECIMALFORMATBOX name="arr_costos.cantidad Value" class="grwNumericValue" width="60" length="30.0469" anchorX="1" floatingBehavior="enclosed" textAlignment="right" format="---,---,--&amp;.&amp;&amp;" value="{{arr_costos.cantidad}}"/>
<LAYOUTNODE name="espacio5_1" width="27" length="5" layoutDirection="leftToRight"/>
<rtl:input-variable name="arr_costos.medida1" type="FGLNumeric" expectedLocation="expectedHere"/>
<DECIMALFORMATBOX name="karr_ordenes.valor Value" class="grwNumericValue" width="52.8661" length="30.0469" anchorX="1" floatingBehavior="enclosed" textAlignment="center" format="---,---,---,--&amp;.&amp;&amp;" value="{{arr_costos.medida1}}"/>
PROYECTO/mbsERP.4pw
+8 -1
View File
@@ -1044,9 +1044,11 @@
</Application>
</Group>
<Group id="615555875" label="PRODUCCION">
<Application binaryName="prprmt008" dependencies="-837156229,-1026233879,-764824792" id="990112248" label="prprmt008">
<Application binaryName="prprmt008" dependencies="-837156229,-1026233879,-764824792,-1423229125" externalDependencies="libgre.42x" id="990112248" label="prprmt008">
<Configuration commandLineArguments="jpeguero Peguero2023" id="888443941" label="Configuration"/>
<File filePath="PRDIR/prprmt008.4gl"/>
<File filePath="PRDIR/prfmwd003.per"/>
<File filePath="PRDIR/prfmwd004.per"/>
</Application>
<Application binaryName="prprmt003" dependencies="-837156229,-1026233879,-764824792,-2079122474" externalDependencies="libgre.42x" id="-655344430" label="prprmt003">
<Configuration commandLineArguments="jpeguero Peguero2023" id="-171737906" label="Configuration"/>
@@ -1340,6 +1342,11 @@
<Group id="-802694369" label="REPORTE ENTRADA">
<Library binaryName="FORMULARIO_AL" id="267647114" label="FORMULARIO_AL"/>
<Library binaryName="FUNCION_AL" id="-1012843001" label="FUNCION_AL"/>
<Application binaryName="alprmt006" dependencies="-1026233879,-764824792" id="-960000906" label="alprmt006">
<Configuration commandLineArguments="jpeguero Peguero2023" id="-961000906" label="Configuration"/>
<File filePath="otrodir/alprmt006.4gl"/>
<File filePath="otrodir/alfmmt006.per"/>
</Application>
</Group>
<Group id="-105943532" label="REPUESTOS">
<Application binaryName="irprmt006" dependencies="-1026233879,-2079122474,-764824792,-1423229125,18908927" id="-1693664339" label="irprmt006">
PROYECTO/otrodir/alprmt006.4gl
+23 -6
View File
@@ -13,7 +13,7 @@
Orden de Compra
-------------------------------------------------------------------------
}
DATABASE marmotech
SCHEMA smarmotech
GLOBALS
DEFINE etiqueta CHAR(20)
DEFINE descrip_espa CHAR(35)
@@ -61,8 +61,14 @@ END GLOBALS
MAIN
DEFINE fecha CHAR(8)
DEFINE usuarios, clave STRING
DEFER INTERRUPT
# Migracion Genero 6: conexion explicita con usuario y clave (args 1 y 2)
CALL ARG_VAL(1) RETURNING usuarios
CALL ARG_VAL(2) RETURNING clave
CONNECT TO "smarmotech" USER usuarios USING clave
CLEAR SCREEN
OPTIONS
ERROR LINE 24,
@@ -500,14 +506,17 @@ INPUT ARRAY movi WITHOUT DEFAULTS FROM s_movi1.*
IF primera = "S" THEN
LET primera = "N"
# Migracion G6: el contador iptb00007 es por movimiento y bodega
SELECT UNIQUE a.num_doc INTO ip_ultimo FROM iptb00007 a
WHERE a.cod_mov = movi[p_act].cod_mov
AND a.bodega = datos_gen.bodega
LET ip_ultimo = ip_ultimo + 1
LET datos_gen.num_doc = ip_ultimo
LET documento[p_act] = ip_ultimo
SELECT UNIQUE num_doc FROM iptb00006
WHERE num_doc=datos_gen.num_doc and cod_mov=movi[p_act].cod_mov
AND bodega = datos_gen.bodega
IF STATUS != NOTFOUND THEN
LET numero_msg = 128
@@ -612,24 +621,32 @@ INPUT ARRAY movi WITHOUT DEFAULTS FROM s_movi1.*
IF movi[idx].cantidad_2 IS NOT NULL AND movi[idx].cantidad_2 <> 0 THEN
# Actualizacion de las tablas de Productos terminados
IF datos_gen.tipo = "02" THEN
# Migracion G6: lista explicita de columnas (la tabla tiene columnas nuevas)
INSERT INTO iptb00006
(cod_cia,num_doc,fecha,fact_no,conduce_no,tipo,orden_compra,
cod_sp,cod_sp_sec,cod_transp,sec_transp,placa,cod_tarifa,
cod_mov,detalle,cod_n,cod_grupo,cod_tipo,cod_sec,cantidad_1,
cantidad_2,cond_recep,uso_tiempo,bodega,status_t,us_crea,
fech_crea,us_mod,fech_mod)
VALUES ("1",datos_gen.num_doc,datos_gen.fecha,datos_gen.fact_no,
datos_gen.conduce_no,datos_gen.tipo,datos_gen.orden_compra,
datos_gen.cod_sp, datos_gen.cod_sp_sec,null,null,null,null,
movi[idx].cod_mov,null,movi[idx].cod_n,movi[idx].cod_grupo,
movi[idx].cod_tipo,movi[idx].cod_sec,movi[idx].cantidad_1,
movi[idx].cantidad_2,null,null,datos_gen.bodega,
null,user,current,null,null)
null,SUSER_SNAME(),getdate(),null,null)
SELECT a.num_doc FROM iptb00007 a
WHERE a.cod_mov = movi[idx].cod_mov
AND a.bodega = datos_gen.bodega
IF status != notfound THEN
UPDATE iptb00007 set num_doc = datos_gen.num_doc
WHERE cod_mov = movi[idx].cod_mov
AND bodega = datos_gen.bodega
ELSE
INSERT INTO iptb00007 VALUES
(datos_gen.num_doc,movi[idx].cod_mov,null,user,current,
null,null)
(datos_gen.num_doc,movi[idx].cod_mov,null,SUSER_SNAME(),getdate(),
null,null,datos_gen.bodega)
END IF
END IF
IF datos_gen.tipo = "01" THEN
@@ -642,7 +659,7 @@ INPUT ARRAY movi WITHOUT DEFAULTS FROM s_movi1.*
movi[idx].cantidad_1,
movi[idx].cantidad_2,null,null,null,null,null,
datos_gen.bodega,
null,user,current,null,null)
null,SUSER_SNAME(),getdate(),null,null)
SELECT a.num_doc FROM intb00023 a
WHERE a.cod_mov = movi[idx].cod_mov
IF status != notfound THEN
@@ -650,7 +667,7 @@ INPUT ARRAY movi WITHOUT DEFAULTS FROM s_movi1.*
WHERE cod_mov = movi[idx].cod_mov
ELSE
INSERT INTO intb00023 VALUES
(datos_gen.num_doc,movi[idx].cod_mov,null,user,current,
(datos_gen.num_doc,movi[idx].cod_mov,null,SUSER_SNAME(),getdate(),
null,null)
END IF