From 0b2bc18e8ea10d4257633374f6e3964f10230d60 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 21 Mar 2014 10:19:36 +0100 Subject: [PATCH] Fix gestioen TT e stampa cartellino relativo con checkbox x ok durezza post trattamento --- GMW/Reports/CartellinoALRX.rdlc | 22 +- GMW/Reports/CartellinoALTT.rdlc | 54 ++- GMW/Reports/SP/CartellinoALRX.rdlc | 18 +- GMW/Reports/SP/CartellinoALTT.rdlc | 50 ++- GMW/WebUserControls/mod_PostProveMecc.ascx.cs | 35 +- GMW/bin/GMW.dll | Bin 733696 -> 734720 bytes GMW/bin/GMW_data.dll | Bin 2252288 -> 2261504 bytes GMW/bin/SteamWare.dll | Bin 498688 -> 498688 bytes GMW_data/DS_cartellini.Designer.cs | 382 +++++++++++------- GMW_data/DS_cartellini.xsd | 30 +- GMW_data/reportPrinter.cs | 6 + 11 files changed, 378 insertions(+), 219 deletions(-) diff --git a/GMW/Reports/CartellinoALRX.rdlc b/GMW/Reports/CartellinoALRX.rdlc index 1726254f..86faa370 100644 --- a/GMW/Reports/CartellinoALRX.rdlc +++ b/GMW/Reports/CartellinoALRX.rdlc @@ -96,8 +96,8 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Qta System.Decimal - - CodSoggetto + + Codsoggetto System.String @@ -112,6 +112,10 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Note System.String + + Trattamento + System.String + GMWConnectionString @@ -137,7 +141,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2cm - 6.75cm + 7.25cm 10 true - 9.75cm + 9.5cm 0.63492cm DATA CREAZIONE @@ -557,7 +561,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB textbox55 - 4.75cm + 4.5cm 7.5cm 4 - true 1.25cm 1.25cm =First(Fields!Cesta.Value) @@ -640,7 +643,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB DataCreaz 2.63492cm - 6.75cm + 7.25cm 2 - true - 9.75cm + 9.5cm 1.25cm =Fields!DataCreaz.Value diff --git a/GMW/Reports/CartellinoALTT.rdlc b/GMW/Reports/CartellinoALTT.rdlc index 1726254f..59ab6b9f 100644 --- a/GMW/Reports/CartellinoALTT.rdlc +++ b/GMW/Reports/CartellinoALTT.rdlc @@ -13,7 +13,7 @@ String - ALR1400001A001 + ALT1400010A004 AL @@ -96,8 +96,8 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Qta System.Decimal - - CodSoggetto + + Codsoggetto System.String @@ -112,6 +112,10 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Note System.String + + Trattamento + System.String + GMWConnectionString @@ -135,9 +139,33 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB GMWDataSet_stp_prtCartAL + + Trattamento + 10.75cm + 18.25cm + + 11 + 0.25cm + 0.63492cm + =First(Fields!Trattamento.Value) + 2cm - 6.75cm + 7.25cm 10 true - 9.75cm + 9.5cm 0.63492cm DATA CREAZIONE @@ -194,7 +222,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Note - 10.75cm + 11.75cm 18.25cm 4 - true 1.25cm 1.25cm =First(Fields!Cesta.Value) @@ -640,7 +667,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB DataCreaz 2.63492cm - 6.75cm + 7.25cm 2 - true - 9.75cm + 9.5cm 1.25cm =Fields!DataCreaz.Value @@ -683,7 +709,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1 3.25cm 1cm - ASSIEME RX + ASSIEME TRATTATI 0.25cm @@ -710,7 +736,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB =Fields!AL.Value - 13.25cm + 14.25cm 10 true - 9.75cm + 9.5cm 0.63492cm DATA CREAZIONE @@ -557,7 +561,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB textbox55 - 4.75cm + 4.5cm 7.5cm 4 - true 1.25cm 1.25cm =First(Fields!Cesta.Value) @@ -640,7 +643,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB DataCreaz 2.63492cm - 6.75cm + 7.25cm 2 - true - 9.75cm + 9.5cm 1.25cm =Fields!DataCreaz.Value diff --git a/GMW/Reports/SP/CartellinoALTT.rdlc b/GMW/Reports/SP/CartellinoALTT.rdlc index 57493059..59ab6b9f 100644 --- a/GMW/Reports/SP/CartellinoALTT.rdlc +++ b/GMW/Reports/SP/CartellinoALTT.rdlc @@ -13,7 +13,7 @@ String - ALR1400001A001 + ALT1400010A004 AL @@ -112,6 +112,10 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Note System.String + + Trattamento + System.String + GMWConnectionString @@ -135,9 +139,33 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB GMWDataSet_stp_prtCartAL + + Trattamento + 10.75cm + 18.25cm + + 11 + 0.25cm + 0.63492cm + =First(Fields!Trattamento.Value) + 2cm - 6.75cm + 7.25cm 10 true - 9.75cm + 9.5cm 0.63492cm DATA CREAZIONE @@ -194,7 +222,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Note - 10.75cm + 11.75cm 18.25cm 4 - true 1.25cm 1.25cm =First(Fields!Cesta.Value) @@ -640,7 +667,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB DataCreaz 2.63492cm - 6.75cm + 7.25cm 2 - true - 9.75cm + 9.5cm 1.25cm =Fields!DataCreaz.Value @@ -683,7 +709,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1 3.25cm 1cm - ASSIEME RX + ASSIEME TRATTATI 0.25cm @@ -710,7 +736,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB =Fields!AL.Value - 13.25cm + 14.25cm