diff --git a/MP-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs
index 9e6a29f9..aefd7a0e 100644
--- a/MP-MAG/Controllers/PrintQueueController.cs
+++ b/MP-MAG/Controllers/PrintQueueController.cs
@@ -80,6 +80,12 @@ namespace MP_MAG.Controllers
answ.Add("stp_prt_ReportPackList", tab);
break;
+ case MagData.reportRichiesto.ReportPackListFull:
+ // FIXME TODO fare davvero!!!
+ tab = MagDataLayerObj.taRepPL.GetData(keyParam);
+ answ.Add("stp_prt_ReportPackList", tab);
+ break;
+
default:
break;
}
diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj
index b0c438c9..dd56a7a8 100644
--- a/MP-MAG/MP-MAG.csproj
+++ b/MP-MAG/MP-MAG.csproj
@@ -855,6 +855,9 @@
+
+ Always
+
diff --git a/MP-MAG/Reports/ReportPackListFull.rdlc b/MP-MAG/Reports/ReportPackListFull.rdlc
new file mode 100644
index 00000000..2f98c4b2
--- /dev/null
+++ b/MP-MAG/Reports/ReportPackListFull.rdlc
@@ -0,0 +1,2169 @@
+
+
+
+
+
+
+
+
+ 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
+
+
+
+ SQL
+ Data Source=WIN2016-SQL;Initial Catalog=MoonPro_MAG
+ true
+
+ Integrated
+ 47c01fc8-4859-4c68-a51c-91c355eabf2b
+
+
+
+
+
+ DataSource
+
+
+ =Parameters!PackListID.Value
+
+
+ StoredProcedure
+ rep.stp_prt_ReportPackingList
+ true
+
+
+
+ PackListID
+ System.Int32
+
+
+ PackDescr
+ System.String
+
+
+ CodCliente
+ System.String
+
+
+ RagSociale
+ System.String
+
+
+ AL
+ System.String
+
+
+ Peso
+ System.Decimal
+
+
+ Tara
+ System.Decimal
+
+
+ DescAL
+ System.String
+
+
+ Lotto
+ System.String
+
+
+ CodArt
+ System.String
+
+
+ UDC
+ System.String
+
+
+ Qta
+ System.Decimal
+
+
+
+
+
+
+ Integer
+
+
+ 20000001
+
+
+ PackListID:
+
+
+ it-IT
+ true
+ Cm
+ 6bd80633-23b2-4f61-b51d-1ec63b9eeba3
+
\ No newline at end of file
diff --git a/MP-MAG/Reports/reportConf.json b/MP-MAG/Reports/reportConf.json
index 1ad3ca0e..91744ca7 100644
--- a/MP-MAG/Reports/reportConf.json
+++ b/MP-MAG/Reports/reportConf.json
@@ -7,6 +7,10 @@
"name": "docPackList",
"template": "ReportPackList.rdlc"
},
+ {
+ "name": "docPackListFull",
+ "template": "ReportPackListFull.rdlc"
+ },
{
"name": "docPedana",
"template": "CartellinoPedane.rdlc"
diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs b/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs
index ab88f6da..3346518a 100644
--- a/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs
@@ -86,7 +86,7 @@ namespace MP_MAG.WebUserControls
///
protected void lbtPrintReport_Click(object sender, EventArgs e)
{
- // lancio il report x l'elenco pedane + contenuto
+ // lancio il report x l'elenco pedane CARICATE
MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue);
}
@@ -97,8 +97,8 @@ namespace MP_MAG.WebUserControls
///
protected void lbtPrintReportFull_Click(object sender, EventArgs e)
{
- // lancio il report x l'elenco pedane + contenuto
- MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue);
+ // lancio il report x l'elenco COMPLETO con dettaglio con/senza pedane + contenuto
+ MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackListFull}", $"{PackListID}", ddlPost.SelectedValue);
}
///
@@ -118,6 +118,8 @@ namespace MP_MAG.WebUserControls
cmp_OrderListAdd.Visible = false;
lbtPrintReport.DataBind();
grView.PageSize = cmp_numRow.numRow;
+ lbtPrintReport.DataBind();
+ lbtPrintReportFull.DataBind();
}
cmp_OrderListAdd.eh_addNew += Cmp_OrderListAdd_eh_addNew;
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
index 25b61d04..707defb5 100644
--- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
@@ -209,11 +209,6 @@ namespace MP_MAG.WebUserControls
MagDataLayer.man.taEAL.insertQuery(DateTime.Today, "PED", currCodOpr, txtDescr.Text.Trim(), PackListID, TaraAL);
// nascondo add...
toggleAddNew();
-#if false
- // aggiorno packList a iniziata...
- MagDataLayerObj.taPList.updateStatus(PackListID, 2);
-
-#endif
checkStatus();
// update!!!
grView.DataBind();
diff --git a/MagData/Enum.cs b/MagData/Enum.cs
index 4b18cc2d..c0e689f9 100644
--- a/MagData/Enum.cs
+++ b/MagData/Enum.cs
@@ -32,7 +32,8 @@ namespace MagData
CartellinoFinitiOdette,
CartellinoPedane,
CartellinoSemilavorati,
- ReportPackList
+ ReportPackList,
+ ReportPackListFull
}
///
@@ -46,10 +47,15 @@ namespace MagData
docFinito,
///
- /// Report composizione PackList
+ /// Report composizione PackList (cosa contiene caricato al trasportatore)
///
docPackList,
+ ///
+ /// Report composizione PackList (richiesta)
+ ///
+ docPackListFull,
+
///
/// Etichetta per pedana (AL)
///
diff --git a/MagData/MagDataLayer.cs b/MagData/MagDataLayer.cs
index 07bb63d2..180891c0 100644
--- a/MagData/MagDataLayer.cs
+++ b/MagData/MagDataLayer.cs
@@ -302,6 +302,11 @@ namespace MagData
answ = tabPackList.Count > 0;
break;
+ case reportRichiesto.ReportPackListFull:
+ var tabPackListFull = taRepPL.GetData(keyParam);
+ answ = tabPackListFull.Count > 0;
+ break;
+
default:
break;
}