From deca338d2a1bac0ac7c3c71e2c355cc55b18eaac Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 21 Apr 2021 14:28:50 +0200 Subject: [PATCH] FIX: cancellabile SOLO SE non ho AL su ordine --- MP-MAG/WebUserControls/cmp_OrderList.ascx | 27 ++++-- MP-MAG/WebUserControls/cmp_OrderList.ascx.cs | 18 ++++ .../cmp_OrderList.ascx.designer.cs | 82 +++++++++++-------- MagData/DS_PackList.Designer.cs | 48 ++++++++++- MagData/DS_PackList.xsd | 4 +- MagData/DS_PackList.xss | 2 +- 6 files changed, 136 insertions(+), 45 deletions(-) diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx b/MP-MAG/WebUserControls/cmp_OrderList.ascx index 74915fff..86e6b8d0 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx @@ -1,14 +1,18 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_OrderList.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_OrderList" %> <%@ Register Src="~/WebUserControls/cmp_OrderListAdd.ascx" TagPrefix="uc1" TagName="cmp_OrderListAdd" %> +<%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> -
-
+
+
-
+
Dettaglio Richiesta
- REPORT Dettaglio + Report Full +
+
+ Report Pedane
@@ -16,7 +20,7 @@
- + @@ -109,7 +113,7 @@ - + @@ -134,9 +138,9 @@
-
-
- Report +
+
+  Report   @@ -145,6 +149,11 @@
+
+
+
+ +
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs b/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs index d7ecfafc..ab88f6da 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs @@ -46,6 +46,11 @@ namespace MP_MAG.WebUserControls #region Private Methods + private void Cmp_numRow_eh_doRefresh(object sender, EventArgs e) + { + grView.PageSize = cmp_numRow.numRow; + } + private void Cmp_OrderListAdd_eh_addNew(object sender, EventArgs e) { resetSelezione(); @@ -85,6 +90,17 @@ namespace MP_MAG.WebUserControls MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue); } + /// + /// Avvia stampa report COMPLETO richieste + /// + /// + /// + protected void lbtPrintReportFull_Click(object sender, EventArgs e) + { + // lancio il report x l'elenco pedane + contenuto + MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue); + } + /// /// comando reset /// @@ -101,8 +117,10 @@ namespace MP_MAG.WebUserControls { cmp_OrderListAdd.Visible = false; lbtPrintReport.DataBind(); + grView.PageSize = cmp_numRow.numRow; } cmp_OrderListAdd.eh_addNew += Cmp_OrderListAdd_eh_addNew; + cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh; } #endregion Protected Methods diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs index 7976b528..9adcbd43 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MP_MAG.WebUserControls @@ -15,84 +15,102 @@ namespace MP_MAG.WebUserControls { /// - /// Controllo lbtPrintReport. + /// lbtPrintReportFull control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtPrintReportFull; + + /// + /// lbtPrintReport control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtPrintReport; /// - /// Controllo cmp_OrderListAdd. + /// cmp_OrderListAdd control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MP_MAG.WebUserControls.cmp_OrderListAdd cmp_OrderListAdd; /// - /// Controllo grView. + /// grView control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grView; /// - /// Controllo ods. + /// ods control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; /// - /// Controllo hfPackListID. + /// hfPackListID control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfPackListID; /// - /// Controllo hfCodCli. + /// hfCodCli control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfCodCli; /// - /// Controllo hfEnableEdit. + /// hfEnableEdit control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfEnableEdit; /// - /// Controllo ddlPost. + /// ddlPost control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlPost; /// - /// Controllo odsPedaneList. + /// odsPedaneList control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneList; + + /// + /// cmp_numRow control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_MAG.WebUserControls.cmp_numRow cmp_numRow; } } diff --git a/MagData/DS_PackList.Designer.cs b/MagData/DS_PackList.Designer.cs index 06f96967..0a22636e 100644 --- a/MagData/DS_PackList.Designer.cs +++ b/MagData/DS_PackList.Designer.cs @@ -749,6 +749,8 @@ namespace MagData { private global::System.Data.DataColumn columnQtyPrel; + private global::System.Data.DataColumn columnNumAL; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public OrdersListDataTable() { @@ -854,6 +856,14 @@ namespace MagData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumALColumn { + get { + return this.columnNumAL; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -891,7 +901,7 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public OrdersListRow AddOrdersListRow(string ExtOrdCod, System.DateTime DueDate, string CodArt, string DescrArt, int PackListID, int Qty, string OrdDescr, int QtyPrel) { + public OrdersListRow AddOrdersListRow(string ExtOrdCod, System.DateTime DueDate, string CodArt, string DescrArt, int PackListID, int Qty, string OrdDescr, int QtyPrel, int NumAL) { OrdersListRow rowOrdersListRow = ((OrdersListRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -902,7 +912,8 @@ namespace MagData { PackListID, Qty, OrdDescr, - QtyPrel}; + QtyPrel, + NumAL}; rowOrdersListRow.ItemArray = columnValuesArray; this.Rows.Add(rowOrdersListRow); return rowOrdersListRow; @@ -941,6 +952,7 @@ namespace MagData { this.columnQty = base.Columns["Qty"]; this.columnOrdDescr = base.Columns["OrdDescr"]; this.columnQtyPrel = base.Columns["QtyPrel"]; + this.columnNumAL = base.Columns["NumAL"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -964,6 +976,8 @@ namespace MagData { base.Columns.Add(this.columnOrdDescr); this.columnQtyPrel = new global::System.Data.DataColumn("QtyPrel", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnQtyPrel); + this.columnNumAL = new global::System.Data.DataColumn("NumAL", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumAL); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnOrderListID}, true)); this.columnOrderListID.AutoIncrement = true; @@ -983,6 +997,7 @@ namespace MagData { this.columnQty.AllowDBNull = false; this.columnOrdDescr.MaxLength = 250; this.columnQtyPrel.ReadOnly = true; + this.columnNumAL.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1875,6 +1890,22 @@ namespace MagData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumAL { + get { + try { + return ((int)(this[this.tableOrdersList.NumALColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumAL\' in table \'OrdersList\' is DBNull.", e); + } + } + set { + this[this.tableOrdersList.NumALColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsDescrArtNull() { @@ -1910,6 +1941,18 @@ namespace MagData { public void SetQtyPrelNull() { this[this.tableOrdersList.QtyPrelColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsNumALNull() { + return this.IsNull(this.tableOrdersList.NumALColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetNumALNull() { + this[this.tableOrdersList.NumALColumn] = global::System.Convert.DBNull; + } } /// @@ -2815,6 +2858,7 @@ namespace MagData.DS_PackListTableAdapters { tableMapping.ColumnMappings.Add("Qty", "Qty"); tableMapping.ColumnMappings.Add("OrdDescr", "OrdDescr"); tableMapping.ColumnMappings.Add("QtyPrel", "QtyPrel"); + tableMapping.ColumnMappings.Add("NumAL", "NumAL"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/MagData/DS_PackList.xsd b/MagData/DS_PackList.xsd index df35632f..0bbc9efd 100644 --- a/MagData/DS_PackList.xsd +++ b/MagData/DS_PackList.xsd @@ -114,7 +114,7 @@ - + SELECT * FROM v_OrdersList @@ -133,6 +133,7 @@ + @@ -342,6 +343,7 @@ + diff --git a/MagData/DS_PackList.xss b/MagData/DS_PackList.xss index 03be5b3c..963e3386 100644 --- a/MagData/DS_PackList.xss +++ b/MagData/DS_PackList.xss @@ -7,7 +7,7 @@ - +