diff --git a/C2P/Import.aspx.cs b/C2P/Import.aspx.cs index 4b53a76..61d3e36 100644 --- a/C2P/Import.aspx.cs +++ b/C2P/Import.aspx.cs @@ -119,7 +119,32 @@ namespace C2P /// protected void lbtImport_Click(object sender, EventArgs e) { - insertStepTicket("step01", 0, DateTime.Now); + DateTime adesso = DateTime.Now; + addStep01(adesso); + } + /// + /// aggiungo step 01... + /// + /// + private int addStep01(DateTime adesso) + { + int answ = 0; + // effettuo spostamento file A PRIORI... + string importDataFolder = memLayer.ML.confReadString("importDataFolder"); + string archiveDataFolder = memLayer.ML.confReadString("archiveDataFolder"); + string uplDir = memLayer.ML.confReadString("uplDir"); + string archDir = memLayer.ML.confReadString("archDir"); + // calcolo nuova cartella archivio (anno/mese/gg_ora) + archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archiveDataFolder, adesso); + archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archDir, adesso); + // sposto i files da TEMP a cartella archive + string[] file2move = memLayer.ML.confReadString("elencoFileImportAll").Split(memLayer.ML.confReadString("strSep").ToCharArray()[0]); + foreach (string fileName in file2move) + { + fileMover.obj.muoviFile(importDataFolder, archiveDataFolder, fileName); + } + answ = insertStepTicket("step01", 0, DateTime.Now, archDir); + return answ; } /// /// fa la chiamata di inserimento step richeisto e aggiorna @@ -128,13 +153,13 @@ namespace C2P /// /// /// NumTicket generato - private int insertStepTicket(string stepCode, int prevNumTicket, DateTime dataRich) + private int insertStepTicket(string stepCode, int prevNumTicket, DateTime dataRich, string filePath) { int answ = 0; DS_Utility.Import_TicketListRow riga; try { - string param = string.Format(memLayer.ML.confReadString(stepCode + "_par"), prevNumTicket); + string param = string.Format(memLayer.ML.confReadString(stepCode + "_par"), prevNumTicket, filePath); riga = (DS_Utility.Import_TicketListRow)DtProxy.man.taImpTL.InsertQuery(memLayer.ML.confReadString(stepCode + "_stp"), param, dataRich)[0]; answ = riga.NumTicket; } @@ -151,7 +176,8 @@ namespace C2P /// protected void lbtConvert_Click(object sender, EventArgs e) { - insertStepTicket("step02", 0, DateTime.Now); + int NumTicket = 0; + insertStepTicket("step02", NumTicket, DateTime.Now, ""); } /// /// chiamata procedura di merge dati @@ -160,7 +186,8 @@ namespace C2P /// protected void lbtMerge_Click(object sender, EventArgs e) { - insertStepTicket("step03", 0, DateTime.Now); + int NumTicket = 0; + insertStepTicket("step03", NumTicket, DateTime.Now, ""); } /// /// chiamata a TUTTE LE procedure x import dati @@ -171,9 +198,9 @@ namespace C2P { int NumTicket = 0; DateTime adesso = DateTime.Now; - NumTicket = insertStepTicket("step01", NumTicket, adesso); - NumTicket = insertStepTicket("step02", NumTicket, adesso.AddMinutes(1)); - NumTicket = insertStepTicket("step03", NumTicket, adesso.AddMinutes(2)); + NumTicket = addStep01(adesso); + NumTicket = insertStepTicket("step02", NumTicket, adesso.AddMinutes(1),""); + NumTicket = insertStepTicket("step03", NumTicket, adesso.AddMinutes(2),""); } diff --git a/C2P/Web.config b/C2P/Web.config index 137a0d9..24b3ef7 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -38,11 +38,13 @@ - + + + diff --git a/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs b/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs index 552dea5..59f3056 100644 --- a/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs +++ b/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs @@ -38,8 +38,8 @@ namespace C2P.WebUserControls // calcolo nuova cartella archivio (anno/mese/gg_ora) DateTime adesso = DateTime.Now; - archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archiveDataFolder, adesso); - archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archDir, adesso); + archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archiveDataFolder, adesso); + archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archDir, adesso); // sposto i files da TEMP a cartella archive REMOTE fileMover.obj.muoviFile(importDataFolder, archiveDataFolder, "DiesGroupRaw.csv"); // parto con la catena di esecuzione con cartella "relativa" al server... diff --git a/C2P/WebUserControls/mod_TranspCostMan.ascx.cs b/C2P/WebUserControls/mod_TranspCostMan.ascx.cs index 81d9261..4b82a9e 100644 --- a/C2P/WebUserControls/mod_TranspCostMan.ascx.cs +++ b/C2P/WebUserControls/mod_TranspCostMan.ascx.cs @@ -38,8 +38,8 @@ namespace C2P.WebUserControls // calcolo nuova cartella archivio (anno/mese/gg_ora) DateTime adesso = DateTime.Now; - archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archiveDataFolder, adesso); - archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archDir, adesso); + archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archiveDataFolder, adesso); + archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archDir, adesso); // sposto i files da TEMP a cartella archive fileMover.obj.muoviFile(importDataFolder, archiveDataFolder, "TranspCostRaw.csv"); // parto con la catena di esecuzione diff --git a/C2P/WebUserControls/mod_marginReport.ascx.cs b/C2P/WebUserControls/mod_marginReport.ascx.cs index 61054fe..41e1942 100644 --- a/C2P/WebUserControls/mod_marginReport.ascx.cs +++ b/C2P/WebUserControls/mod_marginReport.ascx.cs @@ -50,21 +50,43 @@ namespace C2P.WebUserControls // caricato file su server, PROVA ad eseguire import tabella int numRecIn = 0; int numRecConv = 0; + string fileName = "OrdersHistRaw"; + string importDataFolder = memLayer.ML.confReadString("importDataFolder"); + string archiveDataFolder = memLayer.ML.confReadString("archiveDataFolder"); + string uplDir = memLayer.ML.confReadString("uplDir"); + string archDir = memLayer.ML.confReadString("archDir"); + string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR"); + string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR"); + string FIRSTROW = memLayer.ML.confReadString("FIRSTROW"); + string CODEPAGE = memLayer.ML.confReadString("CODEPAGE"); + bool flgUpdate = memLayer.ML.confReadBool("flgUpdate"); + int numTicket = 0; // Convert.ToInt32(DateTime.Now.ToString("yyMMddHHmm")); + + // calcolo nuova cartella archivio (anno/mese/gg_ora) + DateTime adesso = DateTime.Now; + archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archiveDataFolder, adesso); + archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:HHmmss}\", archDir, adesso); + // sposto i files da TEMP a cartella archive + fileMover.obj.muoviFile(importDataFolder, archiveDataFolder, "MarginRep_Import.csv"); + // parto con la catena di esecuzione try { - numRecIn = DtProxy.man.taOH.import("OrdersHistRaw")[0].RecordsIn; + numRecIn = DtProxy.man.taOH.import(fileName, archDir, "MarginRep_Import.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorOrdersHist.log", numTicket)[0].RecordsIn; + //numRecIn = DtProxy.man.taOH.import("OrdersHistRaw")[0].RecordsIn; } catch { } try { - numRecConv = DtProxy.man.taOH.convert("OrdersHistRaw")[0].RecordsIn; + numRecConv = DtProxy.man.taOH.convert(fileName, numTicket)[0].RecordsIn; + //numRecConv = DtProxy.man.taOH.convert("OrdersHistRaw")[0].RecordsIn; } catch { } try { - DtProxy.man.taOH.merge("OrdersHistRaw"); + DtProxy.man.taOH.merge(fileName, numTicket, flgUpdate); + //DtProxy.man.taOH.merge("OrdersHistRaw"); } catch { } diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index 0af0760..2607971 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -60,7 +60,7 @@ -
  • +
  • Settings diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 5a51359..d3c5981 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index c0e656b..903f292 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/NLog.dll b/C2P/bin/NLog.dll index 5a2f145..e6fe774 100644 Binary files a/C2P/bin/NLog.dll and b/C2P/bin/NLog.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index d3ee58b..456b4f0 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_CronJob/App.config b/C2P_CronJob/App.config index 93be7f4..b21642c 100644 --- a/C2P_CronJob/App.config +++ b/C2P_CronJob/App.config @@ -10,11 +10,23 @@ - + + + + + + + + + + + + + - + diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index b0b4d79..903f292 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll index 86283ef..456b4f0 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index c0e656b..903f292 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index cdd6f98..a872c97 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index d3ee58b..456b4f0 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 33320ef..42af5e9 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.3.197.547")] -[assembly: AssemblyFileVersion("2.3.197.547")] +[assembly: AssemblyVersion("2.3.201.549")] +[assembly: AssemblyFileVersion("2.3.201.549")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 672d92f..290683a 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.3.197.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.3.197.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.3.201.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.3.201.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+