From f5b2043d508e0c6b6dfda71cb411b4fdaf9ce4c8 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 28 Aug 2008 09:38:04 +0000 Subject: [PATCH] Patch level :10.0 Files correlati : Ricompilazione Demo : [ ] Commento :sistemati casini da riporto 3.2 git-svn-id: svn://10.65.10.50/trunk@17118 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- db/dblib.cpp | 8 ++++++-- db/dblib.h | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/db/dblib.cpp b/db/dblib.cpp index 9208e8445..a3b5471b5 100755 --- a/db/dblib.cpp +++ b/db/dblib.cpp @@ -1797,7 +1797,7 @@ TLavorazione *TDistinta_tree::find_labor(TRiga_esplosione *l) // TRiga_esplosione /////////////////////////////////////////////////////////// -void TRiga_esplosione::init(const TDistinta_tree& tree, bool vis_ghost) +void TRiga_esplosione::init(const TDistinta_tree& tree, bool vis_ghost, const TRectype* rec) { tree.curr_code(_comp); _comp.trim(); tree.father_code(_dist); _dist.trim(); @@ -1808,9 +1808,13 @@ void TRiga_esplosione::init(const TDistinta_tree& tree, bool vis_ghost) tree.curr_giaclev(_giac); _tipo = tree.curr_type(); _sort = tree.curr_sort(); - _mat_base = FALSE; + _mat_base = false; // set path and code tree.curr_id(_path); // path + if (rec != NULL) + _rdist = new TRectype(*rec); + else + _rdist = NULL; } const char * TRiga_esplosione::father(const char * types) diff --git a/db/dblib.h b/db/dblib.h index 60a03ae8a..971023227 100755 --- a/db/dblib.h +++ b/db/dblib.h @@ -401,10 +401,11 @@ class TRiga_esplosione : public TQuantita real _last_qta; TCodice_articolo _comp; TCodice_articolo _dist; + TRectype* _rdist; protected: virtual TObject* dup() const { return new TRiga_esplosione(*this); } - void init(const TDistinta_tree& tree, bool vis_ghost = FALSE); + void init(const TDistinta_tree& tree, bool vis_ghost = false, const TRectype* rec = NULL); public: const TToken_string& path() const { return _path; } @@ -419,13 +420,14 @@ public: void set_path(const char* p) { _path = p;} void set_giacenza(const char* g) { _giac = g; } // cerca un padre o nonno di uno dei tipi passati - const char * father(const char * types=NULL); + const char* father(const char* types = NULL); const real& last_qta() const { return _last_qta; } -t const TCodice_articolo & componente() const { return _comp; } + const TRectype* rdist_rec() const { return _rdist;} + const TCodice_articolo & componente() const { return _comp; } const TCodice_articolo & distinta() const { return _dist;} TRiga_esplosione(); - TRiga_esplosione(const TDistinta_tree& tree, bool vis_ghost = false); + TRiga_esplosione(const TDistinta_tree& tree, bool vis_ghost = false, const TRectype* rec = NULL); TRiga_esplosione(const TRiga_esplosione& re); virtual ~TRiga_esplosione() { if (_rdist != NULL) delete _rdist;} };