diff --git a/db/db0500.cpp b/db/db0500.cpp index 3c33b36b6..b7dc1d69c 100755 --- a/db/db0500.cpp +++ b/db/db0500.cpp @@ -8,7 +8,9 @@ #include #include #include +#include #include +#include #include "db0.h" #include "../mg/mglib.h" @@ -242,7 +244,7 @@ protected: void remove_desc(const TMask& m); public: - TRelation & relation() {return *_therel;} + TRelation& relation() { return *_therel; } }; TDistinta_app& app() @@ -366,7 +368,7 @@ void TQuery_mask::create_browse1(TEdit_field& kfld, int level, short key_id) con while (scan.pop() != "EN") kfld.parse_item(scan); - xvt_fsys_removefile(tmp); + tmp.fremove(); } void TQuery_mask::create_browse2(TEdit_field& kfld, int level, short key_id, short des_id) const @@ -399,7 +401,7 @@ void TQuery_mask::create_browse2(TEdit_field& kfld, int level, short key_id, sho while (scan.pop() != "EN") kfld.parse_item(scan); - xvt_fsys_removefile(tmp); + tmp.fremove(); } bool TQuery_mask::ask_new_code(const TCodice_articolo& oldcode, TCodice_articolo& newcode) const @@ -410,7 +412,8 @@ bool TQuery_mask::ask_new_code(const TCodice_articolo& oldcode, TCodice_articolo const int last_level = _livart.last_level(); const int width = last_level > 0 ? _livart.packed_length(last_level)+last_level*3+16 : 38; TMask m(TR("Copia articolo/distinta"), 1, width, 5); - + m.add_button_tool(DLG_OK, "", TOOL_OK); + m.add_button_tool(DLG_CANCEL, "", TOOL_CANCEL); m.add_static(DLG_NULL, 0, PR("Vecchio codice "), 1, 1); m.add_static(DLG_NULL, 0, PR("Nuovo codice "), 1, 2); int tab0 = 16; @@ -453,8 +456,6 @@ bool TQuery_mask::ask_new_code(const TCodice_articolo& oldcode, TCodice_articolo m.set(101, oldcode); m.set(201, newcode); } - m.add_button(DLG_OK, 0, "", -12, -1, 10, 2); - m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2); if (m.run() == K_ENTER) { @@ -649,7 +650,7 @@ bool TQuery_mask::copy_distinct(const TCodice_articolo& oldcode, bool TQuery_mask::restart_tree() { if (!_tree.restart()) - return FALSE; + return false; int d =get_int(F_MIN_DEPTH); int dir=1; // direzione di scorrimento albero do @@ -682,7 +683,7 @@ bool TQuery_mask::restart_tree() TTree_field& tf = tfield(F_TREE); tf.win().update_thumb(0, 0); tf.win().force_update(); - return TRUE; + return true; } bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) @@ -752,14 +753,14 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) { _tree.curr_id(_curr); TCodice_articolo code; _tree.curr_code(code); - set(F_CODICE, code); + set(F_CODICE, code, 0x2); } break; case DLG_SELECT: if (e == fe_button) { const TString& str = get(F_CODICE); - if (str.not_empty()) + if (str.full()) set(F_CODICEQ, str); else return false; @@ -829,7 +830,7 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) if (_tree.goto_root()) { - TIndwin iw(0, caption, FALSE, FALSE); + TIndwin iw(0, caption, false, false); _tree.explode(a.rows_array(), mb, gr, md, fi, sk, sp); } a.run(); @@ -900,7 +901,7 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) default: break; } - return TRUE; + return true; } bool TQuery_mask::redraw_tree(TField_event e) @@ -914,9 +915,9 @@ bool TQuery_mask::redraw_tree(TField_event e) return on_field_event((TOperable_field &)field(F_CODICE), fe_modify, 0l); } restart_tree(); - return TRUE; + return true; } - return FALSE; + return false; } @@ -980,7 +981,7 @@ void TDistinta_mask::sheetrighe_get(TSheet_field &fld_righe, int item) { TDistinta_mask &m=(TDistinta_mask &)fld_righe.mask(); // prende il record della riga corrente dal record array - TRectype &rec= fld_righe.record()->row(item, TRUE); + TRectype &rec= fld_righe.record()->row(item, true); TToken_string &row= fld_righe.row(item-1); // codici di livello row.add(m._livelli_giac->unpack_grpcode(rec.get("LIVELLO") ,1),fld_righe.cid2index(F_LIV1) ); @@ -993,7 +994,7 @@ void TDistinta_mask::sheetrighe_put(TSheet_field &fld_righe, int item) TDistinta_mask &m=(TDistinta_mask &)fld_righe.mask(); TToken_string &row= fld_righe.row(item-1); - TRectype &recrighe= fld_righe.record()->row(item, TRUE); + TRectype &recrighe= fld_righe.record()->row(item, true); // codici livello if (m._livelli_giac->enabled()) { @@ -1103,8 +1104,8 @@ void TDistinta_mask::set_um_rif(int row) if (r == row) { priga->add("X", chk); - set(F_UM, priga->get(cod), TRUE); - set(F_FCUMART, priga->get(fc), TRUE); + set(F_UM, priga->get(cod), true); + set(F_FCUMART, priga->get(fc), true); } else priga->add("", chk); @@ -1128,7 +1129,7 @@ bool TDistinta_mask::on_unitsheet_event(TOperable_field& o, TField_event e, long break; case se_query_add: if (!get_bool(F_VIRTUALE)) - return FALSE; + return false; break; case se_notify_add: if (jolly == 0L) @@ -1192,7 +1193,7 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long if (!code.blank()) { if (!test_row(row)) - return FALSE; + return false; for (int m = n - 1; m >= 0; m--) { const TToken_string& row = sheet.row(m); @@ -1324,7 +1325,7 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long default: break; } - return TRUE; + return true; } bool TDistinta_mask::on_parmsheet_event(TOperable_field& o, TField_event e, long jolly) @@ -1350,7 +1351,7 @@ bool TDistinta_mask::on_parmsheet_event(TOperable_field& o, TField_event e, long TDistinta_expr e; const TTypeexp exprtype = _tree.get_var_type(var); if (!e.set(expr, exprtype)) - return FALSE; + return false; for (int v = e.numvar()-1; v >= 0; v--) { @@ -1367,7 +1368,7 @@ bool TDistinta_mask::on_parmsheet_event(TOperable_field& o, TField_event e, long default: break; } - return TRUE; + return true; } @@ -1405,7 +1406,7 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol { case 'A': { - set(F_TIPO, "A", TRUE); + set(F_TIPO, "A", true); const TArticolo mag(code); set(F_DESCR, mag.get(ANAMAG_DESCR)); @@ -1416,7 +1417,7 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol break; case 'L': { - set(F_TIPO, "L", TRUE); + set(F_TIPO, "L", true); const TLavorazione lav(code); set(F_DESCR, lav.descr()); @@ -1425,7 +1426,7 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol } break; default: - set(F_TIPO, "V", TRUE); + set(F_TIPO, "V", true); // le distinte virtuali non possono essere master break; } @@ -1465,7 +1466,6 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol if (e == fe_button) { TSheet_field& sheet = o.mask().sfield(F_SHEET); - sheet.sort(); sheet.force_update(); } @@ -1619,7 +1619,7 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol else { - if (yesno_box("Vuoi stampare le etichette")) + if (yesno_box("Si desidera stampare le etichette")) { const long annoes = TDate(TODAY).year(); const TString codart(get(F_CODICE)); @@ -1650,14 +1650,14 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol } break; } - return TRUE; + return true; } TDistinta_mask::TDistinta_mask(TDistinta_tree& dt) : TAutomask("db0500b"), _tree(dt) { TSheet_field& sf = sfield(F_SHEET); - sf.set_append(FALSE); + sf.set_append(false); TMask& sm = sf.sheet_mask(); TString16 key; int i; @@ -1692,17 +1692,17 @@ TDistinta_mask::TDistinta_mask(TDistinta_tree& dt) cache().test_file_changes(LF_TAB); } - /////////////////////////////////////////////////////////// // TDistinta_app /////////////////////////////////////////////////////////// + bool TDistinta_app::user_create() { _therel = new TRelation(LF_DIST); _querymask = new TQuery_mask(_tree); _themask = new TDistinta_mask(_tree); - return TRUE; + return true; } bool TDistinta_app::user_destroy() @@ -1710,21 +1710,21 @@ bool TDistinta_app::user_destroy() delete _themask; delete _querymask; delete _therel; - return TRUE; + return true; } void TDistinta_app::init_insert_mode(TMask &m) { TSheet_field& f = m.sfield(F_UNITA); - if (f.items() == 0) + if (f.empty()) f.row(0) = " |1"; // aggiunge una riga allo sheet m.set(F_MASTER,"X"); } bool TDistinta_app::changing_mask(int mode) { - bool was_query = _mode == MODE_QUERY || _mode == MODE_QUERYINS; - bool is_query = mode == MODE_QUERY || mode == MODE_QUERYINS; + const bool was_query = _mode == MODE_QUERY || _mode == MODE_QUERYINS; + const bool is_query = mode == MODE_QUERY || mode == MODE_QUERYINS; return was_query != is_query; } @@ -1848,7 +1848,7 @@ bool TDistinta_app::parms2rel(const TMask& m) // Azzera albero per rispecchiare eventuali modifiche _querymask->restart_tree(); - return TRUE; + return true; } void TDistinta_app::remove_desc(const TMask& m) @@ -1895,7 +1895,7 @@ int TDistinta_app::write(const TMask& m) { TSheet_field& f = m.sfield(F_UNITA); // prende lo sheet delle unità di misura f.record()->renum_key(UMART_CODART, m.get(F_CODICE)); - err = f.record()->write(FALSE); + err = f.record()->write(false); } return err; } @@ -1909,7 +1909,7 @@ int TDistinta_app::rewrite(const TMask& m) { TSheet_field& f= m.sfield(F_UNITA); // prende lo sheet delle unità di misura f.record()->renum_key(UMART_CODART, m.get(F_CODICE)); - err = f.record()->write(TRUE); + err = f.record()->write(true); } return err; } diff --git a/db/db0500a.h b/db/db0500a.h index b74b453f8..6a3f0bade 100755 --- a/db/db0500a.h +++ b/db/db0500a.h @@ -20,6 +20,7 @@ #define F_MIN_DEPTH 516 #define F_SORTA 517 #define F_DESCRDIST 518 +#define F_NOSOSP 519 #define F_DESCR 520 #define F_ARTPROD 521 diff --git a/db/db0500a.uml b/db/db0500a.uml index 77a9ac815..5fff41cec 100755 --- a/db/db0500a.uml +++ b/db/db0500a.uml @@ -1,295 +1,295 @@ -#include "db0500a.h" - -TOOLBAR "topbar" 0 0 0 2 - -BUTTON DLG_SELECT 10 2 -BEGIN - PROMPT -16 -11 "~Selezione" - MESSAGE EXIT,K_ENTER - PICTURE TOOL_MULTISEL -END - -BUTTON DLG_NEWREC 10 2 -BEGIN - PROMPT -26 -11 "~Nuovo" - MESSAGE EXIT,K_INS - PICTURE TOOL_NEWREC -END - -BUTTON DLG_DELREC 10 2 -BEGIN - PROMPT -36 -11 "~Elimina" - MESSAGE EXIT,K_DEL - PICTURE TOOL_DELREC -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -66 -11 "~Fine" - MESSAGE EXIT,K_QUIT - PICTURE TOOL_QUIT -END - -ENDPAGE - -TOOLBAR "" 0 -2 0 2 - -BUTTON F_COPY 10 2 -BEGIN - PROMPT -12 -11 "~Copia" -END - -BUTTON F_EXPLODE 10 2 -BEGIN - PROMPT -22 -11 "E~splodi" -END - -ENDPAGE - -PAGE "Distinta base" 0 2 0 0 - -STRING DLG_PROFILE 30 -BEGIN - FLAGS "H" - PROMPT 1 1 "" - PSELECT -END - -STRING F_CODICE 20 -BEGIN - PROMPT 2 1 "Cerca " - FLAGS "GU" - USE LF_DIST - JOIN LF_ANAMAG INTO CODART==CODDIST - INPUT CODDIST F_CODICE - DISPLAY "Codice@20" CODDIST - DISPLAY "Descrizione@50" LF_ANAMAG->DESCR - OUTPUT F_CODICE CODDIST - OUTPUT F_DESCRDIST DESCR - CHECKTYPE REQUIRED - FIELD CODDIST - DEFAULT NONE -END - -STRING F_DESCRDIST 50 -BEGIN - PROMPT 34 1 "" - FLAGS "D" -END - -STRING F_CODICEQ 20 -BEGIN - PROMPT 2 2 "Articolo " - FIELD CODDIST - KEY 1 - USE LF_ANAMAG - JOIN LF_UMART INTO CODART=CODART NRIGA=1 - INPUT CODART F_CODICEQ - DISPLAY "Codice@20" CODART - DISPLAY "Descrizione@50" DESCR - OUTPUT F_CODICEQ CODART - CHECKTYPE REQUIRED - ADD RUN ve2 -3 - MESSAGE COPY,F_CODICE - FLAGS "U" - DEFAULT NONE -END - -STRING F_DESCR 50 40 -BEGIN - KEY 2 - PROMPT 34 2 "" - USE LF_ANAMAG KEY 2 - JOIN LF_UMART INTO CODART=CODART NRIGA=1 - INPUT DESCR F_DESCR - DISPLAY "Descrizione@50" DESCR - DISPLAY "Codice@20" CODART - OUTPUT F_CODICEQ CODART - OUTPUT F_CODICE CODART - CHECKTYPE NORMAL - ADD RUN ve2 -3 - FLAGS "U" - DEFAULT NONE -END - -NUMBER F_SORT 1 -BEGIN - PROMPT 2 3 "Ordinamento " - USE ORD - INPUT CODTAB F_SORT - DISPLAY "Codice ordinamento" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_SORT CODTAB - OUTPUT F_SORTDESC S0 - CHECKTYPE FORCED - FLAGS "U" - MESSAGE EMPTY "Immissione",F_SORTDESC - DEFAULT NONE -END - -STRING F_SORTDESC 30 -BEGIN - PROMPT 24 3 "" - FLAGS "D" - DEFAULT NONE -END - -STRING F_VAR_CODMAG 3 -BEGIN - FLAGS "U" - PROMPT 2 4 "Magazzino " - USE MAG SELECT CODTAB[4,5]="" - INPUT CODTAB F_VAR_CODMAG - DISPLAY "Magazzino" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_VAR_CODMAG CODTAB - CHECKTYPE FORCED -END -STRING F_VAR_CODDEP 2 -BEGIN - FLAGS "U" - PROMPT 22 4 "Deposito " - USE MAG - INPUT CODTAB[1,3] F_VAR_CODMAG - INPUT CODTAB[4,5] F_VAR_CODDEP - DISPLAY "Magazzino" CODTAB[1,3] - DISPLAY "Deposito" CODTAB[4,5] - DISPLAY "Descrizione@50" S0 - OUTPUT F_VAR_CODMAG CODTAB[1,3] - OUTPUT F_VAR_CODDEP CODTAB[4,5] - CHECKTYPE FORCED -END - -STRING F_VAR_IMPIANTO 5 -BEGIN - FLAGS "U" - PROMPT 2 5 "Impianto " - USE IMP - INPUT CODTAB F_VAR_IMPIANTO - DISPLAY "Codice " CODTAB - DISPLAY "Descrizione@50" S0 - OUPUT F_VAR_IMPIANTO CODTAB - MESSAGE CHECK, F_VAR_LINEA - CHECKTYPE FORCED -END - -STRING F_VAR_LINEA 5 -BEGIN - FLAGS "U" - PROMPT 22 5 "Linea " - USE LNP - INPUT CODTAB F_VAR_LINEA - DISPLAY "Codice " CODTAB - DISPLAY "Descrizione@50" S0 - DISPLAY "Impianto" S6 - OUPUT F_VAR_LINEA CODTAB - OUPUT F_VAR_IMPIANTO S6 - CHECKTYPE SEARCH -END - - -STRING F_VAR_LIV1 10 -BEGIN - FLAGS "U" - PROMPT 2 6 "Livello 1 " - USE GCG - INPUT CODTAB[1] "1" - INPUT CODTAB[2,20] F_VAR_LIV1 - DISPLAY "Codice " CODTAB[2,20] - DISPLAY "Descrizione@50" S0 - OUPUT F_VAR_LIV1 CODTAB[2,20] - CHECKTYPE FORCED -END - -STRING F_VAR_LIV2 6 -BEGIN - FLAGS "U" - PROMPT 25 6 "Livello 2" - USE GCG - INPUT CODTAB[1] "2" - INPUT CODTAB[2,20] F_VAR_LIV2 - DISPLAY "Codice " CODTAB[2,20] - DISPLAY "Descrizione@50" S0 - OUPUT F_VAR_LIV2 CODTAB[2,20] - CHECKTYPE FORCED -END - -STRING F_VAR_LIV3 6 -BEGIN - FLAGS "U" - PROMPT 44 6 "Livello 3" - USE GCG - INPUT CODTAB[1] "3" - INPUT CODTAB[2,20] F_VAR_LIV3 - DISPLAY "Codice " CODTAB[2,20] - DISPLAY "Descrizione@50" S0 - OUPUT F_VAR_LIV3 CODTAB[2,20] - CHECKTYPE FORCED -END - -STRING F_VAR_LIV4 6 -BEGIN - FLAGS "U" - PROMPT 64 6 "Livello 4" - USE GCG - INPUT CODTAB[1] "4" - INPUT CODTAB[2,20] F_VAR_LIV4 - DISPLAY "Codice " CODTAB[2,20] - DISPLAY "Descrizione@50" S0 - OUPUT F_VAR_LIV4 CODTAB[2,20] - CHECKTYPE FORCED -END - -TREE F_TREE -3 -1 -BEGIN - PROMPT 0 7 "" -END - -ENDPAGE - -PAGE "Visualizza" -1 -1 80 20 -BOOL F_HIDE_GHOST -BEGIN - FLAGS "FD" - PROMPT 2 2 "Nascondi le distinte virtuali non di produzione" - DEFAULT NONE -END -GROUPBOX DLG_NULL 78 8 -BEGIN - PROMPT 1 3 "@bDescrizione" -END -STRING F_DESCR_SEP 1 -BEGIN - PROMPT 2 4 "Separatore descrizione " -END -BOOL F_SHOW_QTA -BEGIN - PROMPT 2 5 "Mostra quantita'" -END -BOOL F_SHOW_LIV1 -BEGIN - PROMPT 2 6 "Mostra livello giacenza 1" -END -BOOL F_SHOW_LIV2 -BEGIN - PROMPT 2 7 "Mostra livello giacenza 2" -END -BOOL F_SHOW_LIV3 -BEGIN - PROMPT 2 8 "Mostra livello giacenza 3" -END -BOOL F_SHOW_LIV4 -BEGIN - PROMPT 2 9 "Mostra livello giacenza 4" -END - -NUMBER F_MIN_DEPTH 1 -BEGIN - PROMPT 2 11 "Espandi almeno al livello " -END - - -ENDPAGE - - -ENDMASK +#include "db0500a.h" + +TOOLBAR "topbar" 0 0 0 2 + +BUTTON DLG_SELECT 10 2 +BEGIN + PROMPT -16 -11 "Modifica" + MESSAGE EXIT,K_ENTER + PICTURE TOOL_EDIT +END + +BUTTON DLG_NEWREC 10 2 +BEGIN + PROMPT -26 -11 "~Nuovo" + MESSAGE EXIT,K_INS + PICTURE TOOL_NEWREC +END + +BUTTON DLG_DELREC 10 2 +BEGIN + PROMPT -36 -11 "~Elimina" + MESSAGE EXIT,K_DEL + PICTURE TOOL_DELREC +END + +BUTTON F_COPY 10 2 +BEGIN + PROMPT -12 -11 "~Copia" + PICTURE TOOL_COPY +END + +BUTTON F_EXPLODE 10 2 +BEGIN + PROMPT -22 -11 "E~splodi" + PICTURE TOOL_MULTISEL +END + +#include + +ENDPAGE + +PAGE "Distinta base" 0 2 0 0 + +STRING DLG_PROFILE 30 +BEGIN + FLAGS "H" + PROMPT 1 1 "" + PSELECT +END + +STRING F_CODICE 20 +BEGIN + PROMPT 2 1 "Cerca " + FLAGS "GUP" + USE LF_DIST + JOIN LF_ANAMAG INTO CODART==CODDIST + INPUT CODDIST F_CODICE + DISPLAY "Codice@20" CODDIST + DISPLAY "Descrizione@50" LF_ANAMAG->DESCR + OUTPUT F_CODICE CODDIST + OUTPUT F_DESCRDIST DESCR + CHECKTYPE REQUIRED + FIELD CODDIST + DEFAULT NONE +END + +STRING F_DESCRDIST 50 +BEGIN + PROMPT 34 1 "" + FLAGS "D" +END + +BOOLEAN F_NOSOSP +BEGIN + PROMPT 62 3 "Nascondi SOSPESI" +END + +STRING F_CODICEQ 20 +BEGIN + PROMPT 2 2 "Articolo " + FIELD CODDIST + KEY 1 + USE LF_ANAMAG SELECT SOSPESO!=#F_NOSOSP + JOIN LF_UMART INTO CODART=CODART NRIGA=1 + INPUT CODART F_CODICEQ + DISPLAY "Codice@20" CODART + DISPLAY "Descrizione@50" DESCR + DISPLAY "Sospeso@C" SOSPESO + OUTPUT F_CODICEQ CODART + OUTPUT F_CODICE CODART + CHECKTYPE REQUIRED + ADD RUN ve2 -3 + FLAGS "U" + DEFAULT NONE +END + +STRING F_DESCR 50 40 +BEGIN + KEY 2 + PROMPT 34 2 "" + USE LF_ANAMAG KEY 2 SELECT SOSPESO!=#F_NOSOSP + JOIN LF_UMART INTO CODART=CODART NRIGA=1 + INPUT DESCR F_DESCR + DISPLAY "Descrizione@50" DESCR + DISPLAY "Codice@20" CODART + DISPLAY "Sospeso@C" SOSPESO + OUTPUT F_CODICEQ CODART + OUTPUT F_CODICE CODART + CHECKTYPE NORMAL + ADD RUN ve2 -3 + FLAGS "U" + DEFAULT NONE +END + +NUMBER F_SORT 1 +BEGIN + PROMPT 2 3 "Ordinamento " + USE ORD + INPUT CODTAB F_SORT + DISPLAY "Codice ordinamento" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_SORT CODTAB + OUTPUT F_SORTDESC S0 + CHECKTYPE FORCED + FLAGS "U" + MESSAGE EMPTY "Immissione",F_SORTDESC + DEFAULT NONE +END + +STRING F_SORTDESC 30 +BEGIN + PROMPT 24 3 "" + FLAGS "D" + DEFAULT NONE +END + +STRING F_VAR_CODMAG 3 +BEGIN + FLAGS "U" + PROMPT 2 4 "Magazzino " + USE MAG SELECT CODTAB[4,5]="" + INPUT CODTAB F_VAR_CODMAG + DISPLAY "Magazzino" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_VAR_CODMAG CODTAB + CHECKTYPE FORCED +END +STRING F_VAR_CODDEP 2 +BEGIN + FLAGS "U" + PROMPT 22 4 "Deposito " + USE MAG + INPUT CODTAB[1,3] F_VAR_CODMAG + INPUT CODTAB[4,5] F_VAR_CODDEP + DISPLAY "Magazzino" CODTAB[1,3] + DISPLAY "Deposito" CODTAB[4,5] + DISPLAY "Descrizione@50" S0 + OUTPUT F_VAR_CODMAG CODTAB[1,3] + OUTPUT F_VAR_CODDEP CODTAB[4,5] + CHECKTYPE FORCED +END + +STRING F_VAR_IMPIANTO 5 +BEGIN + FLAGS "U" + PROMPT 2 5 "Impianto " + USE IMP + INPUT CODTAB F_VAR_IMPIANTO + DISPLAY "Codice " CODTAB + DISPLAY "Descrizione@50" S0 + OUPUT F_VAR_IMPIANTO CODTAB + MESSAGE CHECK, F_VAR_LINEA + CHECKTYPE FORCED +END + +STRING F_VAR_LINEA 5 +BEGIN + FLAGS "U" + PROMPT 22 5 "Linea " + USE LNP + INPUT CODTAB F_VAR_LINEA + DISPLAY "Codice " CODTAB + DISPLAY "Descrizione@50" S0 + DISPLAY "Impianto" S6 + OUPUT F_VAR_LINEA CODTAB + OUPUT F_VAR_IMPIANTO S6 + CHECKTYPE SEARCH +END + + +STRING F_VAR_LIV1 10 +BEGIN + FLAGS "U" + PROMPT 2 6 "Livello 1 " + USE GCG + INPUT CODTAB[1] "1" + INPUT CODTAB[2,20] F_VAR_LIV1 + DISPLAY "Codice " CODTAB[2,20] + DISPLAY "Descrizione@50" S0 + OUPUT F_VAR_LIV1 CODTAB[2,20] + CHECKTYPE FORCED +END + +STRING F_VAR_LIV2 6 +BEGIN + FLAGS "U" + PROMPT 25 6 "Livello 2" + USE GCG + INPUT CODTAB[1] "2" + INPUT CODTAB[2,20] F_VAR_LIV2 + DISPLAY "Codice " CODTAB[2,20] + DISPLAY "Descrizione@50" S0 + OUPUT F_VAR_LIV2 CODTAB[2,20] + CHECKTYPE FORCED +END + +STRING F_VAR_LIV3 6 +BEGIN + FLAGS "U" + PROMPT 44 6 "Livello 3" + USE GCG + INPUT CODTAB[1] "3" + INPUT CODTAB[2,20] F_VAR_LIV3 + DISPLAY "Codice " CODTAB[2,20] + DISPLAY "Descrizione@50" S0 + OUPUT F_VAR_LIV3 CODTAB[2,20] + CHECKTYPE FORCED +END + +STRING F_VAR_LIV4 6 +BEGIN + FLAGS "U" + PROMPT 64 6 "Livello 4" + USE GCG + INPUT CODTAB[1] "4" + INPUT CODTAB[2,20] F_VAR_LIV4 + DISPLAY "Codice " CODTAB[2,20] + DISPLAY "Descrizione@50" S0 + OUPUT F_VAR_LIV4 CODTAB[2,20] + CHECKTYPE FORCED +END + +TREE F_TREE -3 -1 +BEGIN + PROMPT 0 7 "" +END + +ENDPAGE + +PAGE "Opzioni" -1 -1 80 20 +BOOL F_HIDE_GHOST +BEGIN + FLAGS "FD" + PROMPT 2 2 "Nascondi le distinte virtuali non di produzione" + DEFAULT NONE +END +GROUPBOX DLG_NULL 78 8 +BEGIN + PROMPT 1 3 "@bDescrizione" +END +STRING F_DESCR_SEP 1 +BEGIN + PROMPT 2 4 "Separatore descrizione " +END +BOOL F_SHOW_QTA +BEGIN + PROMPT 2 5 "Mostra quantita'" +END +BOOL F_SHOW_LIV1 +BEGIN + PROMPT 2 6 "Mostra livello giacenza 1" +END +BOOL F_SHOW_LIV2 +BEGIN + PROMPT 2 7 "Mostra livello giacenza 2" +END +BOOL F_SHOW_LIV3 +BEGIN + PROMPT 2 8 "Mostra livello giacenza 3" +END +BOOL F_SHOW_LIV4 +BEGIN + PROMPT 2 9 "Mostra livello giacenza 4" +END + +NUMBER F_MIN_DEPTH 1 +BEGIN + PROMPT 2 11 "Espandi almeno al livello " +END + + +ENDPAGE + + +ENDMASK diff --git a/db/db0500b.uml b/db/db0500b.uml index 8ffbd4dc2..cbf97b50c 100755 --- a/db/db0500b.uml +++ b/db/db0500b.uml @@ -6,9 +6,9 @@ ENDPAGE PAGE "Distinta" -1 -1 80 20 -GROUPBOX DLG_NULL 78 3 +GROUPBOX DLG_NULL 78 5 BEGIN - PROMPT 1 0 "Distinta" + PROMPT 1 0 "@bDistinta" END STRING F_CODICE 20 @@ -19,7 +19,6 @@ BEGIN FIELD CODDIST END - LIST F_TIPO 1 12 BEGIN PROMPT 54 1 "Tipo " @@ -41,14 +40,9 @@ BEGIN FIELD VIRTUALE END -GROUPBOX DLG_NULL 78 7 -BEGIN - PROMPT 1 2 "" -END - STRING F_DESCR 50 BEGIN - PROMPT 2 3 "Descrizione " + PROMPT 2 2 "Descrizione " FIELD DESCR GROUP 1 FLAGS "D" @@ -56,10 +50,15 @@ END ZOOM F_NOTE 50 BEGIN - PROMPT 2 4 "Annotazioni " + PROMPT 2 3 "Annotazioni " FIELD NOTE END +GROUPBOX DLG_NULL 78 5 +BEGIN + PROMPT 1 4 "" +END + BOOLEAN F_ARTPROD BEGIN PROMPT 2 5 "Articolo di produzione" @@ -137,9 +136,9 @@ BEGIN CHECKTYPE NORMAL END -BUTTON F_SORTA 15 +BUTTON F_SORTA 17 BEGIN - PROMPT 60 7 "Ordina per codice" + PROMPT 58 7 "Ordina per codice" END NUMBER F_SORT 1 diff --git a/db/db0500c.uml b/db/db0500c.uml index 256b258d6..02f63ac40 100755 --- a/db/db0500c.uml +++ b/db/db0500c.uml @@ -78,14 +78,17 @@ BEGIN ITEM "5|Raggruppa all'unita' di misura di distinta" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -12 -1 "" END -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -22 -1 "" -END +#include + +ENDPAGE ENDMASK diff --git a/db/db0500d.uml b/db/db0500d.uml index 7d25c28fc..1002cf1e7 100755 --- a/db/db0500d.uml +++ b/db/db0500d.uml @@ -1,5 +1,15 @@ #include "db0500a.h" +TOOLBAR "topbar" 0 0 0 2 +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -12 -1 "" +END + +#include + +ENDPAGE + PAGE "Movimenti" -1 -1 80 21 DATE F_DATAREG @@ -155,15 +165,7 @@ BEGIN CHECKTYPE NORMAL ADD RUN CG0 -1 END - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -22 -1 "" -END +ENDPAGE ENDMASK