diff --git a/src/ps/ps0713400.cpp b/src/ps/ps0713400.cpp index aa61039a2..626fbdfa7 100755 --- a/src/ps/ps0713400.cpp +++ b/src/ps/ps0713400.cpp @@ -54,7 +54,7 @@ protected: bool update_cfban(long codcf, const TVB_recset& s, int idx_abi) const; public: - bool transfer(const TFilename& file); + bool transfer(const TFilename& file, TString codnum); virtual void main_loop(); }; @@ -179,10 +179,10 @@ bool TImporta_fatven_app::update_cfban(long codcf, const TVB_recset& s, int idx_ //TRANSFER: metodo che effettivamente fa l'elaborazione del file di input, generando i vari documenti //pronti per essere contabilizzati -bool TImporta_fatven_app::transfer(const TFilename& file) +bool TImporta_fatven_app::transfer(const TFilename& file, TString codnum) { - const TString4 codnum = "F01"; //Da analisi - const TString4 tpdoc = "F01"; //Da analisi + //const TString4 codnum = "F01"; //Da analisi + const TString4 tpdoc = codnum; // "F01"; //Da analisi TLocalisamfile clifo(LF_CLIFO); TVB_recset s(file, ','); @@ -419,7 +419,7 @@ void TImporta_fatven_app::main_loop() TFilename name = msk.get(F_PATH); name.add(msk.get(F_NAME)); if (name.exist()) - transfer(name); + transfer(name, msk.get(F_CODNUM)); else cantread_box(name); } diff --git a/src/ps/ps0713400a.h b/src/ps/ps0713400a.h index 322be3822..965a15cb3 100755 --- a/src/ps/ps0713400a.h +++ b/src/ps/ps0713400a.h @@ -1,3 +1,4 @@ //campi maschera ps0713400a -#define F_PATH 201 -#define F_NAME 202 +#define F_CODNUM 201 +#define F_PATH 202 +#define F_NAME 203 diff --git a/src/ps/ps0713400a.uml b/src/ps/ps0713400a.uml index b67616bde..8dad454c7 100755 --- a/src/ps/ps0713400a.uml +++ b/src/ps/ps0713400a.uml @@ -15,14 +15,30 @@ BEGIN FLAGS "H" END -GROUPBOX DLG_NULL 78 4 +GROUPBOX DLG_NULL 78 5 BEGIN PROMPT 1 1 "@bSorgente" END +STRING F_CODNUM 4 +BEGIN + PROMPT 2 2 "Numerazione" + FIELD CODNUM + HELP "Codice numerazione" + USE %NUM + INPUT CODTAB F_CODNUM + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CODNUM CODTAB + CHECKTYPE FORCED + FLAG "U" + WARNING "Numerazione assente" + KEY 1 2 +END + STRING F_PATH 255 50 BEGIN - PROMPT 2 2 "Cartella " + PROMPT 2 3 "Cartella " DSELECT CHECKTYPE REQUIRED FIELD ComInPath @@ -30,7 +46,7 @@ END STRING F_NAME 255 50 BEGIN - PROMPT 2 3 "File " + PROMPT 2 4 "File " FIELD ComInFile FSELECT "*.csv" CHECKTYPE REQUIRED