diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll
index 22bc9de2..efeeb947 100644
Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ
diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll
index 8bea4ca5..514e21fd 100644
Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ
diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll
index 38b64368..7bba84bb 100644
Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ
diff --git a/GMW/Post_FusioniSP.aspx b/GMW/Post_FusioniSP.aspx
index f4783fe7..99e31e52 100644
--- a/GMW/Post_FusioniSP.aspx
+++ b/GMW/Post_FusioniSP.aspx
@@ -20,7 +20,13 @@
-
+
il giro è questo
@@ -35,11 +41,4 @@
- Creazione report anomalie quotidiano (orientativamente conteggio numero datamatrix di ogni fase, conteggio anomalie e qualificazione delle stesse)
<%: traduci("StampaEtichetta") %>
-
-
<%: testoLabel %>
diff --git a/GMW/WebUserControls/mod_postFusioni.ascx.cs b/GMW/WebUserControls/mod_postFusioni.ascx.cs
index 646e5047..14b4100a 100644
--- a/GMW/WebUserControls/mod_postFusioni.ascx.cs
+++ b/GMW/WebUserControls/mod_postFusioni.ascx.cs
@@ -1,9 +1,13 @@
using System;
using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Printing;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using GMW_data;
+using SteamWare;
namespace GMW.WebUserControls
{
@@ -27,9 +31,11 @@ namespace GMW.WebUserControls
///
protected void btnStampaEtichetta_Click(object sender, EventArgs e)
{
- // creo barcode
-
- // stampo su printer configurata...
+ // attenzione: page size deve essere uguale su printer e su richiesta!!!
+ PaperSize pS = new PaperSize("label", 830, 1170);
+ // stampo il vero bcode su etichettatrice!!!
+ bCodePrinter.man.Print(Postazione.printer, pS, testoLabel);
}
+
}
}
\ No newline at end of file
diff --git a/GMW/WebUserControls/mod_postFusioni.ascx.designer.cs b/GMW/WebUserControls/mod_postFusioni.ascx.designer.cs
index 4c98a400..bc38c4da 100644
--- a/GMW/WebUserControls/mod_postFusioni.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_postFusioni.ascx.designer.cs
@@ -20,14 +20,5 @@ namespace GMW.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.LinkButton btnStampaEtichetta;
-
- ///
- /// lblEtichetta control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblEtichetta;
}
}
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index 4ea29077..e7403e6f 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index 8bea4ca5..514e21fd 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index 38b64368..7bba84bb 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index 8c66a072..2e3022d5 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/GMW_data/bCodePrinter.cs b/GMW_data/bCodePrinter.cs
index 31331f4a..fdf5cda4 100644
--- a/GMW_data/bCodePrinter.cs
+++ b/GMW_data/bCodePrinter.cs
@@ -7,6 +7,7 @@ using System.Drawing.Printing;
using System.Windows.Forms;
using SteamWare;
using GMW_data;
+using System.Drawing;
namespace GMW_data
@@ -16,40 +17,25 @@ namespace GMW_data
///
public class bCodePrinter
{
- ///
- /// Handler per PrintPageEvents
- ///
- ///
- ///
- private void PrintPage(object sender, PrintPageEventArgs ev)
- {
-#if false
- Metafile pageImage = new Metafile(m_streams[m_currentPageIndex]);
- ev.Graphics.DrawImage(pageImage, ev.PageBounds);
- m_currentPageIndex++;
- ev.HasMorePages = (m_currentPageIndex < m_streams.Count);
-#endif
- }
///
/// funzione di stampa...
///
- private void Print(string printerName)
+ public void Print(string printerName, PaperSize pSize, string testo)
{
-#if false
- //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("Impostazioni non valide per la stampante \"{0}\".", printerName), tipoLog.ERROR);
- return;
- }
- printDoc.PrintPage += new PrintPageEventHandler(PrintPage);
- printDoc.Print();
-#endif
+ tex2print = testo;
+ PrintDocument label = new PrintDocument();
+ label.DefaultPageSettings.PaperSize = pSize;
+ label.PrinterSettings.PrinterName = printerName;
+ label.PrinterSettings.DefaultPageSettings.PaperSize = pSize;
+ label.PrintPage += new PrintPageEventHandler(PrintPage);
+ label.Print();
+ }
+ public string tex2print { get; set; }
+ private void PrintPage(object sender, PrintPageEventArgs e)
+ {
+ SolidBrush brush = new SolidBrush(Color.Black);
+ Font threeOfNine = new Font("Free 3 of 9 Extended", 40, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+ e.Graphics.DrawString("*" + tex2print + "*", threeOfNine, brush, 20, 20);
}
///
/// oggetto protected
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 99b34ee7..78a46157 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.701.1623")]
-[assembly: AssemblyFileVersion("2.5.701.1623")]
+[assembly: AssemblyVersion("2.5.702.1623")]
+[assembly: AssemblyFileVersion("2.5.702.1623")]
[assembly: AssemblyCopyright("Steamware © 2007-2014")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index d31aa260..1eff82dd 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.5.701.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.701.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.702.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.702.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+