git-svn-id: svn://10.65.10.50/trunk@2706 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1996-03-28 16:55:05 +00:00
parent b129c48ff2
commit 76b796a9a3
2 changed files with 60 additions and 37 deletions

View File

@ -95,7 +95,7 @@ public:
void aggiorna_reg(int anno,TString& codreg,long ulnum); void aggiorna_reg(int anno,TString& codreg,long ulnum);
char ricerca_causale(TString& field); char ricerca_causale(TString& field);
bool occasionali(const TString& ocfpi); bool occasionali(TString& ocfpi);
TRic_tab(char ric_tab_mov, char ric_auto = '\0'); TRic_tab(char ric_tab_mov, char ric_auto = '\0');
}; };
@ -1066,56 +1066,67 @@ void TRic_tab::ricevi_movPN(TString& key, char uselab)
} }
} }
bool TRic_tab::occasionali(const TString& ocfpi) bool TRic_tab::occasionali(TString& ocfpi)
{ {
TString chiave; TString chiave;
long prog = 1; long prog = 0;
bool esiste = FALSE; bool esiste = FALSE;
bool ric = TRUE;
TString ocfpitemp = ocfpi;
TString nocfpi = _tmov->get("TOCFP"); if (ocfpi.mid(0,3) == "RIC")
nocfpi.trim(); {
// TString nocfpi = _tmov->get("TOCFP");
// nocfpi.trim();
if (nocfpi.empty()) // if (nocfpi.empty())
{ // {
_occas->setkey(1); _occas->setkey(1);
_occas->zero(); _occas->zero();
_occas->put("CFPI", "RIC9999999999999"); for (_occas->first(); !_occas->eof(); _occas->next())
_occas->read(); {
_occas->prev(); TString cfpi = _occas->get(OCC_CFPI);
TString cfpi = _occas->get(OCC_CFPI); if (cfpi.mid(0,3) == "RIC")
if (cfpi.mid(0,3) == "RIC") prog = atol(cfpi.mid(3,13));
{ }
prog = atol(cfpi.mid(3,13)); prog++;
prog++;
chiave = format("%3s%13ld", (const char*) "RIC", prog); chiave = format("%3s%13ld", (const char*) "RIC", prog);
}
else
chiave = format("%3s%13ld", (const char*) "RIC", prog);
esiste = FALSE; esiste = FALSE;
ocfpi = chiave;
} }
else else
{ ric = FALSE;
_occas->setkey(1); // }
_occas->zero(); // else
_occas->put("CFPI", nocfpi); // {
_occas->read(); // _occas->setkey(1);
// _occas->zero();
// _occas->put("CFPI", nocfpi);
// _occas->read();
esiste = TRUE; // esiste = TRUE;
} // ocfpi = nocfpi;
// }
_toccas->setkey(1); _toccas->setkey(1);
_toccas->zero(); _toccas->zero();
_toccas->put(OCC_CFPI, ocfpi); _toccas->put(OCC_CFPI, ocfpitemp);
_toccas->read(); _toccas->read();
_occas->curr() = _toccas->curr(); _occas->curr() = _toccas->curr();
if (esiste) if (esiste)
_occas->rewrite(); _occas->rewrite();
else else
_occas->write(); {
if (ric)
_occas->put(OCC_CFPI, chiave);
_occas->write();
}
return TRUE; return TRUE;
} }
@ -1173,6 +1184,11 @@ void TRic_tab::ricevi_movIVA(TString& key, char uselab)
if (ocfpi.not_empty()) if (ocfpi.not_empty())
occasionali(ocfpi); occasionali(ocfpi);
// TRecnotype rec = _tmov->recno(); // Salvo il nuovo numero di
// _tmov->put("TOCFP", ocfpi); // registrazione sul file di lavoro
// _tmov->rewrite();
// _tmov->readat(rec);
TDate data74ter ( _tmov->get_date(MOV_DATA74TER) ); TDate data74ter ( _tmov->get_date(MOV_DATA74TER) );
TString codval ( _tmov->get (MOV_CODVALI) ); TString codval ( _tmov->get (MOV_CODVALI) );
@ -1197,6 +1213,7 @@ void TRic_tab::ricevi_movIVA(TString& key, char uselab)
_mov->put(MOV_CORRLIRE, corrlire); _mov->put(MOV_CORRLIRE, corrlire);
_mov->put(MOV_CORRVALUTA, corrval); _mov->put(MOV_CORRVALUTA, corrval);
_mov->put(MOV_ANNOIVA, annoiva); _mov->put(MOV_ANNOIVA, annoiva);
_mov->put(MOV_OCFPI, ocfpi);
_mov->rewrite(); _mov->rewrite();
scrivi_righeIVA(nreg); scrivi_righeIVA(nreg);

View File

@ -1641,7 +1641,7 @@ const char* TTransfer_file::scrivi_occasionali(const TString& record)
civ = numero_civico(ind); civ = numero_civico(ind);
app = "RIC"; app = "RIC";
cfpi.format("%3s%6d", (const char*)app,_npoccas); cfpi.format("%3s%13ld", (const char*)app,_npoccas);
//ricerca_comune(com); //ricerca_comune(com);
_cod_com = ""; _cod_com = "";
@ -2795,7 +2795,9 @@ void TTransfer_file::write_testata_movimenti(TString& record)
sigla = record.mid(0,2); sigla = record.mid(0,2);
key.format("%2s%d", (const char*)sigla,numfield); key.format("%2s%d", (const char*)sigla,numfield);
_depmov->zero();
if (trc.is_key((const char *) key)) if (trc.is_key((const char *) key))
{ {
_numreg = atol(record.sub(2,8)); _numreg = atol(record.sub(2,8));
@ -2906,7 +2908,7 @@ void TTransfer_file::write_testata_movimenti(TString& record)
{ {
TString app = "RIC"; TString app = "RIC";
_npoccas++; _npoccas++;
field.format("%3s%6d", (const char*)app,_npoccas); field.format("%3s%13ld", (const char*)app,_npoccas);
} }
else else
occas = FALSE; occas = FALSE;
@ -3019,7 +3021,9 @@ void TTransfer_file::write_righe_contabili(TString& record)
sigla = record.mid(0,2); sigla = record.mid(0,2);
key.format("%2s%d", (const char*)sigla,numfield); key.format("%2s%d", (const char*)sigla,numfield);
_deprmov->zero();
if (trc.is_key((const char *) key)) if (trc.is_key((const char *) key))
{ {
do do
@ -3143,6 +3147,8 @@ void TTransfer_file::write_righe_IVA(TString& record)
sigla = record.mid(0,2); sigla = record.mid(0,2);
key.format("%2s%d", (const char*)sigla,numfield); key.format("%2s%d", (const char*)sigla,numfield);
_depriva->zero();
if (trc.is_key((const char *) key)) if (trc.is_key((const char *) key))
{ {