From 39b4c1f64719fca216ceacc679e92128b7859399 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 21 Jun 2010 14:05:55 +0000 Subject: [PATCH] Patch level : 10.0 patch 767 Files correlati : mr0.exe mr2.exe Ricompilazione Demo : [ ] Commento : rimappati in caratteri - in _ nei codici letti da terminale risistemata chiusura produzione Evidenziazione delle righe di vincolo speciale Dalla versione 3.2 git-svn-id: svn://10.65.10.50/trunk@20592 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mr/f153.dir | 2 +- mr/f153.trr | 3 ++- mr/mr0500.cpp | 17 ++++++++++++++++- mr/mr0500a.h | 3 +++ mr/mr0500a.uml | 40 +++++++++++++++++++++++++++++++++++++++- mr/mr2200.cpp | 6 +++--- mr/mr2200a.uml | 4 ++-- mr/mr2201.cpp | 2 +- 8 files changed, 67 insertions(+), 10 deletions(-) diff --git a/mr/f153.dir b/mr/f153.dir index e9042c87a..b32ae2e13 100755 --- a/mr/f153.dir +++ b/mr/f153.dir @@ -1,3 +1,3 @@ 153 0 -$rrilprod|0|0|93|0|Righe rilevazione produzione||| +$rrilprod|0|0|109|0|Righe rilevazione produzione||| diff --git a/mr/f153.trr b/mr/f153.trr index 7aaedaacb..b2b99b570 100755 --- a/mr/f153.trr +++ b/mr/f153.trr @@ -1,5 +1,5 @@ 153 -10 +11 CODART|1|20|0|Codice articolo DATA|5|8|0|Data consegna PROG|2|3|0|Progressivo @@ -10,5 +10,6 @@ DATAFINE|5|8|0|Data fine produzione ORAFINE|1|6|0|Ora fine produzione QTA|4|15|5|Quantità prodotta SCARTO|4|15|4|Scarto di produzione +OPERATORE|1|16|0|Operatore 1 CODART+DATA+PROG+NRIGA| diff --git a/mr/mr0500.cpp b/mr/mr0500.cpp index c29d79211..875c2b610 100755 --- a/mr/mr0500.cpp +++ b/mr/mr0500.cpp @@ -381,6 +381,7 @@ void TRilprod_mask::load_prod_file(const char * nomefile, bool savefile, bool on TString h; real qta; real scarto; + TString operatore; rigaord.zero(); @@ -407,7 +408,10 @@ void TRilprod_mask::load_prod_file(const char * nomefile, bool savefile, bool on const TRectype & doc = cache().get(LF_DOC, key); datao = doc.get_date("DATADOC"); } - TString codart_new(rec.get(cod_field)); codart_new.trim(); + TString codart_new(rec.get(cod_field)); + + codart_new.trim(); + codart_new.replace('-', '_'); const int err = prd.read_ordp(codnum, anno, 'D', ndoc, nriga); TDate datarec; bool nuovo = (err != NOERR); @@ -512,7 +516,13 @@ void TRilprod_mask::load_prod_file(const char * nomefile, bool savefile, bool on if (name == "SCARTO") scarto = (real) val; else + { + if (name == "CODART") + val.replace('-', '_'); prd.put(name, val); + if (name == "OPERATORE") + operatore = val; + } } } @@ -549,6 +559,7 @@ void TRilprod_mask::load_prod_file(const char * nomefile, bool savefile, bool on TRectype & row = prd.body().row(rows + 1, true); row.put("DATAINI", d); row.put("ORAINI", h); + row.put("OPERATORE", operatore); } if (nuovo) prd.write(); @@ -788,6 +799,8 @@ int TRilprod_app::read( TMask& m ) r.add(orafin.right(2)); r.add(row.get("QTA")); r.add(row.get("SCARTO")); + r.add(row.get("OPERATORE")); + sh.check_row(i); } const bool on = m.sfield(F_TEMPI).items() == 0; @@ -835,6 +848,7 @@ int TRilprod_app::write( const TMask& m ) row.put("ORAFINE", ora); row.put("QTA", r.get()); row.put("SCARTO", r.get()); + row.put("OPERATORE", r.get()); } const int err = p.write(); @@ -882,6 +896,7 @@ int TRilprod_app::rewrite( const TMask& m ) row.put("ORAFINE", ora); row.put("QTA", r.get()); row.put("SCARTO", r.get()); + row.put("OPERATORE", r.get()); } return p.rewrite(); } diff --git a/mr/mr0500a.h b/mr/mr0500a.h index 38adf83fd..94768207e 100755 --- a/mr/mr0500a.h +++ b/mr/mr0500a.h @@ -46,3 +46,6 @@ #define FR_SECFIN 108 #define FR_QTA 109 #define FR_SCARTO 110 +#define FR_OPERATORE 111 +#define FR_COGNOME 112 +#define FR_NOME 113 diff --git a/mr/mr0500a.uml b/mr/mr0500a.uml index b72c266b8..1448d05e7 100755 --- a/mr/mr0500a.uml +++ b/mr/mr0500a.uml @@ -425,13 +425,16 @@ BEGIN ITEM "Secondo" ITEM "Quantità prodotta" ITEM "Scarto@15" + ITEM "Operatore@16" + ITEM "Cognome@40" + ITEM "Nome@30" END ENDPAGE ENDMASK -PAGE "Tempi" -1 -1 80 11 +PAGE "Tempi" -1 -1 80 13 GROUPBOX DLG_NULL 38 3 BEGIN @@ -510,6 +513,41 @@ BEGIN FIELD SCARTO END +STRING FR_OPERATORE 16 +BEGIN + PROMPT 1 9 "Operatore " + USE DIP + INPUT CODTAB FR_OPERATORE + DISPLAY "Codice" CODTAB + DISPLAY "Cognome@40" S0[1,40] + DISPLAY "Nome@30" S0[41,70] + OUTPUT FR_OPERATORE CODTAB + OUTPUT FR_COGNOME S0[1,40] + OUTPUT FR_NOME S0[41,70] + CHECKTYPE NORMAL + FIELD OPERATORE +END + +STRING FR_COGNOME 40 25 +BEGIN + PROMPT 30 9 "" + USE DIP KEY 2 + INPUT S0[1,40] FR_COGNOME + INPUT S0[41,70] FR_NOME + DISPLAY "Cognome@40" S0[1,40] + DISPLAY "Nome@30" S0[41,70] + DISPLAY "Codice" CODTAB + COPY OUTPUT FR_OPERATORE + CHECKTYPE SEARCH +END + +STRING FR_NOME 30 18 +BEGIN + PROMPT 59 9 "" + COPY ALL FR_COGNOME + CHECKTYPE SEARCH +END + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" diff --git a/mr/mr2200.cpp b/mr/mr2200.cpp index 905266044..96e8a0459 100755 --- a/mr/mr2200.cpp +++ b/mr/mr2200.cpp @@ -1035,7 +1035,7 @@ void TPlanning_mask::fill_sheet() TString8 codnum = curr_constraint->da_rdoc_key().left(4); codnum.trim(); - const bool special = test_special(codnum); + special = test_special(codnum); int new_row = -1; for (int nrow = sf.items() - 1; nrow >=0; nrow--) @@ -1071,9 +1071,9 @@ void TPlanning_mask::fill_sheet() sf.insert(new_row); TToken_string& row = sf.row(new_row); line.fill_sheet_row(row, *this, ""); - highlight_row(new_row, special); + highlight_row(sf.items()-1, special); disable_codes(new_row); - if (curr_constraint->codclifor()) + if (curr_constraint->codclifor()) sf.disable_cell(new_row,sf.cid2index(F_CLIENTE)); } // ************* diff --git a/mr/mr2200a.uml b/mr/mr2200a.uml index 27f25ed84..ff8a6d99c 100755 --- a/mr/mr2200a.uml +++ b/mr/mr2200a.uml @@ -1535,10 +1535,10 @@ BEGIN FLAGS "U" END -STRING F_DESCART 150 50 +ZOOM F_DESCART 150 BEGIN PROMPT 1 2 "Descrizione " - FLAGS "DG" +// FLAGS "DG" END STRING F_LIV1 10 diff --git a/mr/mr2201.cpp b/mr/mr2201.cpp index 9cbbf00ae..5ff3ec727 100755 --- a/mr/mr2201.cpp +++ b/mr/mr2201.cpp @@ -866,7 +866,7 @@ void TMSP_constraint::fill_sheet_row(TToken_string& row, const TMask & m, const cons = d.get_date(DOC_DATACONS); if (cons.ok()) - val << ' ' << cons.string() << ' '; + val << ' ' << cons.string(brief) << ' '; val << '¦' << da_rdoc_key; }