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

git-svn-id: svn://10.65.10.50/branches/R_10_00@23024 c028cbd2-c16b-5b4b-a496-9718f37d4682

Browse Source
This commit is contained in:
guy 2014-12-10 16:16:17 +00:00
parent ea4db97f58
commit 7a1fb797cf
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mg/mglib.h
View File

@ -85,10 +85,16 @@ const char* const zero_fields[] =
NULL NULL
}; };
typedef TString20 TCodice_articolo;
///////////////////////////////////////////////////////////
// TArticolo
///////////////////////////////////////////////////////////
class TArticolo : public TMultiple_rectype class TArticolo : public TMultiple_rectype
{ {
protected: protected:
TString _codice; TCodice_articolo _codice;
// la get_str supporta anche la sintassi: // la get_str supporta anche la sintassi:
// #LF->fieldname // #LF->fieldname
// oppure: // oppure:
@ -110,7 +116,7 @@ public:
virtual TObject* dup() const { return new TArticolo(codice()); } virtual TObject* dup() const { return new TArticolo(codice()); }
// restituisce il codice (e' un reference "sicuro" ad una stringa interna) // restituisce il codice (e' un reference "sicuro" ad una stringa interna)
const TString& codice() const; const TCodice_articolo& codice() const;
const TString& descrizione(const char * lingua = NULL) const; const TString& descrizione(const char * lingua = NULL) const;
bool unlock() ; bool unlock() ;
@ -581,8 +587,8 @@ public:
virtual int write(TBaseisamfile& f) const ; virtual int write(TBaseisamfile& f) const ;
virtual int rewrite(TBaseisamfile& f) const ; virtual int rewrite(TBaseisamfile& f) const ;
bool force_update_bal(); bool force_update_bal();
TArticolo & articolo(int row) const { return cached_article(body()[row].get(RMOVMAG_CODART));} TArticolo& articolo(int row) const { return cached_article(body()[row].get(RMOVMAG_CODART));}
TArticolo_giacenza & articolo_giacenza(int row) const { return cached_article_balances(body()[row].get(RMOVMAG_CODART));} TArticolo_giacenza& articolo_giacenza(int row) const { return cached_article_balances(body()[row].get(RMOVMAG_CODART));}
TCausale_magazzino& causale(int row) const; TCausale_magazzino& causale(int row) const;
const TCausale_magazzino& causale(const char* cod = NULL) const; const TCausale_magazzino& causale(const char* cod = NULL) const;
void renum_mov(const long numreg); void renum_mov(const long numreg);

8
mg/mglib02.cpp
View File

@ -150,9 +150,9 @@ int TArticolo::read(const char * cod, word op, word lockop)
return read( tmp, op, lockop); return read( tmp, op, lockop);
} }
const TString& TArticolo::codice() const const TCodice_articolo& TArticolo::codice() const
{ {
((TArticolo *)this)->_codice=get(ANAMAG_CODART); ((TCodice_articolo&)_codice) = get(ANAMAG_CODART);
return _codice; return _codice;
} }
@ -1515,9 +1515,9 @@ real TArticolo_giacenza::scorta_minima(const char* codmag,
if (!rec.get(MAG_CODMAG).empty()) if (!rec.get(MAG_CODMAG).empty())
{ {
if (liv_riordino) if (liv_riordino)
sm += rec.get_real("LIVRIOR"); sm += rec.get_real(MAG_LIVRIOR);
else else
sm += rec.get_real("SCORTAMIN"); sm += rec.get_real(MAG_SCORTAMIN);
} }
} }
return sm; return sm;