diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 8429637d..39c99010 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -797,9 +797,7 @@ - - @@ -996,7 +994,6 @@ - diff --git a/GMW/GMW/Reports/CartellinoFinito.rdlc b/GMW/GMW/Reports/CartellinoFinito.rdlc index dd65dd91..41819dd6 100644 --- a/GMW/GMW/Reports/CartellinoFinito.rdlc +++ b/GMW/GMW/Reports/CartellinoFinito.rdlc @@ -259,7 +259,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 33 - IDENTIFICAZIONE PRODOTTO + IDENTIFICAZIONE PRODOTTO FINITO diff --git a/GMW/GMW/Reports/CartellinoFus.rdlc b/GMW/GMW/Reports/CartellinoFus.rdlc index dd65dd91..0c0ef960 100644 --- a/GMW/GMW/Reports/CartellinoFus.rdlc +++ b/GMW/GMW/Reports/CartellinoFus.rdlc @@ -259,7 +259,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 33 - IDENTIFICAZIONE PRODOTTO + IDENTIFICAZIONE PRODOTTO FUSO diff --git a/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc b/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc index dd65dd91..77e23f8c 100644 --- a/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc +++ b/GMW/GMW/Reports/CartellinoLiquidiF10.rdlc @@ -3,15 +3,22 @@ 37647cab-a462-4a59-ae44-1bb2d82f1cff - - SQL - Data Source=SRV-DEV01;Initial Catalog=SP_GMW - true - + GMW_Test 14.8cm Stampa cartellino di produzione + + + String + + + USPLI20000006 + + + UDC + + true 21cm 0.25cm @@ -61,67 +68,67 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB CodCS System.String - + codcliente System.String - + ragsociale System.String - + particolare System.String - + descparticolare System.String - + disegnogrezzo System.String - + esponente System.String - + codimpianto System.String - + descimpianto System.String - + codstampo System.String - + figura System.String - + datafus System.DateTime - + turnofus System.Int32 - + codimballo System.String - + codsoggetto System.String - + numcont System.Int32 - + tara System.Double @@ -129,19 +136,19 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB qta System.Decimal - + codstato System.String - + idxposizione System.Int32 - + pesotot System.Double - + pesocad System.Double @@ -177,11 +184,24 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB DescFamiglia System.String + + Note + System.String + + + NoteTratt + System.String + GMWConnectionString StoredProcedure - dbo.stp_prtCartByUDC + stp_prtCartLiquidi_F10ByUDC + + + =Parameters!UDC.Value + + true @@ -203,10 +223,8 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB - - FitProportional - image/jpeg - Embedded + + textbox36 - 34 - mm_logo - + 45 + + @@ -246,9 +261,9 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Solid - 0.5pt - 0.5pt - 0.5pt + 1pt + 1pt + 1pt 22pt Center @@ -258,8 +273,8 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 2pt - 33 - IDENTIFICAZIONE PRODOTTO + 44 + CARTELLINO LIQUIDI F10 @@ -280,20 +295,19 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Solid - 0.5pt - 0.5pt - 0.5pt + 1pt + 1pt + 1pt 8pt Right Middle 1pt - 1pt + 5pt 2pt 2pt - 32 - true + 43 =FormatDateTime(Globals!ExecutionTime ) @@ -308,10 +322,10 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1.80475cm - 1.2533cm + 1.1533cm - 2.00528cm + 2.10528cm 2.30607cm @@ -335,134 +349,36 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1.2cm + 11.1cm
- 5 + 2 RagSociale - true - 1 - ="UDC : " + Fields!UDC.Value - - - - - 5 - - - textbox9 - - ="*" + Fields!UDC.Value + "*" - - - - - 1.3cm - - - - - 2 - - - textbox16 - - 4 - CLIENTE - - - - - 5 - - - DescParticolare - - 3 - =TRIM(Fields!CodCliente.Value) + " " + LEFT(Fields!RagSociale.Value,50 ) + 2 + ="UDC : " @@ -473,27 +389,83 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB textbox20 - 2 + 1 true + =Fields!UDC.Value + + + + + 5 + + + + =iif(Fields!UDC.Value="","","*" + Fields!UDC.Value + "*") + + + + + 1.3cm + + + + + 10 + + + DescLega + + 3 @@ -509,226 +481,123 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB textbox14 - 7 - DISEGNO - ESP. - - - - - 5 - - - textbox8 - - 6 - true - =RTrim(Fields!DisegnoGrezzo.Value) + " - " + RTrim(Fields!Esponente.Value) - - - - - 3 - - - textbox1 - - 5 - true - FIGURA - - - - - 0.5cm - - - - - 7 - - - Particolare - - 9 - =Fields!Particolare.Value - - - - - 3 - - - textbox44 - - 8 - =Fields!Figura.Value - - - - - 2.3cm - - - - - 2 - - - textbox4 - - 14 - true - PARTICOLARE + 6 + Articolo : - 5 + 4 + + + + 5 + =Fields!particolare.Value + + + + + 4 + + + + 4 + ="DATA IMBALLAGGIO " + Chr(13)+ Chr(10) + Format(First(Fields!CreateDate.Value),"d").ToString + + + + + 1.3cm + + + + - textbox3 + 9 + + + + + + + + textbox5 + + 8 + true + + + + + + 8 + + + textbox13 + + 7 + true + =First(Fields!descparticolare.Value) + + + + + 0.8cm + + + + + 2 + + + DescFamiglia + 13 - true - =Fields!DescParticolare.Value + PEZZI : + 2 - - textbox40 + + Qta_1 12 - true - + =First(Fields!Qta.Value) + 2 - - textbox50 + + textbox9 10 - true - + ="DISEGNO : " + First(Fields!disegnogrezzo.Value).ToString - 0.5cm + 1.45cm - 3 + 2 - - textbox11 + + disegnogrezzo 20 - =Fields!DescImpianto.Value + + 3 - - textbox25 + + textbox16 19 - data + true + - - textbox32 + + textbox24 18 - =Fields!DataFus.Value + true + - - textbox63 + + textbox37 17 - ="T" + Str(Fields!TurnoFus.Value) + true + + + + + + + + textbox38 + + 16 + true + + + + + + + + textbox39 + + 15 + true + + + + + + + + textbox40 + + 14 + true + + + + + + 0.7cm + + + + + 2 + + + descstato + + 22 + Trattamenti : + + + + + 8 + + + + 21 + =First(Fields!NoteTratt.Value) + + + + + 1.5cm + + + + + 2 + + + textbox6 + + 24 + Note : + + + + + 8 + + + + 23 + =First(Fields!Note.Value) + + + + + 1.5cm + + + + + 2 + + + + 32 + Imballo : + + + + + 2 + + + codimballo + + 31 + =First(Fields!codimballo.Value) + + + + + + + textbox7 + + 30 + true + + + + + + + + textbox8 + + 29 + true + + + + + + + + + 28 + + + + + + + + + 27 + + + + + + + + + 26 + + + + + + + + + 25 + + + + + + 0.8cm + + + + + + + textbox1 + + 42 + + + + + + + + textbox2 + + 41 + + + + + + + + textbox11 + + 40 + + + + + + + + textbox12 + + 39 + + + + + + + + textbox18 + + 38 + + + + + + + + textbox26 + + 37 + + + + + + + + textbox27 + + 36 + + + + + + + + textbox28 + + 35 + + + + + + + + textbox29 + + 34 + @@ -966,431 +1277,34 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB textbox30 - 16 - operatore - - - - - 3 - - - CodSoggetto - - 15 - =Fields!CodSoggetto.Value - - - - - 0.5cm - - - - - 2 - - - textbox5 - - 25 - Contenitore - - - - - - - NumCont - - 24 - =Fields!NumCont.Value - - - - - 2 - - - CodImballo - - 23 - ="Imballo " + Fields!CodImballo.Value - - - - - 2 - - - CodStato - - 22 - true - =Fields!descstato.Value - - - - - 3 - - - textbox34 - - 21 - n. pezzi - - - - - 0.5cm - - - - - 7 - - - descstato - - 27 - true - - - - - - 3 - - - Qta - - 26 - true - =Fields!Qta.Value - - - - - 2.5cm - - - - - 7 - - - descimballo - - 29 + 33 - - 3 - - - textbox49 - - 28 - Tara - - - - 0.5cm - - - - - 7 - - - DescFamiglia - - 31 - - - - - - 3 - - - Tara - - 30 - =Fields!Tara.Value - - - - - 2.7cm + 0.25cm true
+ 1cm + 11.5cm - 34 - mm_logo - + 37 + + @@ -246,9 +261,9 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Solid - 0.5pt - 0.5pt - 0.5pt + 1pt + 1pt + 1pt 22pt Center @@ -258,8 +273,8 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 2pt 2pt - 33 - IDENTIFICAZIONE PRODOTTO + 36 + CARTELLINO LIQUIDI F18 @@ -280,20 +295,19 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB Solid - 0.5pt - 0.5pt - 0.5pt + 1pt + 1pt + 1pt 8pt Right Middle 1pt - 1pt + 5pt 2pt 2pt - 32 - true + 35 =FormatDateTime(Globals!ExecutionTime ) @@ -335,6 +349,7 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB 1.2cm + 11.1cm
@@ -344,26 +359,10 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB RagSociale - true - ="*" + Fields!UDC.Value + "*" + =iif(Fields!UDC.Value="","","*" + Fields!UDC.Value + "*") @@ -410,90 +397,19 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB - 2 + 10 - - textbox16 + + DescLega - 4 - CLIENTE - - - - - 5 - - - DescParticolare - - 3 - =TRIM(Fields!CodCliente.Value) + " " + LEFT(Fields!RagSociale.Value,50 ) - - - - - 3 - - - textbox20 - 2 - true @@ -509,574 +425,25 @@ zzQB/KD+29/wbk/8ABcvU/wBojV/EXiPwJqfxv1XVbW0vdW+Idl4mt3S9uZIUMkOb+eKdvKfMYLIq4jB textbox14 - 7 - DISEGNO - ESP. - - - - - 5 - - - textbox8 - - 6 - true - =RTrim(Fields!DisegnoGrezzo.Value) + " - " + RTrim(Fields!Esponente.Value) - - - - - 3 - - - textbox1 - - 5 - true - FIGURA - - - - - 0.5cm - - - - - 7 - - - Particolare - - 9 - =Fields!Particolare.Value + 4 + Articolo : - 3 - - - textbox44 - - 8 - =Fields!Figura.Value - - - - - 2.3cm - - - - - 2 + 8 - textbox4 - 14 - true - PARTICOLARE - - - - - 5 - - - textbox3 - - 13 - true - =Fields!DescParticolare.Value - - - - - - - textbox40 - - 12 - true - - - - - - - - textbox50 - - 11 - true - - - - - - - - textbox57 - - 10 - true - - - - - - 0.5cm - - - - - 3 - - - textbox11 - - 20 - =Fields!DescImpianto.Value - - - - - - - textbox25 - - 19 - data - - - - - - - textbox32 - - 18 - =Fields!DataFus.Value - - - - - - - textbox63 - - 17 - ="T" + Str(Fields!TurnoFus.Value) - - - - - - - textbox30 - - 16 - operatore - - - - - 3 - - - CodSoggetto - - 15 - =Fields!CodSoggetto.Value - - - - - 0.5cm - - - - - 2 - - - textbox5 - - 25 - Contenitore - - - - - - - NumCont - + 3 + =Fields!particolare.Value + + + + + 1.5cm + + + + + 10 + + + + 5 + =First(Fields!descparticolare.Value) + + + + + 0.5cm + + + + + 10 + + + DescLega2 + + 6 + + + + + + 1cm + + + + + 2 + + + DescFamiglia + + 12 + Quantità: + + + + + 4 + + + Qta_1 + + 11 + =First(Fields!Qta.Value) + + + + + + + textbox55 + + 10 + + + + + + + + textbox10 + + 9 + + + + + + + + textbox67 + + 8 + + + + + + + + textbox68 + + 7 + + + + + + 1.25cm + + + + + 2 + + + descstato + + 14 + + + + + + 8 + + + + 13 + + + + + + 1.5cm + + + + + 2 + + + textbox6 + + 16 + Note : + + + + + 8 + + + + 15 + =First(Fields!Note.Value) + + + + + 1.5cm + + + + + 2 + + + 24 - =Fields!NumCont.Value + Imballo : 2 - - CodImballo + + codimballo 23 - ="Imballo " + Fields!CodImballo.Value + =First(Fields!codimballo.Value) - 2 - - CodStato + + textbox7 22 true - =Fields!descstato.Value + - 3 - - textbox34 + + textbox8 21 - n. pezzi - - - - - 0.5cm - - - - - 7 - - - descstato - - 27 true - 3 - - Qta + - 26 - true - =Fields!Qta.Value - - - - - 2.5cm - - - - - 7 - - - descimballo - - 29 + 20 - 3 - - textbox49 + - 28 - Tara + 19 + + + + + + + + + 18 + + + + + + + + + 17 + - 0.5cm + 0.8cm - 7 - - DescFamiglia + + textbox1 + 34 + + + + + + + + textbox2 + + 33 + + + + + + + + textbox11 + + 32 + + + + + + + + textbox12 + 30 - =Fields!Tara.Value + + + + + + + + textbox26 + + 29 + + + + + + + + textbox27 + + 28 + + + + + + + + textbox28 + + 27 + + + + + + + + textbox29 + + 26 + + + + + + + + textbox30 + + 25 + - 2.7cm + 0.25cm true
+ 1cm + 11.5cm 33 - IDENTIFICAZIONE PRODOTTO + IDENTIFICAZIONE PRODOTTO WIP diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs index 08cbb055..593080b1 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs @@ -456,7 +456,7 @@ namespace GMW.WebUserControls UdcExists = false; } // ora stampo il nuovo cartellino!!! - MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartFin); + MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartLiquidiF10); } } } diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs index 9eb18756..642f6c98 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs @@ -374,7 +374,7 @@ namespace GMW.WebUserControls if (newUdcChild != "") { // ora stampo il nuovo cartellino!!! - MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartFin); + MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartLiquidiF18); } } } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 00348417..a5a03b64 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 68122ee9..8c496c4a 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 3de65f48..a5a03b64 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 index 0e197f12..99f40e21 100644 Binary files a/GMW/GMW/obj/Debug/RdlCompile.cache and b/GMW/GMW/obj/Debug/RdlCompile.cache differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 94b35f87..d908171d 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.dll b/GMW/GMW/obj/Release/GMW.dll index 00348417..66e639b6 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 index 0e197f12..99f40e21 100644 Binary files a/GMW/GMW/obj/Release/RdlCompile.cache and b/GMW/GMW/obj/Release/RdlCompile.cache differ diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 113a7e90..8c496c4a 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/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 113a7e90..8c496c4a 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ