romfast/roaauto
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync SVN r18197

Browse Source 
ROAAUTO 2.5.6: Vizualizare comenzi unificata cu Istoric comenzi (filtre si coloane noi), coloane manopera/materiale si total fara/cu TVA in vizualizare comenzi si facturi; versiune_db 2026_09_23_01.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Cfkx1QfeDv987o8x1rAtrr
This commit is contained in:
Marius Mutu
2026-09-23 22:13:59 +03:00
parent c047ff339a
commit 395e51e5bb
12 changed files with 1528 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Programe/oproceduri_vizualizare.prg
View File

@@ -232,7 +232,8 @@ Procedure vizualizare_facturi
Private pcselect,pcschema,pcfiltru,pcorder,pofacturi,llAfiseaza
Store '' To pofacturi
pcschema=['NRCRT n(5),ID_LUCRARE N(20),NRORD C(50),DATAI d,NUME c(50),TELEFON C(50),MANOPERA n(20,4),MATERIALE n(20,4),MANOPERA_DEVIZ n(20,4), MATERIALE_DEVIZ n(20,4),'+]+;
['ASIGURATOR c(24),INSPECTOR c(24),NR_DOSAR c(40),NRINMAT c(35),NRACT n(14),DATAACT d,VALCTVA n(19,2), ID_PART_REF N(20), PART_REF C(100)']
['ASIGURATOR c(24),INSPECTOR c(24),NR_DOSAR c(40),NRINMAT c(35),NRACT n(14),DATAACT d,VALCTVA n(19,2), ID_PART_REF N(20), PART_REF C(100),'+]+;
['ORE_MANOPERA n(20,4),VAL_MANOPERA n(20,4),VAL_MATERIALE_ACH n(20,4),VAL_MATERIALE_VZ n(20,4),VALFTVA n(19,2)']
pcorder=[a.dataact,a.nract,a.datai,a.nrord]
*!* modificare 27.01
*!* pcselect=['select row_number() over (partition by a.nrord order by ] + pcorder + [) as nrcrt,'+]+;
@@ -241,7 +242,8 @@ pcorder=[a.dataact,a.nract,a.datai,a.nrord]
*!* ['from ] + gcS + [.dev_validare_comenzi a '+]+;
*!* ['where 1=2']
pcselect=['select a.nrcrt,a.id_lucrare,a.nrord,a.datai,a.nume,a.telefon,a.manopera,a.materiale,a.manopera_deviz, a.materiale_deviz, a.asigurator,a.inspector,'+]+;
['a.nr_dosar,a.nrinmat,a.nract,a.dataact,a.valctva, a.id_part_ref, a.part_ref '+]+;
['a.nr_dosar,a.nrinmat,a.nract,a.dataact,a.valctva, a.id_part_ref, a.part_ref, '+]+;
['a.ore_manopera, a.val_manopera, a.val_materiale_ach, a.val_materiale_vz, a.manopera + a.materiale as valftva '+]+;
['from auto_facturi_emise a'+]+;
['where 1=2']
@@ -647,17 +649,22 @@ Release pocomenzi
Endproc && validare_comenzi
*****************************************************************************************
Procedure vizualizare_comenzi
Lparameters tlIstoric
Private pcselect,pcschema,pcfiltru,pcorder,pocomenzi,llAfiseaza
Store '' To pocomenzi
If Used('crscomenzi')
Use In crscomenzi
Endif
pcschema=['ID_ORDL n(10),ID_LUCRARE n(10),DATAI d,NUME c(50),NRORD c(50),NRINMAT c(35),VALIDAT n(1),ID_TIP N(5),TIP_COMANDA c(50),DATAORAVALID D,'+] +;
['FACTURAT n(1),DATAFACT d,NRFACT N(14),PROC_TVAV N(10,4), ID_PART_REF N(20), PART_REF C(100), SERIES V(100), KMINT I, ORE_FUNCTIONARE I']
['FACTURAT n(1),DATAFACT d,NRFACT N(14),PROC_TVAV N(10,4), ID_PART_REF N(20), PART_REF C(100), SERIES V(100), KMINT I, ORE_FUNCTIONARE I,'+] +;
['ORE_MANOPERA N(20,4),VAL_MANOPERA N(20,4),VAL_MANOPERA_FACTURA N(20,4),VAL_MATERIALE_VZ N(20,4),VAL_MATERIALE_ACH N(20,4),VAL_MATERIALE_FACTURA N(20,4),VALFTVA_FACTURA N(20,4),VALCTVA_FACTURA N(20,4),'+] +;
['ASIGURATOR c(40),MARCA c(24),MASINA c(20),INSPECTOR c(40),NR_DOSAR c(40),INCHIS_FORTAT n(1)']
pcselect=['select a.id_ordl,a.id_lucrare,a.datai,a.nume,a.nrord,a.nrinmat,a.validat,a.id_tip,a.tip_comanda,a.dataoravalid,a.facturat,a.datafact,a.nrfact,a.proc_tvav, a.id_part_ref, a.part_ref, '+]+;
[' a.series, a.kmint, a.ore_functionare '+] + ;
[' from ] + gcS + [.auto_normare_comenzi a where 1=2']
[' a.series, a.kmint, a.ore_functionare, '+] + ;
[' a.ore_manopera, a.val_manopera, a.val_manopera_factura, a.val_materiale_vz, a.val_materiale_ach, a.val_materiale_factura, a.val_manopera_factura + a.val_materiale_factura as valftva_factura, a.valctva_factura, '+] + ;
[' a.asigurator, a.marca, a.masina, a.inspector, a.nr_dosar, a.inchis_fortat '+] + ;
[' from auto_istoric_comenzi a where 1=2']
*!* [' from ] + gcS + [.dev_vvalid_comenzi a where 1=2']
*!* pcfiltru=[luna=]+Alltrim(Str(gnLuna))+[ and an=]+Alltrim(Str(gnAn))
*!* pcfiltru=[(extract(month from datafact) =]+Alltrim(Str(gnLuna))+[ and extract(year from datafact) =]+Alltrim(Str(gnAn))+[) or (datafact is null )]
@@ -669,7 +676,7 @@ llAfiseaza=.F.
gencursor('pocomenzi','crscomenzi',pcselect,pcfiltru,pcschema,pcorder,llAfiseaza)
pocomenzi.ca_baza1.afisare()
ofrmviz=Createobject('frm_viz_comenzi')
ofrmviz=Createobject('frm_viz_comenzi', m.tlIstoric)
ofrmviz.Show(1)
If Used('crscomenzi')
Use In crscomenzi