diff --git a/Jenkinsfile b/Jenkinsfile
index c2585ccb..56c5c8a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1371']) {
+ withEnv(['NEXT_BUILD_NUMBER=1372']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj
index 9f709b4b..896477c6 100644
--- a/MP-MAG/MP-MAG.csproj
+++ b/MP-MAG/MP-MAG.csproj
@@ -1009,7 +1009,9 @@
-
+
+ Always
+
10.0
diff --git a/MP-MAG/Reports/ReportPackList.rdlc b/MP-MAG/Reports/ReportPackList.rdlc
index 2f98c4b2..ec9beac0 100644
--- a/MP-MAG/Reports/ReportPackList.rdlc
+++ b/MP-MAG/Reports/ReportPackList.rdlc
@@ -1,2078 +1,5 @@
-
-
-
-
-
-
-
- 7.29166in
-
-
-
-
- 2.62375in
-
-
-
-
-
-
-
-
-
- 1in
-
-
- 1.21875in
-
-
- 0.57292in
-
-
- 0.5in
-
-
- 0.60417in
-
-
- 0.96875in
-
-
- 0.97917in
-
-
- 0.5in
-
-
- 0.8125in
-
-
-
-
- 0.19685in
-
-
-
-
- true
- true
-
-
-
-
- Pedana
-
-
-
-
-
-
- textbox2
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Descr.
-
-
-
-
-
-
- Textbox17
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Lordo
-
-
-
-
-
-
- textbox3
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Tara
-
-
-
-
-
-
- textbox4
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Netto
-
-
-
-
-
-
- Textbox66
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Lotto
-
-
-
-
-
-
- textbox5
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Articolo
-
-
-
-
-
-
- textbox6
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Cont.
-
-
-
-
-
-
- textbox7
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Qta
-
-
-
-
-
-
- textbox8
-
-
- DimGray
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- 0.19685in
-
-
-
-
- true
- stp_prt_ReportPackList
- true
-
-
-
-
- =Fields!AL.Value
-
-
-
-
-
-
- AL
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!DescAL.Value
-
-
-
-
-
-
- DescAL
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Peso.Value
-
-
-
-
-
-
-
-
- WhiteSmoke
- Middle
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Tara.Value
-
-
-
-
-
-
-
-
- WhiteSmoke
- Middle
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Peso.Value-Fields!Tara.Value
-
-
-
-
-
-
-
-
- WhiteSmoke
- Middle
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox26
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox27
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Count(Fields!UDC.Value)
-
-
-
-
-
-
- UDC
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Sum(Fields!Qta.Value)
-
-
-
-
-
-
-
-
- WhiteSmoke
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- 0.19685in
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox50
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox19
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox51
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox52
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox68
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Lotto.Value
-
-
-
-
-
-
- Lotto1
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!CodArt.Value
-
-
-
-
-
-
- CodArt
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Count(Fields!UDC.Value)
-
-
-
-
-
-
- UDC
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Sum(Fields!Qta.Value)
-
-
-
-
-
-
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- 0.15748in
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox41
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox20
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox32
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox34
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox69
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox57
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox59
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!UDC.Value
-
-
-
-
-
-
- UDC
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Qta.Value
-
-
-
-
-
-
- Qta
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- 0.19685in
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox10
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox21
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox13
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox73
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox74
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Tot. Packing
-
-
-
-
-
-
- textbox9
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
- Textbox76
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Count(Fields!UDC.Value)
-
-
-
-
-
-
- UDC
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Sum(Fields!Qta.Value)
-
-
-
-
-
-
- textbox15
-
-
- Silver
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- After
- true
-
-
-
-
- =Fields!AL.Value
-
-
-
-
- =Fields!AL.Value
-
-
-
-
- After
- true
-
-
-
-
- =Fields!Lotto.Value
-
-
-
-
- =Fields!Lotto.Value
-
-
-
-
- After
-
-
-
- Detail
-
-
-
-
-
- true
-
- Detail_Collection
- Output
- true
-
-
- true
-
-
- true
-
-
- Before
-
-
-
- true
- true
- stp_prt_ReportPackList
- 1.62625in
- 0.3175cm
- 0.94488in
- 7.15626in
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!CodCliente.Value
-
-
-
-
-
-
- CodCliente
- 1.97327cm
- 2.19604cm
- 0.21in
- 6.13541in
-
-
-
- true
- true
-
-
-
-
- =Fields!RagSociale.Value
-
-
-
-
-
-
- RagSociale
- 2.50667cm
- 2.19604cm
- 0.21in
- 6.13541in
- 1
-
-
-
- true
- true
-
-
-
-
- Cliente :
-
-
-
-
-
-
- CodCliente
- 1.97327cm
- 0.32632cm
- 0.21in
- 0.68056in
- 2
-
-
-
- true
- true
-
-
-
-
- =Fields!PackListID.Value
-
-
-
-
-
-
- PackListID
- 0.2175cm
- 2.92805cm
- 0.27in
- 5.84722in
- 3
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- true
-
-
-
-
- PACKING:
-
-
-
-
-
-
- Textbox64
- 0.2175cm
- 0.12847in
- 0.27in
- 1in
- 4
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- true
-
-
-
-
- =First(Fields!PackDescr.Value)
-
-
-
-
-
-
- PackDescr
- 0.42507in
- 0.12847in
- 0.25in
- 6.87153in
- 5
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- 0.1cm
- 0.3175cm
- 1.3125in
- 7.15625in
- 1
-
-
-
-
-
- true
- List1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =Fields!PackListID.Value
-
-
- Between
-
-
-
-
- =Fields!PackListID.Value
-
-
- Output
- true
-
-
-
- true
- true
- true
- stp_prt_ReportPackList
- 2.62375in
- 7.29166in
-
-
-
- 6.75937cm
-
-
- 19cm
-
-
- 0.5842cm
- true
- true
-
-
- true
-
-
-
-
- powered by Steam
-
-
-
- Ware
-
-
-
- © 2008-
-
-
-
-
- =Format(Today, "yyyy" )
-
-
-
-
-
-
- 0.0508cm
- 10.008cm
- 0.21in
- 3.35in
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- 29.7cm
- 21cm
- 1cm
- 1cm
- 1cm
- 1cm
- 1.27cm
-
-
+
v. 1.1.1
0
@@ -2082,7 +9,6 @@
Data Source=WIN2016-SQL;Initial Catalog=MoonPro_MAG
true
- Integrated
47c01fc8-4859-4c68-a51c-91c355eabf2b
@@ -2151,6 +77,2083 @@
+
+
+
+
+
+
+
+
+ 7.29166in
+
+
+
+
+ 2.62375in
+
+
+
+
+
+
+
+
+
+ 1in
+
+
+ 1.21875in
+
+
+ 0.57292in
+
+
+ 0.5in
+
+
+ 0.60417in
+
+
+ 0.96875in
+
+
+ 0.97917in
+
+
+ 0.5in
+
+
+ 0.8125in
+
+
+
+
+ 0.19685in
+
+
+
+
+ true
+ true
+
+
+
+
+ Pedana
+
+
+
+
+
+
+ textbox2
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Descr.
+
+
+
+
+
+
+ Textbox17
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Lordo
+
+
+
+
+
+
+ textbox3
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Tara
+
+
+
+
+
+
+ textbox4
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Netto
+
+
+
+
+
+
+ Textbox66
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Lotto
+
+
+
+
+
+
+ textbox5
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Articolo
+
+
+
+
+
+
+ textbox6
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Cont.
+
+
+
+
+
+
+ textbox7
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Qta
+
+
+
+
+
+
+ textbox8
+
+
+ DimGray
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.19685in
+
+
+
+
+ true
+ stp_prt_ReportPackList
+ true
+
+
+
+
+ =Fields!AL.Value
+
+
+
+
+
+
+ AL
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!DescAL.Value
+
+
+
+
+
+
+ DescAL
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Peso.Value
+
+
+
+
+
+
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Tara.Value
+
+
+
+
+
+
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Peso.Value-Fields!Tara.Value
+
+
+
+
+
+
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox26
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox27
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Count(Fields!UDC.Value)
+
+
+
+
+
+
+ UDC
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Qta.Value)
+
+
+
+
+
+
+
+
+ WhiteSmoke
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.19685in
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox50
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox19
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox51
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox52
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox68
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Lotto.Value
+
+
+
+
+
+
+ Lotto1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!CodArt.Value
+
+
+
+
+
+
+ CodArt
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Count(Fields!UDC.Value)
+
+
+
+
+
+
+ UDC
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Qta.Value)
+
+
+
+
+
+
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.15748in
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox41
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox20
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox32
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox34
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox69
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox57
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox59
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!UDC.Value
+
+
+
+
+
+
+ UDC
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Qta.Value
+
+
+
+
+
+
+ Qta
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.19685in
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox10
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox21
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox13
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox73
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox74
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Tot. Packing
+
+
+
+
+
+
+ textbox9
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Textbox76
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Count(Fields!UDC.Value)
+
+
+
+
+
+
+ UDC
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Qta.Value)
+
+
+
+
+
+
+ textbox15
+
+
+ Silver
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ After
+ true
+
+
+
+
+ =Fields!AL.Value
+
+
+
+
+ =Fields!AL.Value
+
+
+
+
+ After
+ true
+
+
+
+
+ =Fields!Lotto.Value
+
+
+
+
+ =Fields!Lotto.Value
+
+
+
+
+ After
+
+
+
+ Detail
+
+
+
+
+
+ true
+
+ Detail_Collection
+ Output
+ true
+
+
+ true
+
+
+ true
+
+
+ Before
+
+
+
+ true
+ true
+ stp_prt_ReportPackList
+ 1.62625in
+ 0.3175cm
+ 0.94488in
+ 7.15626in
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!CodCliente.Value
+
+
+
+
+
+
+ CodCliente
+ 1.97327cm
+ 2.19604cm
+ 0.21in
+ 6.13541in
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!RagSociale.Value
+
+
+
+
+
+
+ RagSociale
+ 2.50667cm
+ 2.19604cm
+ 0.21in
+ 6.13541in
+ 1
+
+
+
+ true
+ true
+
+
+
+
+ Cliente :
+
+
+
+
+
+
+ CodCliente
+ 1.97327cm
+ 0.32632cm
+ 0.21in
+ 0.68056in
+ 2
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!PackListID.Value
+
+
+
+
+
+
+ PackListID
+ 0.2175cm
+ 2.92805cm
+ 0.27in
+ 5.84722in
+ 3
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ PACKING:
+
+
+
+
+
+
+ Textbox64
+ 0.2175cm
+ 0.12847in
+ 0.27in
+ 1in
+ 4
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!PackDescr.Value)
+
+
+
+
+
+
+ PackDescr
+ 0.42507in
+ 0.12847in
+ 0.25in
+ 6.87153in
+ 5
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ 0.1cm
+ 0.3175cm
+ 1.3125in
+ 7.15625in
+ 1
+
+
+
+
+
+ true
+ List1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =Fields!PackListID.Value
+
+
+ Between
+
+
+
+
+ =Fields!PackListID.Value
+
+
+ Output
+ true
+
+
+
+ true
+ true
+ true
+ stp_prt_ReportPackList
+ 2.62375in
+ 7.29166in
+
+
+
+ 6.75937cm
+
+
+ 19cm
+
+
+ 0.5842cm
+ true
+ true
+
+
+ true
+
+
+
+
+ powered by Steam
+
+
+
+ Ware
+
+
+
+ © 2008-
+
+
+
+
+ =Format(Today, "yyyy" )
+
+
+
+
+
+
+ 0.0508cm
+ 10.008cm
+ 0.21in
+ 3.35in
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 29.7cm
+ 21cm
+ 1cm
+ 1cm
+ 1cm
+ 1cm
+ 1.27cm
+
+
+
+
Integer
@@ -2162,6 +2165,19 @@
PackListID:
+
+
+ 1
+ 1
+
+
+ 0
+ 0
+ PackListID
+
+
+
+
it-IT
true
Cm
diff --git a/MP-MAG/SMART/SmartStarter.aspx.cs b/MP-MAG/SMART/SmartStarter.aspx.cs
index ad062aed..fb6f34cd 100644
--- a/MP-MAG/SMART/SmartStarter.aspx.cs
+++ b/MP-MAG/SMART/SmartStarter.aspx.cs
@@ -28,9 +28,11 @@ namespace MP_MAG.SMART
protected string getImageUrl()
{
string matrixUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val=";
- string baseUrlPath = $"{memLayer.ML.CRS("baseUrl")}{memLayer.ML.CRS("basePath")}";
+ var currUrl = Request.Url;
+ string baseUrlPath = $"{currUrl.Scheme}://{currUrl.Authority}/{memLayer.ML.CRS("basePath")}/";
+ string MatrOpr = memLayer.ML.StringSessionObj("MatrOpr");
// fare: inviare user+token adeguatamente cablati...
- string payload = "{'baseUrl':'" + baseUrlPath + "PLScanner?{0}','parameters':['?UserAuthkey=asdfbqhewrqg7802345bhasdfg78']}";
+ string payload = "{'baseUrl':'" + baseUrlPath + "PLScanner?{0}','parameters':['MatrOpr=" + MatrOpr + "']}";
string answ = $"{matrixUrl}{payload}";
return answ;
}
diff --git a/MP-MAG/SMART/menu.aspx b/MP-MAG/SMART/menu.aspx
index ec734d5d..caae2118 100644
--- a/MP-MAG/SMART/menu.aspx
+++ b/MP-MAG/SMART/menu.aspx
@@ -10,10 +10,10 @@
-
+ <%--
SMART START
-
+ --%>
RICERCA LOTTI
@@ -24,7 +24,7 @@
--%>
- PackList
+ Richiesta PackList
diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config
index 88733e3c..3487a17d 100644
--- a/MP-MAG/Web.config
+++ b/MP-MAG/Web.config
@@ -34,8 +34,6 @@
-
-
diff --git a/MP-MAG/WebUserControls/cmp_jumper.ascx.cs b/MP-MAG/WebUserControls/cmp_jumper.ascx.cs
index c97bac13..fe7283e6 100644
--- a/MP-MAG/WebUserControls/cmp_jumper.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_jumper.ascx.cs
@@ -64,10 +64,6 @@ namespace MP_MAG.WebUserControls
// se l'operatore in sessione è DIVERSO da quello appena inviato --> effettuo NUOVO login
if (MatrOpr == memLayer.ML.IntSessionObj("MatrOpr"))
{
-#if false
- // rimando a pagina di stampa.. secondo tipo finiti / semilavorati
- tgtPage = newProdPrintData.isProdFinito ? "prtFiniti" : "prtSemilav";
-#endif
// rimando a pagina di stampax ODL
tgtPage = "printCartOdl";
}
diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj
index 8c12343e..2a7731e4 100644
--- a/MP-MON/MP-MON.csproj
+++ b/MP-MON/MP-MON.csproj
@@ -358,8 +358,6 @@
-
-
@@ -400,8 +398,7 @@
-
-
+
diff --git a/MP-MON/NLog.config b/MP-MON/NLog.config
new file mode 100644
index 00000000..87538dae
--- /dev/null
+++ b/MP-MON/NLog.config
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MP-MON/example-NLog.config b/MP-MON/example-NLog.config
deleted file mode 100644
index a11a39e6..00000000
--- a/MP-MON/example-NLog.config
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MP-MON/example-app.config b/MP-MON/example-app.config
deleted file mode 100644
index fb421650..00000000
--- a/MP-MON/example-app.config
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MP-MON/example-config-table.txt b/MP-MON/example-config-table.txt
deleted file mode 100644
index dd0ab8ef..00000000
--- a/MP-MON/example-config-table.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# chiave valore valoreStd note
-_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net
-_allowForceUser true true abilita login forzato
-_commonPages menu menu pagina comune
-_emailPwd drmfsls16 drmfsls16 drmfsls16
-_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com
-_enableSSL true true true
-_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg
-_righeDataGrid 30 30 Num righe datagrid std
-_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche
-_righeDataGridLong 30 30 Num righe datagrid long
-_righeDataGridMed 15 15 Num righe datagrid med
-_righeDataGridShort 10 10 Num righe datagrid short
-_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com
-_useAIMSmtp false false impiego client posta elettronica alternativo
-_useAuthSmtp true true true
-AuthCookieName admodellingAuth admodellingAuth Cookie applicativo
-autoConfCmd true true Conferma automatica comandi barcode
-baseUrl http://site_name http://iis02/site_name URL base del sito
-cacheValSec 60 60 Validità cache dati in gestore Barcode
-cookieDayExp 365 365 Periodo validità cookie
-cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati
-enableCookie true true Abilitazione uso cookie
-enableLogOut true false Abilita button logout COMPLETO in alto a sx
-enablePlain true true Abilitazione decode plain
-maxAuth 1000 1000 num auth minimo per NON consumare tokens
-serializeSession true true Serializzazione valori in sessione (REDIS)
-SiteName iis02/site_name iis02/site_name Nome sito
-enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default
-doShrinkFolder true true Imposta compressione area LOGS
\ No newline at end of file
diff --git a/MP-MON/example-favicon.ico b/MP-MON/example-favicon.ico
deleted file mode 100644
index 4f0e0ad0..00000000
Binary files a/MP-MON/example-favicon.ico and /dev/null differ