From c957e734e46c2195819c34a6e33f8e8e5cfdf9ee Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 24 Jun 2011 14:22:03 +0000 Subject: [PATCH] Patch level :10.0 Files correlati : Ricompilazione Demo : [ ] Commento : Personalizzazione cigno: sistemata maschera di riga dello sheet principale git-svn-id: svn://10.65.10.50/branches/R_10_00@22322 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ps/ps0430300.cpp | 70 +++++------ ps/ps0430300a.h | 55 ++++----- ps/ps0430300a.uml | 291 ++++++++++++++++++++++++++-------------------- 3 files changed, 227 insertions(+), 189 deletions(-) diff --git a/ps/ps0430300.cpp b/ps/ps0430300.cpp index 6f627048e..3512d18f1 100755 --- a/ps/ps0430300.cpp +++ b/ps/ps0430300.cpp @@ -273,34 +273,34 @@ void TGenera_ordini_mask::update_sheet() TToken_string & row = sf.row(i); const TString & codart = recset.get(LF_ANAMAG, ANAMAG_CODART).as_string(); - row.add(codart, sf.cid2index(F_CODART)); + row.add(codart, sf.cid2index(SO_CODART)); art.read(codart); const real giac = art.giacenza_anno(codmag, "", anno); - row.add(recset.get(LF_ANAMAG, ANAMAG_DESCR).as_string(), sf.cid2index(F_DESCR)); - row.add(recset.get("UMART.UM").as_string(), sf.cid2index(F_UM)); + row.add(recset.get(LF_ANAMAG, ANAMAG_DESCR).as_string(), sf.cid2index(SO_DESCR)); + row.add(recset.get("UMART.UM").as_string(), sf.cid2index(SO_UM)); const long codforn = recset.get(LF_ANAMAG, ANAMAG_CODFORN).as_int(); - row.add(codforn, sf.cid2index(F_FORNITORE)); - row.add(recset.get("CLIFO.RAGSOC").as_string(), sf.cid2index(F_RAGSOC)); - row.add(recset.get(LF_ANAMAG, ANAMAG_GIORNIRIOR).as_string(), sf.cid2index(F_LEADTIME)); - row.add(recset.get(LF_ANAMAG, ANAMAG_LOTTORIOR).as_string(), sf.cid2index(F_LOTTOMIN)); - row.add(recset.get(LF_ANAMAG, ANAMAG_DESCRAGG).as_string(), sf.cid2index(F_DESCRAGG)); - row.add(giac.string(), sf.cid2index(F_GIACENZA)); + row.add(codforn, sf.cid2index(SO_FORNITORE)); + row.add(recset.get("CLIFO.RAGSOC").as_string(), sf.cid2index(SO_RAGSOC)); + row.add(recset.get(LF_ANAMAG, ANAMAG_GIORNIRIOR).as_string(), sf.cid2index(SO_LEADTIME)); + row.add(recset.get(LF_ANAMAG, ANAMAG_LOTTORIOR).as_string(), sf.cid2index(SO_LOTTOMIN)); + row.add(recset.get(LF_ANAMAG, ANAMAG_DESCRAGG).as_string(), sf.cid2index(SO_DESCRAGG)); + row.add(giac.string(), sf.cid2index(SO_GIACENZA)); - row.add(recset.get(LF_ANAMAG, ANAMAG_PPCONF).as_string(), sf.cid2index(F_PPCONF)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER1).as_string(), sf.cid2index(F_USER1)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER2).as_string(), sf.cid2index(F_USER2)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER3).as_string(), sf.cid2index(F_USER3)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER4).as_string(), sf.cid2index(F_USER4)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER5).as_string(), sf.cid2index(F_USER5)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER6).as_string(), sf.cid2index(F_USER6)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER7).as_string(), sf.cid2index(F_USER7)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER8).as_string(), sf.cid2index(F_USER8)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER9).as_string(), sf.cid2index(F_USER9)); - row.add(recset.get(LF_ANAMAG, ANAMAG_USER10).as_string(), sf.cid2index(F_USER10)); + row.add(recset.get(LF_ANAMAG, ANAMAG_PPCONF).as_string(), sf.cid2index(SO_PPCONF)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER1).as_string(), sf.cid2index(SO_USER1)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER2).as_string(), sf.cid2index(SO_USER2)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER3).as_string(), sf.cid2index(SO_USER3)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER4).as_string(), sf.cid2index(SO_USER4)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER5).as_string(), sf.cid2index(SO_USER5)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER6).as_string(), sf.cid2index(SO_USER6)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER7).as_string(), sf.cid2index(SO_USER7)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER8).as_string(), sf.cid2index(SO_USER8)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER9).as_string(), sf.cid2index(SO_USER9)); + row.add(recset.get(LF_ANAMAG, ANAMAG_USER10).as_string(), sf.cid2index(SO_USER10)); const real disp = art.disponibilita(codes, get(F_MAG), NULL); - row.add(disp.string(), sf.cid2index(F_DISPON)); + row.add(disp.string(), sf.cid2index(SO_DISPON)); sf.check_row(i); if (check_expr) { @@ -742,7 +742,7 @@ void TGenera_ordini_mask::on_idle() { //si posiziona sulla qta TSheet_field& sf_righe = sfield(F_ARTICLES); - const int column = sf_righe.cid2index(F_QTA); + const int column = sf_righe.cid2index(SO_QTA); sf_righe.select(_riga_da_selezionare, column, true); _riga_da_selezionare = -1; sf_righe.set_focus(); @@ -780,8 +780,8 @@ TGenera_ordini_mask::TGenera_ordini_mask() for (int i = 1; i <= 10; i++) { - const int col = sh.cid2index(F_USER1 + i -1); - TEditable_field & f = sh_mask.efield(F_USER1 + i - 1); + const int col = sh.cid2index(SO_USER1 + i -1); + TEditable_field & f = sh_mask.efield(SO_USER1 + i - 1); if (c.get_bool("CHK_USER", "ve", i) && c.get_bool("USERDEF", "or", i)) { @@ -922,7 +922,7 @@ void TCreazione_ordini::generate_caric_row(const TSheet_field& sf, TToken_string void TCreazione_ordini::generate_order_row(const TSheet_field& sf, TToken_string* row, const real qta, TDocumento* d, TRiga_documento& rdoc, const TRectype& forn, const TRectype& fornven) { - const TString codart = row->get(sf.cid2index(F_CODART)); + const TString codart = row->get(sf.cid2index(SO_CODART)); TString8 codmag = _mask->get(F_MAG); codmag.right_just(3); @@ -939,19 +939,19 @@ void TCreazione_ordini::generate_order_row(const TSheet_field& sf, TToken_string rdoc.put(RDOC_CODART, codart); rdoc.put(RDOC_CODARTMAG, codart); rdoc.put(RDOC_CHECKED, "X"); - rdoc.put(RDOC_DESCR, row->get(sf.cid2index(F_DESCR))); + rdoc.put(RDOC_DESCR, row->get(sf.cid2index(SO_DESCR))); - const TString descr_agg = row->get(sf.cid2index(F_DESCRAGG)); + const TString descr_agg = row->get(sf.cid2index(SO_DESCRAGG)); if (descr_agg.full()) { rdoc.put(RDOC_DESCLUNGA, "X"); rdoc.put(RDOC_DESCEST, descr_agg); } - rdoc.put(RDOC_UMQTA, row->get(sf.cid2index(F_UM))); + rdoc.put(RDOC_UMQTA, row->get(sf.cid2index(SO_UM))); rdoc.put(RDOC_QTA, qta); - const TDate datacons(row->get(sf.cid2index(F_DATACONS))); + const TDate datacons(row->get(sf.cid2index(SO_DATACONS))); rdoc.put(RDOC_DATACONS, datacons); const TRectype& articolo = cache().get(LF_ANAMAG, codart); @@ -978,10 +978,10 @@ void TCreazione_ordini::generate_order_row(const TSheet_field& sf, TToken_string for (int i = 0; i < 10 ; i++) if (_userfld.row(i).full()) - rdoc.put(_userfld.row(i), _mask->get(F_USER1 + i)); + rdoc.put(_userfld.row(i), _mask->get(SO_USER1 + i)); - rdoc.put(RDOC_CODAGG1, row->get(sf.cid2index(F_CODAGG1))); - rdoc.put(RDOC_CODAGG2, row->get(sf.cid2index(F_CODAGG2))); + rdoc.put(RDOC_CODAGG1, row->get(sf.cid2index(SO_CODAGG1))); + rdoc.put(RDOC_CODAGG2, row->get(sf.cid2index(SO_CODAGG2))); } @@ -1049,9 +1049,9 @@ void TCreazione_ordini::generate_docs_head(const char type, const TSheet_field& } else { - qta = row->get(sf.cid2index(F_QTA)); - codforn = row->get(sf.cid2index(F_FORNITORE)); - datacons = row->get(sf.cid2index(F_DATACONS)); + qta = row->get(sf.cid2index(SO_QTA)); + codforn = row->get(sf.cid2index(SO_FORNITORE)); + datacons = row->get(sf.cid2index(SO_DATACONS)); } if (!qta.is_zero()) diff --git a/ps/ps0430300a.h b/ps/ps0430300a.h index e1175fd2e..4377f25d4 100755 --- a/ps/ps0430300a.h +++ b/ps/ps0430300a.h @@ -38,33 +38,34 @@ #define F_DATADOCCAR 204 #define F_ORDERS 210 -#define F_CODART 101 -#define F_DESCR 102 -#define F_UM 103 -#define F_QTA 104 -#define F_DATACONS 105 -#define F_FORNITORE 106 -#define F_RAGSOC 107 -#define F_CDC 108 -#define F_FSC 109 -#define F_CODAGG1 110 -#define F_CODAGG2 111 -#define F_LEADTIME 112 -#define F_LOTTOMIN 113 -#define F_DESCRAGG 114 -#define F_GIACENZA 115 -#define F_PPCONF 116 -#define F_DISPON 117 -#define F_USER1 118 -#define F_USER2 119 -#define F_USER3 120 -#define F_USER4 121 -#define F_USER5 122 -#define F_USER6 123 -#define F_USER7 124 -#define F_USER8 125 -#define F_USER9 126 -#define F_USER10 127 +//campi 'S'heet deglio 'O'rdini (SO_) +#define SO_CODART 101 +#define SO_DESCR 102 +#define SO_UM 103 +#define SO_QTA 104 +#define SO_DATACONS 105 +#define SO_FORNITORE 106 +#define SO_RAGSOC 107 +#define SO_CDC 108 +#define SO_FSC 109 +#define SO_CODAGG1 110 +#define SO_CODAGG2 111 +#define SO_LEADTIME 112 +#define SO_LOTTOMIN 113 +#define SO_DESCRAGG 114 +#define SO_GIACENZA 115 +#define SO_PPCONF 116 +#define SO_DISPON 117 +#define SO_USER1 118 +#define SO_USER2 119 +#define SO_USER3 120 +#define SO_USER4 121 +#define SO_USER5 122 +#define SO_USER6 123 +#define SO_USER7 124 +#define SO_USER8 125 +#define SO_USER9 126 +#define SO_USER10 127 #define S_DATADOC 101 #define S_NUMDOC 102 diff --git a/ps/ps0430300a.uml b/ps/ps0430300a.uml index 0459dec50..5e268b6d1 100755 --- a/ps/ps0430300a.uml +++ b/ps/ps0430300a.uml @@ -539,185 +539,222 @@ ENDPAGE PAGE "Righe ordine" -1 -1 80 20 -ST 101 20 -BE -PR 1 2 "Codice " -FL "D" -EN -ST 102 50 35 -BE -PR 42 2 "" -FL "D" -EN -ST 103 2 -BE -PR 2 4 "Unitą di misura " -FL "UG" -US 49 KE 2 SE CODART==#101 -JO %UMS INTO CODTAB==UM -IN CODART 101 SE -IN UM 103 -DI "U.M.@10" UM -DI "Descrizione@50" %UMS->S0 -DI "F.C.@10" FC -OU 103 UM -CH REQUIRED -EN - -NUMBER F_QTA 13 5 +STRING SO_CODART 20 BEGIN - PROMPT 25 4 "Quantitą " + PROMPT 1 2 "Articolo " + FLAGS "D" END -DATA F_DATACONS +STRING SO_DESCR 50 38 BEGIN - PROMPT 48 4 "Data di consegna " + PROMPT 32 2 "" + FLAGS "D" +END + +STRING SO_UM 2 +BEGIN + PROMPT 1 3 "U.M. " + USE LF_UMART KEY 2 SELECT CODART==#SO_CODART + JOIN %UMS INTO CODTAB==UM + INPUT CODART SO_CODART SELECT + INPUT UM SO_UM + DISPLAY "U.M." UM + DISPLAY "Descrizione@50" %UMS->S0 + DISPLAY "F.C.@10" FC + OUTPUT SO_UM UM + CHECKTYPE REQUIRED + FLAGS "UG" +END + +NUMBER SO_QTA 13 5 +BEGIN + PROMPT 16 3 "Quantitą " +END + +DATA SO_DATACONS +BEGIN + PROMPT 43 3 "Data di consegna " WARNING "Indicare la data di consegna" VALIDATE 12 1 104 END -NU 106 6 -BE -PR 2 6 "Codice fornitore " -FI CODCF -US 20 -FL "D" -IN TIPOCF "F" -IN CODCF 106 -DI "Codice " CODCF -DI "Ragione sociale@50" RAGSOC -OU 106 CODCF -OU 107 RAGSOC -CH NORMAL -ADD RU CG0 -1 -EN -ST 107 50 35 -BE -FL "D" -PR 42 6 "" -US 20 KE 2 -IN TIPOCF "F" -IN RAGSOC 107 -DI "Ragione sociale@50" RAGSOC -DI "Codice " CODCF -CO OU 106 -CH SE -ADD RU CG0 -1 -EN -ST 108 20 -BE -PR 2 8 "CDC/Commessa " -FL "DUZ" -US CMS -IN CODTAB 108 -DI "Codice@20" CODTAB -DI "Descrizione@70" S0 -OU 108 CODTAB -CH NORMAL -EN -ST 109 10 -BE -PR 42 8 "Fase " -FL "DUZ" -US FSC -IN CODTAB 109 -DI "Codice@20" CODTAB -DI "Descrizione@70" S0 -OU 109 CODTAB -CH NORMAL -EN - -STRING F_CODAGG1 20 +NUMBER SO_FORNITORE 6 BEGIN - PROMPT 2 9 "ID Cespite " + PROMPT 1 5 "Fornitore " + FIELD CODCF + USE LF_CLIFO + INPUT TIPOCF "F" + INPUT CODCF SO_FORNITORE + DISPLAY "Codice" CODCF + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT SO_FORNITORE CODCF + OUTPUT SO_RAGSOC RAGSOC + CHECKTYPE NORMAL + FLAGS "D" END -ST 111 20 -BE -PR 42 9 "Codice agg. 2 " -FL "D" -EN -NU 112 5 -BE -PR 2 11 "Lead time " -FL "D" -EN -NU 113 10 3 -BE -PR 42 11 "Lotto " -FL "D" -EN -ME 114 50 4 -BE -PR 2 12 "Descr.aggiuntiva" -FL "D" -EN -NU 115 15 5 -BE -PR 2 16 "Giacenza" -FL "D" -EN -NU 116 15 -BE -PR 42 16 "Pezzi per conf. " -FL "D" -EN -NU 117 15 5 -BE -PR 2 17 "Disponibilitą" -FL "D" -EN +STRING SO_RAGSOC 50 +BEGIN + FLAGS "D" + PROMPT 20 5 "" + USE LF_CLIFO KEY 2 + INPUT TIPOCF "F" + INPUT RAGSOC SO_RAGSOC + DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Codice" CODCF + COPY OUTPUT SO_FORNITORE + CHECKTYPE SEARCH +END + +//versione 3.2 +STRING SO_CDC 20 +BEGIN + PROMPT 1 8 "Commessa " + USE CMS + INPUT CODTAB SO_CDC + DISPLAY "Codice@20" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT SO_CDC CODTAB + CHECKTYPE NORMAL + FLAGS "DUZ" +END + +/* Versione 10.0 +STRING SO_CDC 20 +BEGIN + PROMPT 1 8 "Commessa " + USE LF_COMMESSE + INPUT CODCMS SO_CDC + DISPLAY "Codice@20" CODCMS + DISPLAY "Descrizione@50" DESCRIZ + OUTPUT SO_CDC CODCMS + CHECKTYPE NORMAL + FLAGS "D" +END*/ + +//versione 3.2 +STRING SO_FSC 10 +BEGIN + PROMPT 45 8 "Fase " + USE FSC + INPUT CODTAB SO_FSC + DISPLAY "Codice@20" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT SO_FSC CODTAB + CHECKTYPE NORMAL + FLAGS "DUZ" +END + +/* Versione 10.0 (deve essere legabile alla commessa!!) +STRING SO_FSC 10 +BEGIN + PROMPT 45 8 "Fase " + USE LF_FASI + INPUT CODFASE SO_FSC SELECT CODCMSFAS==#SO_CDC + DISPLAY "Codice@20" CODFASE + DISPLAY "Descrizione@50" descriz + OUTPUT SO_FSC CODfase + CHECKTYPE NORMAL + FLAGS "DUZ" +END*/ + +STRING SO_CODAGG1 20 +BEGIN + PROMPT 1 7 "Cespite " +END + +STRING SO_CODAGG2 20 +BEGIN + PROMPT 37 7 "Codice agg.2 " + FLAGS "D" +END + +NUMBER SO_LEADTIME 5 +BEGIN + PROMPT 1 15 "Lead time " + FLAGS "D" +END + +NUMBER SO_LOTTOMIN 10 3 +BEGIN + PROMPT 19 15 "Lotto " + FLAGS "D" +END + +MEMO SO_DESCRAGG 50 4 +BEGIN + PROMPT 1 10 "Descr.aggiuntiva" + FLAGS "D" +END + +NUMBER SO_GIACENZA 15 5 +BEGIN + PROMPT 1 17 "Giacenza" + FLAGS "D" +END + +NUMBER SO_PPCONF 15 +BEGIN + PROMPT 38 15 "Pezzi per conf. " + FLAGS "D" +END + +NUMBER SO_DISPON 15 5 +BEGIN + PROMPT 39 17 "Disponibilita' " + FLAGS "D" +END ENDPAGE PAGE "Campi Utente" -1 -1 80 20 -ST 118 20 +ST SO_USER1 20 BE PR 2 2 "Campo utente 1 " FL "D" EN -ST 119 20 +ST SO_USER2 20 BE PR 2 4 "Campo utente 2 " FL "D" EN -ST 120 20 +ST SO_USER3 20 BE PR 2 6 "Campo utente 3 " FL "D" EN -ST 121 20 +ST SO_USER4 20 BE PR 2 8 "Campo utente 4 " FL "D" EN -ST 122 20 +ST SO_USER5 20 BE PR 2 10 "Campo utente 5 " FL "D" EN -ST 123 20 +ST SO_USER6 20 BE PR 2 12 "Campo utente 6 " FL "D" EN -ST 124 20 +ST SO_USER7 20 BE PR 2 14 "Campo utente 7 " FL "D" EN -ST 125 20 +ST SO_USER8 20 BE PR 2 16 "Campo utente 8 " FL "D" EN -ST 126 20 +ST SO_USER9 20 BE PR 2 18 "Campo utente 9 " FL "D" EN -ST 127 20 +ST SO_USER10 20 BE PR 2 20 "Campo utente 10 " FL "D"