diff --git a/ps/ps0330100.cpp b/ps/ps0330100.cpp index 3097a93f1..a28bb656b 100755 --- a/ps/ps0330100.cpp +++ b/ps/ps0330100.cpp @@ -83,6 +83,7 @@ void TMultimarche::elabora() { TRecordset* recset = rep.recordset(); const long anno = _mask->get_int(F_ANNO); + const TString4 codmag = _mask->get(F_CODMAG); //crea l'elenco delle marche TString marche_query; @@ -106,6 +107,7 @@ void TMultimarche::elabora() const TString4 marca = marche_recset.get(ANAMAG_CODART).as_string(); recset->set_var("#MARCA", marca); recset->set_var("#ANNO", anno); + recset->set_var("#CODMAG", codmag); const long items = recset->items(); if (items > 0) { diff --git a/ps/ps0330100a.h b/ps/ps0330100a.h index 7c3762021..eb34c3eb1 100755 --- a/ps/ps0330100a.h +++ b/ps/ps0330100a.h @@ -3,6 +3,8 @@ #define F_DAMARCA_D 103 #define F_AMARCA 104 #define F_AMARCA_D 105 -#define F_REPORT 107 -#define F_PATH_FILE 108 +#define F_CODMAG 106 +#define F_DESCRMAG 107 +#define F_REPORT 108 +#define F_PATH_FILE 109 diff --git a/ps/ps0330100a.rep b/ps/ps0330100a.rep index e42bdc956..0b175cfaa 100755 --- a/ps/ps0330100a.rep +++ b/ps/ps0330100a.rep @@ -29,7 +29,7 @@ SELECT (CODART[1,3]=#MARCA)(CODART!=#MARCA) BY ANAMAG.DESCR JOIN ANAMAG INTO CODART=CODART JOIN UMART INTO CODART=CODART NRIGA=1 -FROM ANNOES=#ANNO -TO ANNOES=#ANNO +FROM ANNOES=#ANNO CODMAG=#CODMAG +TO ANNOES=#ANNO CODMAG=#CODMAG \ No newline at end of file diff --git a/ps/ps0330100a.uml b/ps/ps0330100a.uml index 6dbb2ec8d..fec565d92 100755 --- a/ps/ps0330100a.uml +++ b/ps/ps0330100a.uml @@ -1,6 +1,6 @@ #include "ps0330100a.h" -PAGE "Rimanenze per marca" -1 -1 78 10 +PAGE "Rimanenze per marca" -1 -1 78 13 NUMBER F_ANNO 4 BEGIN @@ -57,16 +57,41 @@ BEGIN CHECKTYPE SEARCH END +STRING F_CODMAG 3 +BEGIN + PROMPT 2 6 "Magazzino " + USE MAG SELECT CODTAB[4,5]=="" + FLAGS "U" + INPUT CODTAB F_CODMAG + DISPLAY "Codice" CODTAB[1,3] + DISPLAY "Denominazione magazzino@50" S0 + OUTPUT F_CODMAG CODTAB[1,3] + OUTPUT F_DESCRMAG S0 + CHECKTYPE REQUIRED +END + +STRING F_DESCRMAG 50 +BEGIN + PROMPT 22 6 "" + USE MAG KEY 2 + INPUT S0 F_DESCRMAG + DISPLAY "Denominazione magazzino@50" S0 + DISPLAY "Codice" CODTAB[1,3] + COPY OUTPUT F_CODMAG + CHECKTYPE REQUIRED + WARNING "Manca la denominazione del magazzino" +END + STRING F_REPORT 50 BEGIN - PROMPT 1 6 "Report " + PROMPT 1 8 "Report " RSELECT "ps0330" CHECKTYPE REQUIRED END STRING F_PATH_FILE 255 50 BEGIN - PROMPT 1 7 "Cartella dest. " + PROMPT 1 9 "Cartella dest. " DSELECT FLAGS "M" CHECKTYPE REQUIRED