diff --git a/project/XPS/Reports/ReportSchedaIdentificazione.rdlc b/project/XPS/Reports/ReportSchedaIdentificazione.rdlc index 55949e7..91c1519 100644 --- a/project/XPS/Reports/ReportSchedaIdentificazione.rdlc +++ b/project/XPS/Reports/ReportSchedaIdentificazione.rdlc @@ -119,6 +119,10 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj Peso System.Double + + Qta + System.Double + FosfManganese System.String @@ -191,23 +195,43 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 0cm - - textbox23 - 7.9cm - 1.4cm + + Peso + 11cm + 2.8cm 39 + 22.1cm + 1.8cm + =First(Fields!Peso.Value) + + + textbox23 + 7.8cm + 1.4cm + + 38 true - 23.4cm + 23.5cm 0.5cm Data arrivo @@ -224,14 +248,14 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 38 + 37 true 0.2cm 0.45cm Codice prodotto - 7.9cm + 7.8cm 0.6cm - 37 + 36 true - 14.9cm + 17.6cm 0.5cm del @@ -261,7 +285,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 36 + 35 true 0.2cm 0.5cm @@ -277,7 +301,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj White - 35 + 34 19.6cm 2.1cm logoequa @@ -295,7 +319,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 34 + 33 14.7cm 1.4cm ="*"&(First(Fields!IdxObj.Value))&"*" @@ -311,7 +335,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 33 + 32 11.4cm 0.7cm =Fields!IdxObj.Value @@ -327,7 +351,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 32 + 31 7.15001cm 0.63492cm Fosfatazione Zinco @@ -344,7 +368,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 31 + 30 6.4cm 0.63492cm =(Fields!FosfZinco.Value) @@ -360,7 +384,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 30 + 29 1.3cm 0.63492cm Fosfatazione + TEFLON @@ -377,7 +401,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 29 + 28 0.5cm 0.63492cm =(Fields!FosfTeflon.Value) @@ -395,7 +419,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 28 + 27 12cm 0.63492cm =(Fields!PeekVicote.Value) @@ -413,7 +437,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 27 + 26 12cm 0.63492cm =(Fields!Zinchlorex.Value) @@ -431,7 +455,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 26 + 25 12cm 0.63492cm =(Fields!PzRoto.Value) @@ -449,7 +473,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 25 + 24 6.4cm 0.63492cm =(Fields!Teflon.Value) @@ -467,7 +491,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 24 + 23 9.65001cm 0.63492cm =(Fields!F2.Value) @@ -485,7 +509,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 23 + 22 6.4cm 0.63492cm =(Fields!F1.Value) @@ -501,7 +525,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 22 + 21 12.75cm 0.63492cm PEEK VICOTE @@ -517,7 +541,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 21 + 20 12.75cm 0.63492cm Zinchlorex @@ -533,7 +557,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 20 + 19 12.75cm 0.63492cm Pz Roto @@ -549,7 +573,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 19 + 18 7.15001cm 0.63492cm TEFLON @@ -565,7 +589,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 18 + 17 10.40001cm 0.63492cm F2 @@ -581,7 +605,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 17 + 16 7.15001cm 0.63492cm F1 @@ -599,7 +623,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 16 + 15 0.5cm 0.63492cm =(Fields!Brunitura.Value) @@ -615,7 +639,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 15 + 14 1.3cm 0.63492cm Brunitura @@ -632,7 +656,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 14 + 13 1.3cm 0.63492cm Fosfatazione Manganese @@ -650,35 +674,15 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 13 + 12 0.5cm 0.63492cm =(Fields!FosfManganese.Value) - - Peso - 10.9cm - 4.1cm - - 12 - 20.7cm - 1.8cm - =First(Fields!Peso.Value) - CodProdotto - 10.9cm - 19.7cm + 11cm + 18.6cm 10 - 14.9cm + 17.6cm 2cm =Fields!DDT_del.Value @@ -918,10 +922,10 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 8.3cm - 14.4cm + 17.1cm 2 0.2cm - 2cm + 2.1cm =First(Fields!DDT.Value) - + 8.3cm - 4.1cm + 3.5cm 1 - 20.7cm + 21.4cm 2cm =First(Fields!DataArrivo.Value) 0.1cm + + 0cm + + 7 + 21.2cm + 2.7cm + + + 2.7cm + 0cm + + 6 + 21.9cm + 2.51323cm + - 2.75cm + 2.8cm 1.5cm - 3 + 5 true - 23.2cm + 23.3cm 0.45cm Peso + + 2.8cm + 1.5cm + + 4 + true + 19cm + 0.45cm + quantità + + + 3.2cm + 2.8cm + + 3 + 19cm + 1.8cm + =First(Fields!Qta.Value) + 2.7cm 2 - 14.7cm 0cm + 2.7cm 0cm 1 - 20.5cm + 18.8cm + 2.4cm 0cm @@ -1005,7 +1071,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj Solid - 14.7cm + 17.4cm 2.7cm @@ -1016,7 +1082,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj Solid - 5cm + 10cm 18cm diff --git a/project/XPS/bin/Reports/ReportSchedaIdentificazione.rdlc b/project/XPS/bin/Reports/ReportSchedaIdentificazione.rdlc index 55949e7..91c1519 100644 --- a/project/XPS/bin/Reports/ReportSchedaIdentificazione.rdlc +++ b/project/XPS/bin/Reports/ReportSchedaIdentificazione.rdlc @@ -119,6 +119,10 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj Peso System.Double + + Qta + System.Double + FosfManganese System.String @@ -191,23 +195,43 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 0cm - - textbox23 - 7.9cm - 1.4cm + + Peso + 11cm + 2.8cm 39 + 22.1cm + 1.8cm + =First(Fields!Peso.Value) + + + textbox23 + 7.8cm + 1.4cm + + 38 true - 23.4cm + 23.5cm 0.5cm Data arrivo @@ -224,14 +248,14 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 38 + 37 true 0.2cm 0.45cm Codice prodotto - 7.9cm + 7.8cm 0.6cm - 37 + 36 true - 14.9cm + 17.6cm 0.5cm del @@ -261,7 +285,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 36 + 35 true 0.2cm 0.5cm @@ -277,7 +301,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj White - 35 + 34 19.6cm 2.1cm logoequa @@ -295,7 +319,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 34 + 33 14.7cm 1.4cm ="*"&(First(Fields!IdxObj.Value))&"*" @@ -311,7 +335,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 33 + 32 11.4cm 0.7cm =Fields!IdxObj.Value @@ -327,7 +351,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 32 + 31 7.15001cm 0.63492cm Fosfatazione Zinco @@ -344,7 +368,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 31 + 30 6.4cm 0.63492cm =(Fields!FosfZinco.Value) @@ -360,7 +384,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 30 + 29 1.3cm 0.63492cm Fosfatazione + TEFLON @@ -377,7 +401,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 29 + 28 0.5cm 0.63492cm =(Fields!FosfTeflon.Value) @@ -395,7 +419,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 28 + 27 12cm 0.63492cm =(Fields!PeekVicote.Value) @@ -413,7 +437,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 27 + 26 12cm 0.63492cm =(Fields!Zinchlorex.Value) @@ -431,7 +455,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 26 + 25 12cm 0.63492cm =(Fields!PzRoto.Value) @@ -449,7 +473,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 25 + 24 6.4cm 0.63492cm =(Fields!Teflon.Value) @@ -467,7 +491,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 24 + 23 9.65001cm 0.63492cm =(Fields!F2.Value) @@ -485,7 +509,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 23 + 22 6.4cm 0.63492cm =(Fields!F1.Value) @@ -501,7 +525,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 22 + 21 12.75cm 0.63492cm PEEK VICOTE @@ -517,7 +541,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 21 + 20 12.75cm 0.63492cm Zinchlorex @@ -533,7 +557,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 20 + 19 12.75cm 0.63492cm Pz Roto @@ -549,7 +573,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 19 + 18 7.15001cm 0.63492cm TEFLON @@ -565,7 +589,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 18 + 17 10.40001cm 0.63492cm F2 @@ -581,7 +605,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 17 + 16 7.15001cm 0.63492cm F1 @@ -599,7 +623,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 16 + 15 0.5cm 0.63492cm =(Fields!Brunitura.Value) @@ -615,7 +639,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 15 + 14 1.3cm 0.63492cm Brunitura @@ -632,7 +656,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 14 + 13 1.3cm 0.63492cm Fosfatazione Manganese @@ -650,35 +674,15 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 2pt 2pt - 13 + 12 0.5cm 0.63492cm =(Fields!FosfManganese.Value) - - Peso - 10.9cm - 4.1cm - - 12 - 20.7cm - 1.8cm - =First(Fields!Peso.Value) - CodProdotto - 10.9cm - 19.7cm + 11cm + 18.6cm 10 - 14.9cm + 17.6cm 2cm =Fields!DDT_del.Value @@ -918,10 +922,10 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj 8.3cm - 14.4cm + 17.1cm 2 0.2cm - 2cm + 2.1cm =First(Fields!DDT.Value) - + 8.3cm - 4.1cm + 3.5cm 1 - 20.7cm + 21.4cm 2cm =First(Fields!DataArrivo.Value) 0.1cm + + 0cm + + 7 + 21.2cm + 2.7cm + + + 2.7cm + 0cm + + 6 + 21.9cm + 2.51323cm + - 2.75cm + 2.8cm 1.5cm - 3 + 5 true - 23.2cm + 23.3cm 0.45cm Peso + + 2.8cm + 1.5cm + + 4 + true + 19cm + 0.45cm + quantità + + + 3.2cm + 2.8cm + + 3 + 19cm + 1.8cm + =First(Fields!Qta.Value) + 2.7cm 2 - 14.7cm 0cm + 2.7cm 0cm 1 - 20.5cm + 18.8cm + 2.4cm 0cm @@ -1005,7 +1071,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj Solid - 14.7cm + 17.4cm 2.7cm @@ -1016,7 +1082,7 @@ BAnzRaFQ+IEaZhQKBQBApdH2rsuH6lRZWQmFhYWgUChU/q1vVO8ctbCwAAMDAzA2NgZLS0swMjICY2Nj Solid - 5cm + 10cm 18cm diff --git a/project/XPS/bin/XPS.dll b/project/XPS/bin/XPS.dll index 9f0b375..12d53a8 100644 Binary files a/project/XPS/bin/XPS.dll and b/project/XPS/bin/XPS.dll differ diff --git a/project/XPS/bin/XPS_data.dll b/project/XPS/bin/XPS_data.dll index 47e9050..b7f0f7a 100644 Binary files a/project/XPS/bin/XPS_data.dll and b/project/XPS/bin/XPS_data.dll differ diff --git a/project/XPS/obj/Debug/RdlCompile.cache b/project/XPS/obj/Debug/RdlCompile.cache index cbd95ec..2b73df8 100644 Binary files a/project/XPS/obj/Debug/RdlCompile.cache and b/project/XPS/obj/Debug/RdlCompile.cache differ diff --git a/project/XPS/obj/Debug/XPS.dll b/project/XPS/obj/Debug/XPS.dll index 74c25c2..df0e851 100644 Binary files a/project/XPS/obj/Debug/XPS.dll and b/project/XPS/obj/Debug/XPS.dll differ diff --git a/project/XPS/obj/Release/RdlCompile.cache b/project/XPS/obj/Release/RdlCompile.cache index cbd95ec..c7c932a 100644 Binary files a/project/XPS/obj/Release/RdlCompile.cache and b/project/XPS/obj/Release/RdlCompile.cache differ diff --git a/project/XPS/obj/Release/ResolveAssemblyReference.cache b/project/XPS/obj/Release/ResolveAssemblyReference.cache index 024f96b..165143b 100644 Binary files a/project/XPS/obj/Release/ResolveAssemblyReference.cache and b/project/XPS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPS/obj/Release/XPS.dll b/project/XPS/obj/Release/XPS.dll index 9f0b375..12d53a8 100644 Binary files a/project/XPS/obj/Release/XPS.dll and b/project/XPS/obj/Release/XPS.dll differ diff --git a/project/XPS/tmp/ReportSchedaIdentificazione_1.emf b/project/XPS/tmp/ReportSchedaIdentificazione_1.emf deleted file mode 100644 index d67336a..0000000 Binary files a/project/XPS/tmp/ReportSchedaIdentificazione_1.emf and /dev/null differ diff --git a/project/XPST/bin/XPST.dll b/project/XPST/bin/XPST.dll index 764c507..0373db4 100644 Binary files a/project/XPST/bin/XPST.dll and b/project/XPST/bin/XPST.dll differ diff --git a/project/XPST/bin/XPS_data.dll b/project/XPST/bin/XPS_data.dll index 47e9050..b7f0f7a 100644 Binary files a/project/XPST/bin/XPS_data.dll and b/project/XPST/bin/XPS_data.dll differ diff --git a/project/XPST/obj/Debug/ResolveAssemblyReference.cache b/project/XPST/obj/Debug/ResolveAssemblyReference.cache index beceb72..1a41196 100644 Binary files a/project/XPST/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/Debug/XPST.dll b/project/XPST/obj/Debug/XPST.dll index 9d2cadb..0373db4 100644 Binary files a/project/XPST/obj/Debug/XPST.dll and b/project/XPST/obj/Debug/XPST.dll differ diff --git a/project/XPS_data/DS_applicazione.Designer.cs b/project/XPS_data/DS_applicazione.Designer.cs index 2c13831..143795a 100644 --- a/project/XPS_data/DS_applicazione.Designer.cs +++ b/project/XPS_data/DS_applicazione.Designer.cs @@ -4986,6 +4986,8 @@ namespace XPS_data { private global::System.Data.DataColumn columnCodCliente; + private global::System.Data.DataColumn columnQta; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public sp_schedaIdentDataTable() { this.TableName = "sp_schedaIdent"; @@ -5170,6 +5172,13 @@ namespace XPS_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn QtaColumn { + get { + return this.columnQta; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Browsable(false)] public int Count { @@ -5221,7 +5230,8 @@ namespace XPS_data { string Zinchlorex, string PeekVicote, string CodCli, - string CodCliente) { + string CodCliente, + int Qta) { sp_schedaIdentRow rowsp_schedaIdentRow = ((sp_schedaIdentRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxObj, @@ -5245,7 +5255,8 @@ namespace XPS_data { Zinchlorex, PeekVicote, CodCli, - CodCliente}; + CodCliente, + Qta}; rowsp_schedaIdentRow.ItemArray = columnValuesArray; this.Rows.Add(rowsp_schedaIdentRow); return rowsp_schedaIdentRow; @@ -5293,6 +5304,7 @@ namespace XPS_data { this.columnPeekVicote = base.Columns["PeekVicote"]; this.columnCodCli = base.Columns["CodCli"]; this.columnCodCliente = base.Columns["CodCliente"]; + this.columnQta = base.Columns["Qta"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5341,6 +5353,8 @@ namespace XPS_data { base.Columns.Add(this.columnCodCli); this.columnCodCliente = new global::System.Data.DataColumn("CodCliente", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodCliente); + this.columnQta = new global::System.Data.DataColumn("Qta", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnQta); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxObj}, true)); this.columnIdxObj.AllowDBNull = false; @@ -5380,6 +5394,7 @@ namespace XPS_data { this.columnCodCli.MaxLength = 50; this.columnCodCliente.ReadOnly = true; this.columnCodCliente.MaxLength = 50; + this.columnQta.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8893,6 +8908,21 @@ namespace XPS_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public int Qta { + get { + try { + return ((int)(this[this.tablesp_schedaIdent.QtaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Qta\' in table \'sp_schedaIdent\' is DBNull.", e); + } + } + set { + this[this.tablesp_schedaIdent.QtaColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsClienteNull() { return this.IsNull(this.tablesp_schedaIdent.ClienteColumn); @@ -9102,6 +9132,16 @@ namespace XPS_data { public void SetCodClienteNull() { this[this.tablesp_schedaIdent.CodClienteColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsQtaNull() { + return this.IsNull(this.tablesp_schedaIdent.QtaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetQtaNull() { + this[this.tablesp_schedaIdent.QtaColumn] = global::System.Convert.DBNull; + } } /// @@ -15300,6 +15340,7 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show tableMapping.ColumnMappings.Add("PeekVicote", "PeekVicote"); tableMapping.ColumnMappings.Add("CodCli", "CodCli"); tableMapping.ColumnMappings.Add("CodCliente", "CodCliente"); + tableMapping.ColumnMappings.Add("Qta", "Qta"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/project/XPS_data/DS_applicazione.xsd b/project/XPS_data/DS_applicazione.xsd index 8cb0031..adbd8cd 100644 --- a/project/XPS_data/DS_applicazione.xsd +++ b/project/XPS_data/DS_applicazione.xsd @@ -584,7 +584,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateEmailSent @@ -595,7 +595,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateStato @@ -609,7 +609,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateStatoTree @@ -1123,6 +1123,7 @@ WHERE (IdxObj = @IdxObj) + @@ -1169,56 +1170,56 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - + - + @@ -1231,14 +1232,14 @@ WHERE (IdxObj = @IdxObj) - + - + @@ -1251,21 +1252,21 @@ WHERE (IdxObj = @IdxObj) - + - + - + @@ -1278,98 +1279,98 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - - - + + + - - - - - - + + + + + + - + - + - + - + - + @@ -1380,387 +1381,6 @@ WHERE (IdxObj = @IdxObj) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1777,6 +1397,29 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + + + + + + + + + + @@ -1785,6 +1428,13 @@ WHERE (IdxObj = @IdxObj) + + + + + + + @@ -1799,8 +1449,359 @@ WHERE (IdxObj = @IdxObj) - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1813,14 +1814,14 @@ WHERE (IdxObj = @IdxObj) - + - + @@ -1841,8 +1842,8 @@ WHERE (IdxObj = @IdxObj) - - + + @@ -1850,8 +1851,8 @@ WHERE (IdxObj = @IdxObj) - - + + @@ -1943,27 +1944,28 @@ WHERE (IdxObj = @IdxObj) - + + - + - + diff --git a/project/XPS_data/DS_applicazione.xss b/project/XPS_data/DS_applicazione.xss index e78fbf8..95ecc76 100644 --- a/project/XPS_data/DS_applicazione.xss +++ b/project/XPS_data/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/project/XPS_data/SqlScript/V 1.2/sqlUpdate_151.sql b/project/XPS_data/SqlScript/V 1.2/sqlUpdate_151.sql new file mode 100644 index 0000000..b288820 --- /dev/null +++ b/project/XPS_data/SqlScript/V 1.2/sqlUpdate_151.sql @@ -0,0 +1,56 @@ +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/************************************* +* STORED PROCEDURE sp_schedaIdent +* restituisce i dati x stampare 1 scheda di identificazione +* +* modif.: S.E.L. +* il: 2012.02.13 +**************************************/ +alter PROCEDURE sp_schedaIdent +( + @IdxObj VARCHAR(50) +) +AS + +SELECT Cod AS IdxObj, CodCliente, Cliente, DDT, DataDDT AS DDT_del, DataArrivo, descrizione AS CodProdotto, DataPrevista AS ConsegnaPrevista, Peso, Qta, + CASE CodCli WHEN 'Fosf' THEN 'X' ELSE ' ' END AS FosfManganese, CASE CodCli WHEN 'Brun' THEN 'X' ELSE ' ' END AS Brunitura, + CASE CodCli WHEN 'Fosf_Tefl' THEN 'X' ELSE ' ' END AS FosfTeflon, CASE CodCli WHEN 'Sabb' THEN 'X' ELSE ' ' END AS Sabbiatura, ' ' AS F1, ' ' AS F2, + ' ' AS FosfZinco, ' ' AS Teflon, ' ' AS FosfPreVern, ' ' AS PzRoto, ' ' AS Zinchlorex, ' ' AS PeekVicote, CodCli +FROM v_ULP +WHERE (Cod = @IdxObj) + +RETURN +go + +commit; +go + + + + + + + + + + + + + + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(151, GETDATE()) +GO diff --git a/project/XPS_data/XPS_data.csproj b/project/XPS_data/XPS_data.csproj index 14015ab..2ccfdd2 100644 --- a/project/XPS_data/XPS_data.csproj +++ b/project/XPS_data/XPS_data.csproj @@ -152,6 +152,7 @@ Always + diff --git a/project/XPS_data/app.config b/project/XPS_data/app.config index 2661d6a..7504868 100644 --- a/project/XPS_data/app.config +++ b/project/XPS_data/app.config @@ -10,7 +10,7 @@ connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" /> \ No newline at end of file diff --git a/project/XPS_data/bin/Debug/XPS_data.dll b/project/XPS_data/bin/Debug/XPS_data.dll index 401bc5d..834af65 100644 Binary files a/project/XPS_data/bin/Debug/XPS_data.dll and b/project/XPS_data/bin/Debug/XPS_data.dll differ diff --git a/project/XPS_data/bin/Release/XPS_data.dll b/project/XPS_data/bin/Release/XPS_data.dll index 47e9050..b7f0f7a 100644 Binary files a/project/XPS_data/bin/Release/XPS_data.dll and b/project/XPS_data/bin/Release/XPS_data.dll differ diff --git a/project/XPS_data/bin/Release/XPS_data.dll.config b/project/XPS_data/bin/Release/XPS_data.dll.config index 2661d6a..7504868 100644 --- a/project/XPS_data/bin/Release/XPS_data.dll.config +++ b/project/XPS_data/bin/Release/XPS_data.dll.config @@ -10,7 +10,7 @@ connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" /> \ No newline at end of file diff --git a/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll b/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll index 4f6d709..1ba432b 100644 Binary files a/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll and b/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/project/XPS_data/obj/Debug/XPS_data.dll b/project/XPS_data/obj/Debug/XPS_data.dll index 401bc5d..834af65 100644 Binary files a/project/XPS_data/obj/Debug/XPS_data.dll and b/project/XPS_data/obj/Debug/XPS_data.dll differ diff --git a/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll b/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll index 6fd7361..a2a4826 100644 Binary files a/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll and b/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/project/XPS_data/obj/Release/XPS_data.dll b/project/XPS_data/obj/Release/XPS_data.dll index 47e9050..b7f0f7a 100644 Binary files a/project/XPS_data/obj/Release/XPS_data.dll and b/project/XPS_data/obj/Release/XPS_data.dll differ diff --git a/project/XPS_installer/Release/XPS_installer.msi b/project/XPS_installer/Release/XPS_installer.msi index 1c8298d..35d1218 100644 Binary files a/project/XPS_installer/Release/XPS_installer.msi and b/project/XPS_installer/Release/XPS_installer.msi differ diff --git a/project/XPS_installer/XPS_installer.vdproj b/project/XPS_installer/XPS_installer.vdproj index ac1942d..a53b39e 100644 --- a/project/XPS_installer/XPS_installer.vdproj +++ b/project/XPS_installer/XPS_installer.vdproj @@ -349,14 +349,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPS" - "ProductCode" = "8:{9CFFC0D7-8A98-46D1-837D-6787CBA19BA0}" - "PackageCode" = "8:{2E83F0F3-8237-4FC0-9FEB-4A8A179FDAD5}" + "ProductCode" = "8:{EED91BED-3B2F-4E22-8240-87FD0F028504}" + "PackageCode" = "8:{CD3FF70F-93A6-498C-AB4C-4B140A6B8974}" "UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.2.150" + "ProductVersion" = "8:1.2.151" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:035-460560" "ARPHELPLINK" = "8:www.steamware.net"