root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 no-patch

Browse Source 
Files correlati     : fplib01
Commento            : Preparazione aggiunta conai in altri dati gestionale
This commit is contained in:
Simone Palacino 2019-03-08 11:13:24 +01:00
parent 1f8100a976
commit bf6e86df15
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fp/fplib.h
View File

@ -131,6 +131,7 @@ private:
int _num_linea; int _num_linea;
int _counter; int _counter;
TPaf_container _paf_container; TPaf_container _paf_container;
int _count_r_conai;
// Classe interna per gestire righe aggiuntive in riepilogo // Classe interna per gestire righe aggiuntive in riepilogo
class TRiepilogo_agg class TRiepilogo_agg
@ -203,9 +204,10 @@ protected:
public: public:
// Set Altri Dati Gestionali // Set Altri Dati Gestionali
void set_ads(int r); void set_adg(int r);
// Get Altri Dati Gestionali // Get Altri Dati Gestionali
void get_ads(); void get_adg();
void set_paf2100f(int r, TRiga_documento* rdoc);
bool doc_to_paf(TDocumentoEsteso& doc); bool doc_to_paf(TDocumentoEsteso& doc);
bool doc_to_paf(const TRectype& rec); bool doc_to_paf(const TRectype& rec);
bool doc_to_paf(const TDoc_key& key); bool doc_to_paf(const TDoc_key& key);

16
src/fp/fplib01.cpp
View File

@ -1379,17 +1379,26 @@ bool TDoc_fp::export_paf3200f()
return true; return true;
} }
void TDoc_fp::set_ads(int r) void TDoc_fp::set_adg(int r)
{ {
_num_linea = r; _num_linea = r;
_counter = 0; _counter = 0;
} }
void TDoc_fp::get_ads() void TDoc_fp::get_adg()
{ {
//static TPaf_record paf2000f; //static TPaf_record paf2000f;
} }
void TDoc_fp::set_paf2100f(int r, TRiga_documento* rdoc)
{
_count_r_conai++;
}
bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc) bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
{ {
if (!initialize(doc)) if (!initialize(doc))
@ -1643,8 +1652,6 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
if (check_row(*rdoc) && !fp_settings().get_check_not_block()) if (check_row(*rdoc) && !fp_settings().get_check_not_block())
return false; return false;
set_ads(r);
bool skip_riga = false; bool skip_riga = false;
paf1800f.reset(); paf1800f.reset();
paf1800f.set("PI_KEYHEADERFATT", _hfatt); paf1800f.set("PI_KEYHEADERFATT", _hfatt);
@ -1689,6 +1696,7 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
const TString conai_fld(conai_peso_name(cc, LF_RIGHEDOC)); const TString conai_fld(conai_peso_name(cc, LF_RIGHEDOC));
if(rdoc->get(conai_fld).full()) if(rdoc->get(conai_fld).full())
{ {
rdoc->get(conai_fld);
} }
} }