diff --git a/GMW/GMW.sln b/GMW/GMW.sln index 5b5f6975..cdb81d54 100644 --- a/GMW/GMW.sln +++ b/GMW/GMW.sln @@ -95,13 +95,9 @@ Global {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU - {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Deploy|Any CPU.Build.0 = Debug|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Installer_Offline|Any CPU.ActiveCfg = Release|Any CPU - {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Installer_Offline|Any CPU.Build.0 = Release|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Installer_test|Any CPU.ActiveCfg = Release|Any CPU - {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Installer_test|Any CPU.Build.0 = Release|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Installer|Any CPU.ActiveCfg = Release|Any CPU - {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Installer|Any CPU.Build.0 = Release|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADACC5A9-F45C-4659-9026-73E1E82517EF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 5bf5fe93..6ebd0334 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -101,7 +101,11 @@ - + + + + + diff --git a/GMW/GMW/Reports/CartellinoTara.rdlc b/GMW/GMW/Reports/CartellinoTara.rdlc new file mode 100644 index 00000000..d0ae95f7 --- /dev/null +++ b/GMW/GMW/Reports/CartellinoTara.rdlc @@ -0,0 +1,258 @@ + + + + + d9194145-aa70-4a36-8b7a-c929936f98f7 + + + + + + + + + 14.8cm + true + 21cm + 0.25cm + true + 0.5cm + 0.5cm + 0.5cm + 3255cde9-74a1-4005-8008-232d8355d769 + 21cm + + + + + CodCompany + System.String + + + ODP + System.String + + + UDC + System.String + + + Tara + System.Double + + + IdxStato + System.Int32 + + + Qta + System.Decimal + + + CodImballo + System.String + + + CreateDate + System.DateTime + + + ModDate + System.DateTime + + + + GMWConnectionString + dbo.stp_getStatoByUdc + true + + + GMWDataSet + stp_getStatoByUdc + + + + + GetData + + + + + 20cm + + 1cm + + + textbox1 + 12.69841cm + + 1 + true + 0.91429cm + CartellinoTara + + + GMWDataSet_stp_getStatoByUdc + 4cm + + + + + =Fields!UDC.Value + + + + + =Fields!UDC.Value + Ascending + + +
+ + + + + 3 + + + UDC + + true + ="*" & Fields!UDC.Value & "*" + + + + + 3.50781cm + + +
+ + + 19cm +
+ + + + + + + textbox4 + + true + Tara + + + + + + + Tara + + true + =Fields!Tara.Value & " Kg" + + + + + + + CreateDate + + true + =Fields!CreateDate.Value + + + + + 3.50781cm + + +
+ + + 6.31847cm + + + 6.36305cm + + + 6.31848cm + + + 7.01562cm + 0.5cm +
+ + 13.5cm + + it-IT + 0.5cm + 14.8cm + \ No newline at end of file diff --git a/GMW/GMW/WS/bilance.asmx.cs b/GMW/GMW/WS/bilance.asmx.cs index 178551f0..afcce629 100644 --- a/GMW/GMW/WS/bilance.asmx.cs +++ b/GMW/GMW/WS/bilance.asmx.cs @@ -5,13 +5,14 @@ using System.Web.Services; using System.Data; using GMW_data; using GMW; +using SteamWare; namespace GMW.WS { /// /// Summary description for bilance /// - [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.0.9.14")] + [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.14")] [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] [System.ComponentModel.ToolboxItem(false)] public class bilance : System.Web.Services.WebService @@ -215,9 +216,18 @@ namespace GMW.WS [WebMethod(Description = "Effettua la stampa richiesta per l'UDC indicato")] public bool UdcPrintLabel(string place, tipoCartellino cartellino, string UDC) { - bool answ = true; - // qui dovrei lanciare la stampa a seconda del tipo cartellino... + bool answ = false; + try + { + reportPrinter.obj.printReport(reportRichiesto.CartellinoTara, memLayer.ML.confReadString("printerCartTara"), UDC); + //reportPrinter.obj.printReport(reportRichiesto.CartellinoTara, "PDFCreator", UDC); + answ = true; + } + catch (Exception e) + { + logger.lg.scriviLog(e.ToString(), tipoLog.EXCEPTION); + } return answ; } diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index efbafc61..b2cc97c4 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -77,6 +77,10 @@ + + + + diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 857b1730..59398f78 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 3129d247..e8aff844 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 3c582a52..85d9da69 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -1,3 +1,7 @@  + + + + \ No newline at end of file diff --git a/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt b/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt index 075033d3..963d1e46 100644 --- a/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt @@ -9,3 +9,5 @@ C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.xml C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 54b7839a..029549aa 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/RdlCompile.cache b/GMW/GMW/obj/Debug/RdlCompile.cache new file mode 100644 index 00000000..cecbf1af Binary files /dev/null and b/GMW/GMW/obj/Debug/RdlCompile.cache differ diff --git a/GMW/GMW/obj/Debug/RdlCompile.compiled b/GMW/GMW/obj/Debug/RdlCompile.compiled new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 20f247b9..8b5e064a 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt b/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt index 90762191..f1ed561d 100644 --- a/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW/obj/Release/GMW.csproj.FileListAbsolute.txt @@ -8,3 +8,5 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\ResolveAssemblyReference.cache c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.compiled diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 857b1730..59398f78 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/RdlCompile.cache b/GMW/GMW/obj/Release/RdlCompile.cache new file mode 100644 index 00000000..cecbf1af Binary files /dev/null and b/GMW/GMW/obj/Release/RdlCompile.cache differ diff --git a/GMW/GMW/obj/Release/RdlCompile.compiled b/GMW/GMW/obj/Release/RdlCompile.compiled new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index 88ebef06..d166e1a1 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Reports/CartellinoTara.rdlc b/GMW/GMW_Reports/CartellinoTara.rdlc index d0ae95f7..0affbe01 100644 --- a/GMW/GMW_Reports/CartellinoTara.rdlc +++ b/GMW/GMW_Reports/CartellinoTara.rdlc @@ -12,6 +12,7 @@ 14.8cm + demo report x cartellino tara true 21cm 0.25cm @@ -77,6 +78,7 @@ + Samuele E. Locatelli 20cm diff --git a/GMW/GMW_Reports/bin/Debug/GMW_Reports.exe b/GMW/GMW_Reports/bin/Debug/GMW_Reports.exe index 9694ddb6..5a759608 100644 Binary files a/GMW/GMW_Reports/bin/Debug/GMW_Reports.exe and b/GMW/GMW_Reports/bin/Debug/GMW_Reports.exe differ diff --git a/GMW/GMW_Reports/obj/Debug/GMW_Reports.exe b/GMW/GMW_Reports/obj/Debug/GMW_Reports.exe index 9694ddb6..5a759608 100644 Binary files a/GMW/GMW_Reports/obj/Debug/GMW_Reports.exe and b/GMW/GMW_Reports/obj/Debug/GMW_Reports.exe differ diff --git a/GMW/GMW_Reports/obj/Debug/RdlCompile.cache b/GMW/GMW_Reports/obj/Debug/RdlCompile.cache index 3c96104a..884a7919 100644 Binary files a/GMW/GMW_Reports/obj/Debug/RdlCompile.cache and b/GMW/GMW_Reports/obj/Debug/RdlCompile.cache differ diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index ac601b08..c80618d8 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -31,10 +31,13 @@ 4 + 3.5 + + 3.5 @@ -61,6 +64,8 @@ True Settings.settings + + diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 7a7ce1d5..51c6cdc1 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index 3129d247..e8aff844 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 7a7ce1d5..51c6cdc1 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 3129d247..e8aff844 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/reportExporter.cs b/GMW/GMW_data/reportExporter.cs new file mode 100644 index 00000000..9d3fad0c --- /dev/null +++ b/GMW/GMW_data/reportExporter.cs @@ -0,0 +1,195 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.IO; +using System.Data; +using System.Drawing.Imaging; +using System.Drawing.Printing; +using System.Windows.Forms; +using Microsoft.Reporting.WinForms; +using System.Configuration; +using SteamWare; + +/// +/// Classe che restituisce uno stream ed i dati accessori per reinviare un report in pdf +/// +public class reportExporter +{ + /// + /// mimeType del report + /// + public string mimeType; + /// + /// encoding dei dati + /// + public string encoding; + /// + /// nome estensione + /// + public string fileNameExtension; + /// + /// steam di bytes del report + /// + public byte[] renderedBytes; + /// + /// metodo protected + /// + public reportExporter() + { + } + /// + /// carica i dati richiesti dal report dalla StoredProcedure (filtrando quindi...) + /// + /// tipo di report richiesto + /// cod UDC + /// tabella dati + private DataTable caricaDati(reportRichiesto tipoReport, string UDC) + { + DataTable tab = new DataTable(); + switch (tipoReport) + { + //case reportRichiesto.CartellinoPesa: + // tab = (DataTable)GMW_data.DataProxy.obj.taStatoOdpUdc.getByUdc(UDC); + // break; + case reportRichiesto.CartellinoTara: + tab = (DataTable)GMW_data.DataProxy.obj.taStatoOdpUdc.getByUdc(UDC); + break; + default: + break; + } + return tab; + } +#if false + /// + /// carica i dati richiesti dal report dalla StoredProcedure (filtrando quindi...) + /// + /// report ammessi: SR_torrOp + /// cod idxCiclo + /// numFase + /// numOp + /// tabella dati + private DataTable caricaDati(reportRichiesto tipoReport, int idxCiclo, int numFase, int numOp) + { + DataTable tab = new DataTable(); + switch (tipoReport) + { + case reportRichiesto.SR_torrOp: + tab = (DataTable)TA_app.obj.taRepTorrFAO.GetData(idxCiclo, numFase, numOp); + break; + default: + break; + } + return tab; + } +#endif + /// + /// renderizza il report in pdf + /// + /// report ammessi: RichiestaIntervento + /// cod UDC + /// + public void popolaPdfStream(reportRichiesto tipoReport, string UDC) + { + LocalReport report = new LocalReport(); + string deviceInfo = ""; + ReportParameter[] _UDC = { new ReportParameter("UDC", UDC) }; + switch (tipoReport) + { + //case reportRichiesto.CartellinoPesa: + // report.ReportPath = @".\Reports\FAO.rdlc"; + // report.DataSources.Add(new ReportDataSource("DataSet1", caricaDati(tipoReport, idxCiclo))); // OCCHIO!!! va messa sorgente dati CORRETTA + // deviceInfo = "" + + // " PDF" + + // " 21cm" + + // " 29.7cm" + + // " 0.2cm" + + // " 0.2cm" + + // " 0.2cm" + + // " 0.2cm" + + // ""; + // report.SetParameters(_idxCiclo); + // // aggancio evento al report per gestire il caricamento dei subreports... + // report.SubreportProcessing += new SubreportProcessingEventHandler(report_SubreportProcessing); + // break; + case reportRichiesto.CartellinoTara: + report.ReportPath = @".\Reports\CartellinoTara.rdlc"; + report.DataSources.Add(new ReportDataSource("GMWDataSet_stp_getStatoByUdc", caricaDati(tipoReport, UDC))); // OCCHIO!!! va messa sorgente dati CORRETTA + deviceInfo = "" + + " PDF" + + " 21cm" + + " 14.8cm" + + " 0.5cm" + + " 0.5cm" + + " 0.5cm" + + " 0.5cm" + + ""; + report.SetParameters(_UDC); + break; + default: + break; + } + createPdfStream(report, deviceInfo); + } + +#if false + /// + /// gestione evento render subreport... + /// + /// + /// + void report_SubreportProcessing(object sender, SubreportProcessingEventArgs e) + { + // devo aggiungere i 2 dataset - (torretta e note utente) SOLO per il ciclo corrente, ed aggiungo altri aprametri (SE disponibili...) + + // salvo idxCiclo... + int _idxCiclo = 0; + try + { + _idxCiclo = Convert.ToInt32(e.Parameters["idxCiclo"].Values[0]); + } + catch + { } + // salvo numFase... + int _numFase = 0; + try + { + _numFase = Convert.ToInt32(e.Parameters["numFase"].Values[0]); + } + catch + { } + // salvo numOp... + int _numOp = 0; + try + { + _numOp = Convert.ToInt32(e.Parameters["numOp"].Values[0]); + } + catch + { } + e.DataSources.Add(new ReportDataSource("FasiOp", caricaDati(reportRichiesto.SR_torrOp, _idxCiclo, _numFase, _numOp))); + e.DataSources.Add(new ReportDataSource("FasiOP", caricaDati(reportRichiesto.SR_noteUt, _idxCiclo))); + } +#endif + /// + /// crea il vero e proprio stream pdf + /// + /// + /// + private void createPdfStream(LocalReport report, string deviceInfo) + { + // export in PDF + string reportType = "PDF"; + Warning[] warnings; + string[] streams; + renderedBytes = report.Render( + reportType, + deviceInfo, + out mimeType, + out encoding, + out fileNameExtension, + out streams, + out warnings); + } + +} + diff --git a/GMW/GMW_data/reportPrinter.cs b/GMW/GMW_data/reportPrinter.cs new file mode 100644 index 00000000..8d95f697 --- /dev/null +++ b/GMW/GMW_data/reportPrinter.cs @@ -0,0 +1,273 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.IO; +using System.Data; +using System.Drawing.Imaging; +using System.Drawing.Printing; +using System.Windows.Forms; +using Microsoft.Reporting.WinForms; +using System.Configuration; +using SteamWare; + +/// +/// Classe che si occupa di stampare report da reportViewer via printer remota +/// +public class reportPrinter +{ + #region area codice da non modificare + + private int m_currentPageIndex; + private IList m_streams; + /// + /// ciclo da fornire al renderizzatore dei report, per salvare 1 immagine da ogni pagina del report + /// + /// + /// + /// + /// + /// + /// + private Stream CreateStream(string name, string fileNameExtension, Encoding encoding, string mimeType, bool willSeek) + { + Stream stream = new FileStream(SteamWare.SteamwareStrings.getFilePath(@"~\temp\" + name + "." + fileNameExtension), FileMode.Create); + m_streams.Add(stream); + return stream; + } + /// + /// Handler per PrintPageEvents + /// + /// + /// + private void PrintPage(object sender, PrintPageEventArgs ev) + { + Metafile pageImage = new Metafile(m_streams[m_currentPageIndex]); + ev.Graphics.DrawImage(pageImage, ev.PageBounds); + m_currentPageIndex++; + ev.HasMorePages = (m_currentPageIndex < m_streams.Count); + } + /// + /// funzione di stampa... + /// + private void Print(string printerName) + { + //const string printerName = "Microsoft Office Document Image Writer"; + //const string printerName = "Brother HL-2170W series"; + if (m_streams == null || m_streams.Count == 0) + return; + PrintDocument printDoc = new PrintDocument(); + printDoc.PrinterSettings.PrinterName = printerName; + if (!printDoc.PrinterSettings.IsValid) + { + logger.lg.scriviLog(String.Format("Can't find printer \"{0}\".", printerName), tipoLog.ERROR); + return; + } + printDoc.PrintPage += new PrintPageEventHandler(PrintPage); + printDoc.Print(); + } + /// + /// Export del report come EMF (Enhanced Metafile) file. + /// + /// + private void Export(LocalReport report, string deviceInfo) + { + Warning[] warnings; + m_streams = new List(); + report.Render("Image", deviceInfo, CreateStream, out warnings); + foreach (Stream stream in m_streams) stream.Position = 0; + } + /// + /// dispone l'applicazione e rilascia le risorse + /// + public void Dispose() + { + if (m_streams != null) + { + foreach (Stream stream in m_streams) + stream.Close(); + m_streams = null; + } + } + + #endregion + + #region area codice da modificare + + /// + /// carica i dati richiesti dal report dalla StoredProcedure (filtrando quindi...) + /// + /// report ammessi: ElencoMacchine / RichiestaIntervento + /// cod UDC + /// tabella dati + private DataTable caricaDati(reportRichiesto tipoReport, string UDC) + { + DataTable tab = new DataTable(); + switch (tipoReport) + { + //case reportRichiesto.CartellinoPesa: + // tab = (DataTable)GMW_data.DataProxy.obj.taStatoOdpUdc.getByUdc(UDC); + // break; + case reportRichiesto.CartellinoTara: + tab = (DataTable)GMW_data.DataProxy.obj.taStatoOdpUdc.getByUdc(UDC); + break; + default: + break; + } + return tab; + } +#if false + /// + /// carica i dati richiesti dal report dalla StoredProcedure (filtrando quindi...) + /// + /// report ammessi: ElencoInterventi / MTBF_MTTR + /// oggetto che contiene data inizio e data fine dell'analisi richiesta per il report + /// tabella dati + private DataTable caricaDati(reportRichiesto tipoReport, intervalloDate periodoAnalizzato, string username) + { + DataTable tab = new DataTable(); + switch (tipoReport) + { + case reportRichiesto.ElencoInterventi: + tab = (DataTable)TA_app.obj.taElencoIntFilt.getByIntervDateUsernameFilt(periodoAnalizzato.inizio, periodoAnalizzato.fine, username); + break; + case reportRichiesto.MTBF_MTTR: + tab = (DataTable)TA_app.obj.taElenco_MTBF_MTTR.GetData(periodoAnalizzato.inizio, periodoAnalizzato.fine, username); + break; + default: + break; + } + return tab; + } +#endif + /// + /// Crea un report locale da file rdlc, carica i dati, esporta report come EMF file e quindi lo invia alla stampante + /// + /// report ammessi: ElencoMacchine / RichiestaIntervento + /// nome completo stampante (rispetto al server) + /// cod UDC + public void printReport(reportRichiesto tipoReport, string printerName, string UDC) + { + LocalReport report = new LocalReport(); + string deviceInfo = ""; + switch (tipoReport) + { + //case reportRichiesto.CartellinoPesa: + // report.ReportPath = @".\MacchineReparti.rdlc"; + // report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); + // deviceInfo = "" + + // " EMF" + + // " 29.7cm" + + // " 21cm" + + // " 0.2cm" + + // " 0.2cm" + + // " 0.2cm" + + // " 0.2cm" + + // ""; + // break; + case reportRichiesto.CartellinoTara: + report.ReportPath = @".\Reports\CartellinoTara.rdlc"; + report.DataSources.Add(new ReportDataSource("GMWDataSet_stp_getStatoByUdc", caricaDati(tipoReport, UDC))); + deviceInfo = "" + + " EMF" + + " 21cm" + + " 14.8cm" + + " 0.5cm" + + " 0.5cm" + + " 0.5cm" + + " 0.5cm" + + ""; + break; + default: + break; + } + doEmfPrint(printerName, report, deviceInfo); + } +#if false + /// + /// Crea un report locale da file rdlc, carica i dati, esporta report come EMF file e quindi lo invia alla stampante + /// + /// report ammessi: ElencoInterventi / MTBF_MTTR + /// nome completo stampante (rispetto al server) + /// oggetto che contiene data inizio e data fine dell'analisi richiesta per il report + public void printReport(reportRichiesto tipoReport, string printerName, intervalloDate periodoAnalizzato, string username) + { + LocalReport report = new LocalReport(); + string deviceInfo = ""; + switch (tipoReport) + { + case reportRichiesto.ElencoInterventi: + report.ReportPath = @".\ReportInterventi.rdlc"; + report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username))); + deviceInfo = "" + + " EMF" + + " 21cm" + + " 29.7cm" + + " 0.2cm" + + " 0.2cm" + + " 0.2cm" + + " 0.2cm" + + ""; + break; + case reportRichiesto.MTBF_MTTR: + report.ReportPath = @".\Report_MTBF_MTTR.rdlc"; + report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username))); + deviceInfo = "" + + " EMF" + + " 21cm" + + " 29.7cm" + + " 0.2cm" + + " 0.2cm" + + " 0.2cm" + + " 0.2cm" + + ""; + // calcolo le ore totali equivalenti... + ReportParameter[] OreTotali = { new ReportParameter("OreTotali", WebGimUtils.obj.oreEquivalenti(periodoAnalizzato).ToString()) }; + report.SetParameters(OreTotali); + break; + default: + break; + } + doEmfPrint(printerName, report, deviceInfo); + } +#endif + /// + /// esegue print vero e proprio + /// + /// + /// + /// + private void doEmfPrint(string printerName, LocalReport report, string deviceInfo) + { + // export in EMF + Export(report, deviceInfo); + m_currentPageIndex = 0; + // stampo + Print(printerName); + // do dispose? + Dispose(); + } + + /// + /// oggetto protected + /// + /// + protected reportPrinter() + { + } + /// + /// singleton pubblico + /// + public static reportPrinter obj = new reportPrinter(); + + #endregion +} +/// +/// tipologia di report ammessi alla stampa... +/// +public enum reportRichiesto +{ + //CartellinoPesa, + //CartellinoProduzione, + CartellinoTara +} diff --git a/GMW/GMW_deploy/Release/GMW.csproj b/GMW/GMW_deploy/Release/GMW.csproj index 5bf5fe93..6ebd0334 100644 --- a/GMW/GMW_deploy/Release/GMW.csproj +++ b/GMW/GMW_deploy/Release/GMW.csproj @@ -101,7 +101,11 @@ - + + + + + diff --git a/GMW/GMW_deploy/Release/Reports/CartellinoTara.rdlc b/GMW/GMW_deploy/Release/Reports/CartellinoTara.rdlc new file mode 100644 index 00000000..d0ae95f7 --- /dev/null +++ b/GMW/GMW_deploy/Release/Reports/CartellinoTara.rdlc @@ -0,0 +1,258 @@ + + + + + d9194145-aa70-4a36-8b7a-c929936f98f7 + + + + + + + + + 14.8cm + true + 21cm + 0.25cm + true + 0.5cm + 0.5cm + 0.5cm + 3255cde9-74a1-4005-8008-232d8355d769 + 21cm + + + + + CodCompany + System.String + + + ODP + System.String + + + UDC + System.String + + + Tara + System.Double + + + IdxStato + System.Int32 + + + Qta + System.Decimal + + + CodImballo + System.String + + + CreateDate + System.DateTime + + + ModDate + System.DateTime + + + + GMWConnectionString + dbo.stp_getStatoByUdc + true + + + GMWDataSet + stp_getStatoByUdc + + + + + GetData + + + + + 20cm + + 1cm + + + textbox1 + 12.69841cm + + 1 + true + 0.91429cm + CartellinoTara + + + GMWDataSet_stp_getStatoByUdc + 4cm + + + + + =Fields!UDC.Value + + + + + =Fields!UDC.Value + Ascending + + +
+ + + + + 3 + + + UDC + + true + ="*" & Fields!UDC.Value & "*" + + + + + 3.50781cm + + +
+ + + 19cm +
+ + + + + + + textbox4 + + true + Tara + + + + + + + Tara + + true + =Fields!Tara.Value & " Kg" + + + + + + + CreateDate + + true + =Fields!CreateDate.Value + + + + + 3.50781cm + + +
+ + + 6.31847cm + + + 6.36305cm + + + 6.31848cm + + + 7.01562cm + 0.5cm +
+ + 13.5cm + + it-IT + 0.5cm + 14.8cm + \ No newline at end of file diff --git a/GMW/GMW_deploy/Release/bin/GMW.dll b/GMW/GMW_deploy/Release/bin/GMW.dll index 857b1730..59398f78 100644 Binary files a/GMW/GMW_deploy/Release/bin/GMW.dll and b/GMW/GMW_deploy/Release/bin/GMW.dll differ diff --git a/GMW/GMW_deploy/Release/bin/GMW_data.dll b/GMW/GMW_deploy/Release/bin/GMW_data.dll index 3129d247..e8aff844 100644 Binary files a/GMW/GMW_deploy/Release/bin/GMW_data.dll and b/GMW/GMW_deploy/Release/bin/GMW_data.dll differ diff --git a/GMW/GMW_deploy/Release/mazzAppSettings.config b/GMW/GMW_deploy/Release/mazzAppSettings.config index 3c582a52..85d9da69 100644 --- a/GMW/GMW_deploy/Release/mazzAppSettings.config +++ b/GMW/GMW_deploy/Release/mazzAppSettings.config @@ -1,3 +1,7 @@  + + + + \ No newline at end of file diff --git a/GMW/GMW_deploy/Release/obj/Debug/GMW.csproj.FileListAbsolute.txt b/GMW/GMW_deploy/Release/obj/Debug/GMW.csproj.FileListAbsolute.txt index 075033d3..963d1e46 100644 --- a/GMW/GMW_deploy/Release/obj/Debug/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW_deploy/Release/obj/Debug/GMW.csproj.FileListAbsolute.txt @@ -9,3 +9,5 @@ C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.xml C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled diff --git a/GMW/GMW_deploy/Release/obj/Debug/GMW.dll b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll index 54b7839a..029549aa 100644 Binary files a/GMW/GMW_deploy/Release/obj/Debug/GMW.dll and b/GMW/GMW_deploy/Release/obj/Debug/GMW.dll differ diff --git a/GMW/GMW_deploy/Release/obj/Debug/RdlCompile.cache b/GMW/GMW_deploy/Release/obj/Debug/RdlCompile.cache new file mode 100644 index 00000000..cecbf1af Binary files /dev/null and b/GMW/GMW_deploy/Release/obj/Debug/RdlCompile.cache differ diff --git a/GMW/GMW_deploy/Release/obj/Debug/RdlCompile.compiled b/GMW/GMW_deploy/Release/obj/Debug/RdlCompile.compiled new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache index 20f247b9..8b5e064a 100644 Binary files a/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_deploy/Release/obj/Release/GMW.csproj.FileListAbsolute.txt b/GMW/GMW_deploy/Release/obj/Release/GMW.csproj.FileListAbsolute.txt index 90762191..f1ed561d 100644 --- a/GMW/GMW_deploy/Release/obj/Release/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW_deploy/Release/obj/Release/GMW.csproj.FileListAbsolute.txt @@ -8,3 +8,5 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\ResolveAssemblyReference.cache c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.compiled diff --git a/GMW/GMW_deploy/Release/obj/Release/GMW.dll b/GMW/GMW_deploy/Release/obj/Release/GMW.dll index 857b1730..59398f78 100644 Binary files a/GMW/GMW_deploy/Release/obj/Release/GMW.dll and b/GMW/GMW_deploy/Release/obj/Release/GMW.dll differ diff --git a/GMW/GMW_deploy/Release/obj/Release/RdlCompile.cache b/GMW/GMW_deploy/Release/obj/Release/RdlCompile.cache new file mode 100644 index 00000000..cecbf1af Binary files /dev/null and b/GMW/GMW_deploy/Release/obj/Release/RdlCompile.cache differ diff --git a/GMW/GMW_deploy/Release/obj/Release/RdlCompile.compiled b/GMW/GMW_deploy/Release/obj/Release/RdlCompile.compiled new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache index 88ebef06..d166e1a1 100644 Binary files a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_deploy/Release/web.config b/GMW/GMW_deploy/Release/web.config index 45a04cf5..9f881b96 100644 --- a/GMW/GMW_deploy/Release/web.config +++ b/GMW/GMW_deploy/Release/web.config @@ -48,6 +48,10 @@ + + + + diff --git a/GMW/GMW_deploy/Source/GMW.csproj b/GMW/GMW_deploy/Source/GMW.csproj index 5bf5fe93..6ebd0334 100644 --- a/GMW/GMW_deploy/Source/GMW.csproj +++ b/GMW/GMW_deploy/Source/GMW.csproj @@ -101,7 +101,11 @@ - + + + + + diff --git a/GMW/GMW_deploy/Source/Reports/CartellinoTara.rdlc b/GMW/GMW_deploy/Source/Reports/CartellinoTara.rdlc new file mode 100644 index 00000000..d0ae95f7 --- /dev/null +++ b/GMW/GMW_deploy/Source/Reports/CartellinoTara.rdlc @@ -0,0 +1,258 @@ + + + + + d9194145-aa70-4a36-8b7a-c929936f98f7 + + + + + + + + + 14.8cm + true + 21cm + 0.25cm + true + 0.5cm + 0.5cm + 0.5cm + 3255cde9-74a1-4005-8008-232d8355d769 + 21cm + + + + + CodCompany + System.String + + + ODP + System.String + + + UDC + System.String + + + Tara + System.Double + + + IdxStato + System.Int32 + + + Qta + System.Decimal + + + CodImballo + System.String + + + CreateDate + System.DateTime + + + ModDate + System.DateTime + + + + GMWConnectionString + dbo.stp_getStatoByUdc + true + + + GMWDataSet + stp_getStatoByUdc + + + + + GetData + + + + + 20cm + + 1cm + + + textbox1 + 12.69841cm + + 1 + true + 0.91429cm + CartellinoTara + + + GMWDataSet_stp_getStatoByUdc + 4cm + + + + + =Fields!UDC.Value + + + + + =Fields!UDC.Value + Ascending + + +
+ + + + + 3 + + + UDC + + true + ="*" & Fields!UDC.Value & "*" + + + + + 3.50781cm + + +
+ + + 19cm +
+ + + + + + + textbox4 + + true + Tara + + + + + + + Tara + + true + =Fields!Tara.Value & " Kg" + + + + + + + CreateDate + + true + =Fields!CreateDate.Value + + + + + 3.50781cm + + +
+ + + 6.31847cm + + + 6.36305cm + + + 6.31848cm + + + 7.01562cm + 0.5cm +
+ + 13.5cm + + it-IT + 0.5cm + 14.8cm + \ No newline at end of file diff --git a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs index 178551f0..afcce629 100644 --- a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs +++ b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs @@ -5,13 +5,14 @@ using System.Web.Services; using System.Data; using GMW_data; using GMW; +using SteamWare; namespace GMW.WS { /// /// Summary description for bilance /// - [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.0.9.14")] + [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.14")] [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] [System.ComponentModel.ToolboxItem(false)] public class bilance : System.Web.Services.WebService @@ -215,9 +216,18 @@ namespace GMW.WS [WebMethod(Description = "Effettua la stampa richiesta per l'UDC indicato")] public bool UdcPrintLabel(string place, tipoCartellino cartellino, string UDC) { - bool answ = true; - // qui dovrei lanciare la stampa a seconda del tipo cartellino... + bool answ = false; + try + { + reportPrinter.obj.printReport(reportRichiesto.CartellinoTara, memLayer.ML.confReadString("printerCartTara"), UDC); + //reportPrinter.obj.printReport(reportRichiesto.CartellinoTara, "PDFCreator", UDC); + answ = true; + } + catch (Exception e) + { + logger.lg.scriviLog(e.ToString(), tipoLog.EXCEPTION); + } return answ; } diff --git a/GMW/GMW_deploy/Source/Web.config b/GMW/GMW_deploy/Source/Web.config index efbafc61..b2cc97c4 100644 --- a/GMW/GMW_deploy/Source/Web.config +++ b/GMW/GMW_deploy/Source/Web.config @@ -77,6 +77,10 @@ + + + + diff --git a/GMW/GMW_deploy/Source/bin/GMW.dll b/GMW/GMW_deploy/Source/bin/GMW.dll index 857b1730..59398f78 100644 Binary files a/GMW/GMW_deploy/Source/bin/GMW.dll and b/GMW/GMW_deploy/Source/bin/GMW.dll differ diff --git a/GMW/GMW_deploy/Source/bin/GMW_data.dll b/GMW/GMW_deploy/Source/bin/GMW_data.dll index 3129d247..e8aff844 100644 Binary files a/GMW/GMW_deploy/Source/bin/GMW_data.dll and b/GMW/GMW_deploy/Source/bin/GMW_data.dll differ diff --git a/GMW/GMW_deploy/Source/mazzAppSettings.config b/GMW/GMW_deploy/Source/mazzAppSettings.config index 3c582a52..85d9da69 100644 --- a/GMW/GMW_deploy/Source/mazzAppSettings.config +++ b/GMW/GMW_deploy/Source/mazzAppSettings.config @@ -1,3 +1,7 @@  + + + + \ No newline at end of file diff --git a/GMW/GMW_deploy/Source/obj/Debug/GMW.csproj.FileListAbsolute.txt b/GMW/GMW_deploy/Source/obj/Debug/GMW.csproj.FileListAbsolute.txt index 075033d3..963d1e46 100644 --- a/GMW/GMW_deploy/Source/obj/Debug/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW_deploy/Source/obj/Debug/GMW.csproj.FileListAbsolute.txt @@ -9,3 +9,5 @@ C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.xml C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll C:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled diff --git a/GMW/GMW_deploy/Source/obj/Debug/GMW.dll b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll index 54b7839a..029549aa 100644 Binary files a/GMW/GMW_deploy/Source/obj/Debug/GMW.dll and b/GMW/GMW_deploy/Source/obj/Debug/GMW.dll differ diff --git a/GMW/GMW_deploy/Source/obj/Debug/RdlCompile.cache b/GMW/GMW_deploy/Source/obj/Debug/RdlCompile.cache new file mode 100644 index 00000000..cecbf1af Binary files /dev/null and b/GMW/GMW_deploy/Source/obj/Debug/RdlCompile.cache differ diff --git a/GMW/GMW_deploy/Source/obj/Debug/RdlCompile.compiled b/GMW/GMW_deploy/Source/obj/Debug/RdlCompile.compiled new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache index 20f247b9..8b5e064a 100644 Binary files a/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_deploy/Source/obj/Release/GMW.csproj.FileListAbsolute.txt b/GMW/GMW_deploy/Source/obj/Release/GMW.csproj.FileListAbsolute.txt index 90762191..f1ed561d 100644 --- a/GMW/GMW_deploy/Source/obj/Release/GMW.csproj.FileListAbsolute.txt +++ b/GMW/GMW_deploy/Source/obj/Release/GMW.csproj.FileListAbsolute.txt @@ -8,3 +8,5 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\ResolveAssemblyReference.cache c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\GMW.pdb +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Release\RdlCompile.compiled diff --git a/GMW/GMW_deploy/Source/obj/Release/GMW.dll b/GMW/GMW_deploy/Source/obj/Release/GMW.dll index 857b1730..59398f78 100644 Binary files a/GMW/GMW_deploy/Source/obj/Release/GMW.dll and b/GMW/GMW_deploy/Source/obj/Release/GMW.dll differ diff --git a/GMW/GMW_deploy/Source/obj/Release/RdlCompile.cache b/GMW/GMW_deploy/Source/obj/Release/RdlCompile.cache new file mode 100644 index 00000000..cecbf1af Binary files /dev/null and b/GMW/GMW_deploy/Source/obj/Release/RdlCompile.cache differ diff --git a/GMW/GMW_deploy/Source/obj/Release/RdlCompile.compiled b/GMW/GMW_deploy/Source/obj/Release/RdlCompile.compiled new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache index 88ebef06..d166e1a1 100644 Binary files a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 77d88387..1f3fab61 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -349,14 +349,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" - "ProductCode" = "8:{50716703-421B-4F09-AAAA-8823C33A7104}" - "PackageCode" = "8:{62673DA0-52C6-4712-9954-994F0B103E0B}" + "ProductCode" = "8:{911BD0AB-494A-4D74-8E34-D68B6D7EAD1C}" + "PackageCode" = "8:{66F10CFD-0859-43DE-8FB8-A8CE37AC80C3}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.9.14" + "ProductVersion" = "8:1.0.14" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index 3fece88a..d7bbce29 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ diff --git a/GMW/GMW_installer/Release/GMW_installer.zip b/GMW/GMW_installer/Release/GMW_installer.zip new file mode 100644 index 00000000..b5a55b2a Binary files /dev/null and b/GMW/GMW_installer/Release/GMW_installer.zip differ