From 2eb52aa328940626a142d890d60ff7e4d76d7823 Mon Sep 17 00:00:00 2001 From: Simone Palacino Date: Mon, 25 Mar 2019 11:20:21 +0100 Subject: [PATCH] Patch level : 12.0 no-patch Files correlati : build Commento : Spostato programma Monitor Mancata Consegna in fp1 --- build/fp0.vcxproj | 8 ------ build/fp0.vcxproj.filters | 9 ------- build/fp1.vcxproj | 8 ++++++ build/fp1.vcxproj.filters | 9 +++++++ build/fplib.vcxproj | 3 ++- src/fp/fp0.cpp | 1 - src/fp/fp0.h | 1 - src/fp/fp1.cpp | 1 + src/fp/fp1.h | 1 + src/fp/{fp0500.cpp => fp1200.cpp} | 38 +++-------------------------- src/fp/{fp0500a.h => fp1200a.h} | 0 src/fp/{fp0500a.uml => fp1200a.uml} | 2 +- src/fp/fplib03.cpp | 2 +- src/fp/fpmenu.men | 2 +- 14 files changed, 27 insertions(+), 58 deletions(-) rename src/fp/{fp0500.cpp => fp1200.cpp} (81%) rename src/fp/{fp0500a.h => fp1200a.h} (100%) rename src/fp/{fp0500a.uml => fp1200a.uml} (99%) diff --git a/build/fp0.vcxproj b/build/fp0.vcxproj index b5d69d573..b423b16e9 100644 --- a/build/fp0.vcxproj +++ b/build/fp0.vcxproj @@ -194,10 +194,6 @@ - - false - true - @@ -205,9 +201,6 @@ - - false - @@ -215,7 +208,6 @@ - diff --git a/build/fp0.vcxproj.filters b/build/fp0.vcxproj.filters index eb98f06b9..a71089b7c 100644 --- a/build/fp0.vcxproj.filters +++ b/build/fp0.vcxproj.filters @@ -45,9 +45,6 @@ Sources - - Sources - Sources @@ -65,9 +62,6 @@ Headers - - Headers - Headers @@ -82,9 +76,6 @@ Masks - - Masks - Masks diff --git a/build/fp1.vcxproj b/build/fp1.vcxproj index 6660b7522..0439fee25 100644 --- a/build/fp1.vcxproj +++ b/build/fp1.vcxproj @@ -187,17 +187,25 @@ + + + + + + + Document + diff --git a/build/fp1.vcxproj.filters b/build/fp1.vcxproj.filters index 16854163a..80084fe39 100644 --- a/build/fp1.vcxproj.filters +++ b/build/fp1.vcxproj.filters @@ -33,6 +33,9 @@ Sources + + Sources + @@ -41,11 +44,17 @@ Headers + + Headers + Masks + + Masks + diff --git a/build/fplib.vcxproj b/build/fplib.vcxproj index ecd9fda37..16d018345 100644 --- a/build/fplib.vcxproj +++ b/build/fplib.vcxproj @@ -174,7 +174,8 @@ - true + + diff --git a/src/fp/fp0.cpp b/src/fp/fp0.cpp index 0c89b13a1..bbcdc387c 100644 --- a/src/fp/fp0.cpp +++ b/src/fp/fp0.cpp @@ -11,7 +11,6 @@ int main(int argc, char** argv) case 1: rt = fp0200(argc, argv); break; // Inserimento massivo PEC e Cod Sdi clifo case 2: rt = fp0300(argc, argv); break; // Gestione fatture attive (PAA, Ex Fattura PA) case 3: rt = fp0400(argc, argv); break; // Monitor fatture passive - case 4: rt = fp0500(argc, argv); break; // Elenco mancate consegna default: rt = fp0100(argc, argv); break; // Configurazione } return rt; diff --git a/src/fp/fp0.h b/src/fp/fp0.h index e2d05fe11..402f3391e 100644 --- a/src/fp/fp0.h +++ b/src/fp/fp0.h @@ -5,6 +5,5 @@ int fp0100(int argc, char* argv[]); int fp0200(int argc, char* argv[]); int fp0300(int argc, char* argv[]); int fp0400(int argc, char* argv[]); -int fp0500(int argc, char* argv[]); #endif diff --git a/src/fp/fp1.cpp b/src/fp/fp1.cpp index 8a8248282..3fe3a6e4f 100644 --- a/src/fp/fp1.cpp +++ b/src/fp/fp1.cpp @@ -9,6 +9,7 @@ int main(int argc, char** argv) // Stampe fatturazione elettronica switch (r) { + case 1: rt = fp1200(argc, argv); break; // Elenco mancate consegna default: rt = fp1100(argc, argv); break; // Stampa bolli fatture } return rt; diff --git a/src/fp/fp1.h b/src/fp/fp1.h index 082a309e1..fd3761f0f 100644 --- a/src/fp/fp1.h +++ b/src/fp/fp1.h @@ -2,5 +2,6 @@ #define __FP1_H int fp1100(int argc, char* argv[]); +int fp1200(int argc, char* argv[]); #endif diff --git a/src/fp/fp0500.cpp b/src/fp/fp1200.cpp similarity index 81% rename from src/fp/fp0500.cpp rename to src/fp/fp1200.cpp index 135fbf6bb..0c7a2766e 100644 --- a/src/fp/fp0500.cpp +++ b/src/fp/fp1200.cpp @@ -11,7 +11,7 @@ #include "../fe/felib.h" #include "fp0.h" -#include "fp0500a.h" +#include "fp1200a.h" ///////////////////////////////////////////////////////////////////////////////////// // Globals @@ -44,7 +44,7 @@ protected: bool _filter_changed; friend class TMancati_app; public: - TMancati_mask() : TAutomask("fp0500a"), _filter_changed(true) + TMancati_mask() : TAutomask("fp1200a"), _filter_changed(true) { disable(DLG_OK); _idx = -1; @@ -361,38 +361,6 @@ public: void TMancati_app::main_loop() { - -//////////////////////////////////////////////////////////////////////////// -// TEST PER TDB_recordset -//////////////////////////////////////////////////////////////////////////// - TString qq; - qq << "CONNECT(localhost@fp_cortelezzi, fp, fp, MSSQL)\n\ -SELECT PZ_TIPOPROT AS TIPO_PROT, YEAR(P7_DATA) AS ANNO, P7_TIPODOC AS[TIPO_SDI], P7_NUMERO AS[NUM_DOC], P7_DATA AS[DATA_DOC], PQ_IMPTOTDOC AS[TOT_DOC], P2_ANADENOMIN AS[RAG_SOC], P2_ANANOME AS NOME, P2_ANACOGNOME AS COGNOME, P2_FISCIVACOD AS[P_IVA], P2_CODFISCALE AS[COD_FISC], P2_FISCIVAPAESE AS[COD_PAESE],\n\ -COUNT(PP_ATTACHMENT) AS ATTACHMENT, P1_CODDEST AS[COD_SDI], PU_PEC AS PEC, P1_KEYPRGINVIO AS KEYPROG, P1_KEYHEADERFATT AS KEYHEAD, P1_KEYBODYFATT AS KEYFATT, PZ_TIPOPROT AS[TIPO_PROT], PZ_NUMPROT AS[NUM_PROT], PZ_ANNOPROT AS[ANNO_PROT], PZ_TIPOCF AS[TIPO_CF], PZ_CLIFOR AS[COD_CLIFOR]\n\ -FROM PAA0100F PAA01\n\ -JOIN PAA0200F PAA02 ON P1_KEYPRGINVIO = P2_KEYPRGINVIO and P1_KEYHEADERFATT = P2_KEYHEADERFATT and P1_KEYBODYFATT = P2_KEYBODYFATT\n\ -JOIN PAA0700F PAA07 ON P1_KEYPRGINVIO = P7_KEYPRGINVIO and P1_KEYHEADERFATT = P7_KEYHEADERFATT and P1_KEYBODYFATT = P7_KEYBODYFATT\n\ -JOIN PAA2700F PAA27 ON P1_KEYPRGINVIO = PQ_KEYPRGINVIO and P1_KEYHEADERFATT = PQ_KEYHEADERFATT and P1_KEYBODYFATT = PQ_KEYBODYFATT\n\ -LEFT JOIN PAA2600F PAA26 ON P1_KEYPRGINVIO = PP_KEYPRGINVIO and P1_KEYHEADERFATT = PP_KEYHEADERFATT and P1_KEYBODYFATT = PP_KEYBODYFATT\n\ -LEFT JOIN PAA3200F PAA32 ON P1_KEYPRGINVIO = PU_KEYPRGINVIO and P1_KEYHEADERFATT = PU_KEYHEADERFATT and P1_KEYBODYFATT = PU_KEYBODYFATT\n\ -LEFT JOIN FPPRO00F FPPRO ON P1_KEYPRGINVIO = PZ_KEYPRGINVIO and P1_KEYHEADERFATT = PZ_KEYHEADERFATT and P1_KEYBODYFATT = PZ_KEYBODYFATT\n\ -WHERE P7_DATA >= '20190301' AND P7_DATA <= '20190315'\n\ -GROUP BY YEAR(P7_DATA), P7_TIPODOC, P7_NUMERO, P7_DATA, PQ_IMPTOTDOC, P2_ANADENOMIN, P2_ANANOME, P2_ANACOGNOME, P2_FISCIVACOD, P2_CODFISCALE, P2_FISCIVAPAESE,\n\ -P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR\n\ -ORDER BY PZ_ANNOPROT DESC, PZ_TIPOPROT ASC, PZ_NUMPROT DESC;"; - - TDB_recordset my_rec(qq, true); - my_rec.set("SELECT * FROM PAA0100F;"); - int n = my_rec.items(); - my_rec.move_to(0); - TRecordset_column_info info = my_rec.column_info(1); - bool conn = my_rec.is_connected(); - int col = my_rec.columns(); -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - - TMancati_mask mask; while (mask.run() == K_ENTER) { @@ -462,7 +430,7 @@ bool TMancati_app::destroy() return TSkeleton_application::destroy(); } -int fp0500(int argc, char* argv[]) +int fp1200(int argc, char* argv[]) { TMancati_app d2p; d2p.run(argc, argv, TR("Elenco Fatture Mancata Consegna")); diff --git a/src/fp/fp0500a.h b/src/fp/fp1200a.h similarity index 100% rename from src/fp/fp0500a.h rename to src/fp/fp1200a.h diff --git a/src/fp/fp0500a.uml b/src/fp/fp1200a.uml similarity index 99% rename from src/fp/fp0500a.uml rename to src/fp/fp1200a.uml index f93367b7b..e75427694 100644 --- a/src/fp/fp0500a.uml +++ b/src/fp/fp1200a.uml @@ -1,4 +1,4 @@ -#include "fp0500a.h" +#include "fp1200a.h" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/fp/fplib03.cpp b/src/fp/fplib03.cpp index 7697bb403..c71f902ef 100644 --- a/src/fp/fplib03.cpp +++ b/src/fp/fplib03.cpp @@ -3,7 +3,7 @@ #include #include #include "modaut.h" -#include "fp0500a.h" +#include "fp1200a.h" class TExternal_app; diff --git a/src/fp/fpmenu.men b/src/fp/fpmenu.men index d1cce2a0f..8d2fd0c6b 100644 --- a/src/fp/fpmenu.men +++ b/src/fp/fpmenu.men @@ -14,7 +14,7 @@ Caption = "Stampe" Picture = Module = fp Flags = "" -Item_01 = "Elenco Mancata Consegna", "fp0 -4", "" +Item_01 = "Elenco Mancata Consegna", "fp1 -1", "" Item_02 = "Elenco bolli in fattura", "fp1 -0", "" [FPMENU_003]