fix filtraggio promesse attivate

MP-ADM/Planner.aspx.cs

@@ -66,11 +66,16 @@ namespace MP_ADM
 
         protected void doRefreshChild()
         {
+            cmp_planApprove.CodArticolo = cmp_planStats.CodArticolo;
+            cmp_planApprove.CodCliente = cmp_planStats.CodCliente;
             cmp_planApprove.CodGruppo = cmp_planStats.CodFase;
             cmp_planApprove.IdxMacchina = cmp_planStats.IdxMacchina;
-            cmp_planApprove.CodCliente = cmp_planStats.CodCliente;
-            cmp_planApprove.CodArticolo = cmp_planStats.CodArticolo;
             cmp_planApprove.doUpdate();
+            cmp_PODL_OUT.CodArticolo = cmp_planStats.CodArticolo;
+            cmp_PODL_OUT.CodCliente = cmp_planStats.CodCliente;
+            cmp_PODL_OUT.CodGruppo = cmp_planStats.CodFase;
+            cmp_PODL_OUT.IdxMacchina = cmp_planStats.IdxMacchina;
+            cmp_PODL_OUT.doUpdate();
         }
 
         protected void lbtToggle_Click(object sender, EventArgs e)

MP-ADM/WebUserControls/cmp_PODL_OUT.ascx

@@ -5,37 +5,14 @@
 <div class="card">
     <div class="card-header">
         <div class="row">
-            <div class="col">
-                <h4>Filtri attivi</h4>
+            <div class="col-4">
+                <h4>PODL attivi</h4>
             </div>
-            <div class="col">
-                REPARTO
-        <br />
-                <asp:DropDownList runat="server" ID="ddlCodGruppo" DataSourceID="odsCodGruppo" DataTextField="DescrGruppo" DataValueField="CodGruppo" AutoPostBack="True" OnSelectedIndexChanged="ddlCodGruppo_SelectedIndexChanged" AppendDataBoundItems="true">
-                    <asp:ListItem Text="-- SHOW ALL --" Value=""></asp:ListItem>
-                </asp:DropDownList>
-                <asp:ObjectDataSource runat="server" ID="odsCodGruppo" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.AnagraficaGruppiTableAdapter" FilterExpression="TipoGruppo = 'FASE' AND SelEnabled = 1"></asp:ObjectDataSource>
+            <div class="col-4">
+                btn attiva/disattiva/elimina
             </div>
-            <div class="col text-nowrap">
-                <div class="input-group my-1 input-group-sm">
-                    <div class="input-group-prepend">
-                        <asp:LinkButton runat="server" ID="lbtResArt" CssClass="btn btn-outline-dark" OnClick="lbtResArt_Click"><i class="fa fa-refresh"></i> <b>Articolo</b></asp:LinkButton>
-                        <asp:Label runat="server" ID="lblCodArt" CssClass="input-group-text" />
-                        <asp:Label runat="server" ID="lblDescArt" CssClass="input-group-text text-truncate" />
-                    </div>
-                </div>
-            </div>
-            <div class="col">
-                <div class="input-group my-1 input-group-sm">
-                    <div class="input-group-prepend">
-                        <asp:LinkButton runat="server" ID="lbtResMacc" CssClass="btn btn-outline-dark" OnClick="lbtResMacc_Click"><i class="fa fa-refresh"></i> <b>Macchina</b></asp:LinkButton>
-                        <asp:Label runat="server" ID="lblNomeMacc" CssClass="input-group-text" />
-                        <asp:Label runat="server" ID="lblIdxMacc" CssClass="input-group-text" />
-                    </div>
-                </div>
-            </div>
-            <div class="col">
-                <div class="input-group mb-3">
+            <div class="col-4 text-right">
+                <div class="input-group">
                     <div class="input-group-prepend">
                         <div class="input-group-text">
                             <asp:CheckBox runat="server" ID="chkUnassigned" AutoPostBack="True" OnCheckedChanged="chkUnassigned_CheckedChanged" Checked="true" />
@@ -47,7 +24,7 @@
         </div>
     </div>
     <div class="card-body">
-        <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" OnDataBound="grView_DataBound" PageSize="25" DataKeyNames="IdxPromessa" DataSourceID="ods" CssClass="table table-striped table-sm my-0">
+        <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" PageSize="25" DataKeyNames="IdxPromessa" DataSourceID="ods" CssClass="table table-striped table-sm my-0">
             <HeaderStyle CssClass="default" />
             <PagerStyle CssClass="active GridPager" />
             <PagerSettings Mode="NumericFirstLast" />
@@ -56,6 +33,15 @@
                 <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
             </EmptyDataTemplate>
             <Columns>
+                <asp:TemplateField>
+                    <HeaderTemplate>
+                        <asp:CheckBox ID="btnSelAll" runat="server" Checked="false" ToolTip='<%# traduci("btnSelAll") %>'
+                            OnCheckedChanged="btnSelAll_Click" CssClass="btn btn-default btn-sm" AutoPostBack="true"></asp:CheckBox>
+                    </HeaderTemplate>
+                    <ItemTemplate>
+                        <asp:CheckBox ID="chkSelect" CssClass="btn btn-default btn-sm" runat="server" OnCheckedChanged="chkSelect_CheckedChanged" AutoPostBack="true" />
+                    </ItemTemplate>
+                </asp:TemplateField>
                 <asp:TemplateField HeaderText="#" SortExpression="IdxPromessa">
                     <ItemTemplate>
                         <asp:Label runat="server" ID="txtIdxPromessa" Text='<%# Eval("IdxPromessa") %>' />
@@ -66,15 +52,6 @@
                         <asp:Label runat="server" ID="txtIdxOdl" Text='<%# Eval("IdxOdl") %>' />
                     </ItemTemplate>
                 </asp:TemplateField>
-                <asp:TemplateField>
-                    <HeaderTemplate>
-                        <asp:CheckBox ID="btnSelAll" runat="server" Checked="false" ToolTip='<%# traduci("btnSelAll") %>'
-                            OnCheckedChanged="btnSelAll_Click" CssClass="btn btn-default btn-sm" AutoPostBack="true"></asp:CheckBox>
-                    </HeaderTemplate>
-                    <ItemTemplate>
-                        <asp:CheckBox ID="chkSelect" CssClass="btn btn-default btn-sm" runat="server" OnCheckedChanged="chkSelect_CheckedChanged" AutoPostBack="true" />
-                    </ItemTemplate>
-                </asp:TemplateField>
                 <asp:TemplateField HeaderText="KeyRichiesta" SortExpression="KeyRichiesta">
                     <ItemTemplate>
                         <div class="row">
@@ -154,20 +131,22 @@
                 </asp:TemplateField>
             </Columns>
         </asp:GridView>
-        <asp:HiddenField runat="server" ID="hfCodGruppo" />
-        <asp:HiddenField runat="server" ID="hfCodPre" />
-        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaccArt" TypeName="MapoDb.DS_PlanTableAdapters.PromesseOUTTableAdapter" FilterExpression=" ( CodArticolo LIKE '%{0}%' OR DescArticolo  LIKE '%{0}%' ) AND ( KeyRichiesta LIKE '{1}%' ) " DeleteMethod="deleteQuery">
+        <asp:HiddenField runat="server" ID="hfIdxMacc" />
+        <asp:HiddenField runat="server" ID="hfCodGrp" />
+        <asp:HiddenField runat="server" ID="hfCodArt" />
+        <asp:HiddenField runat="server" ID="hfCodCli" />
+        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaccArt" TypeName="MapoDb.DS_PlanTableAdapters.PromesseOUTTableAdapter" FilterExpression=" ( CodArticolo LIKE '%{0}%' OR DescArticolo  LIKE '%{0}%' ) " DeleteMethod="deleteQuery">
             <FilterParameters>
                 <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
-                <asp:ControlParameter ControlID="hfCodPre" Name="CodPre" PropertyName="Value" Type="String" />
             </FilterParameters>
             <DeleteParameters>
                 <asp:Parameter Name="Original_idxPromessa" Type="Int32" />
             </DeleteParameters>
             <SelectParameters>
-                <asp:ControlParameter ControlID="lblIdxMacc" Name="IdxMacchina" PropertyName="Text" Type="String" />
-                <asp:ControlParameter ControlID="lblCodArt" Name="CodArticolo" PropertyName="Text" Type="String" />
-                <asp:ControlParameter ControlID="ddlCodGruppo" Name="CodGruppo" PropertyName="SelectedValue" Type="String" />
+                <asp:ControlParameter ControlID="hfCodGrp" DefaultValue="*" Name="CodGruppo" PropertyName="Value" Type="String" />
+                <asp:ControlParameter ControlID="hfCodArt" DefaultValue="*" Name="CodArticolo" PropertyName="Value" Type="String" />
+                <asp:ControlParameter ControlID="hfIdxMacc" DefaultValue="*" Name="IdxMacchina" PropertyName="Value" Type="String" />
+                <asp:ControlParameter ControlID="hfCodCli" DefaultValue="*" Name="CodCliente" PropertyName="Value" Type="String" />
                 <asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />
             </SelectParameters>
         </asp:ObjectDataSource>

MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs

@@ -26,90 +26,38 @@ namespace MP_ADM.WebUserControls
 
         #endregion Public Fields
 
-        #region Protected Properties
-
-        /// <summary>
-        /// CodArt filtrato
-        /// </summary>
-        protected string CodArt
-        {
-            get
-            {
-                return lblCodArt.Text;
-            }
-            set
-            {
-                lblCodArt.Text = value;
-            }
-        }
-
-        /// <summary>
-        /// CodArt filtrato
-        /// </summary>
-        protected string DescArt
-        {
-            get
-            {
-                return lblDescArt.Text;
-            }
-            set
-            {
-                lblDescArt.Text = value;
-            }
-        }
-
-        /// <summary>
-        /// IdxMacchina filtrata
-        /// </summary>
-        protected string idxMacc
-        {
-            get
-            {
-                return lblIdxMacc.Text;
-            }
-            set
-            {
-                lblIdxMacc.Text = value;
-            }
-        }
-
-        /// <summary>
-        /// idxOdl selezionato
-        /// </summary>
-        protected int idxPOdlSel
-        {
-            get
-            {
-                int answ = 0;
-                try
-                {
-                    answ = Convert.ToInt32(grView.SelectedValue);
-                }
-                catch
-                { }
-                return answ;
-            }
-        }
-
-        /// <summary>
-        /// Nome filtrata
-        /// </summary>
-        protected string NomeMacc
-        {
-            get
-            {
-                return lblNomeMacc.Text;
-            }
-            set
-            {
-                lblNomeMacc.Text = value;
-            }
-        }
-
-        #endregion Protected Properties
-
         #region Public Properties
 
+        /// <summary>
+        /// CodArt filtrato
+        /// </summary>
+        public string CodArticolo
+        {
+            get
+            {
+                return hfCodArt.Value;
+            }
+            set
+            {
+                hfCodArt.Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Chiave PRE selezione tipo richiesta ordine
+        /// </summary>
+        public string CodCliente
+        {
+            get
+            {
+                return hfCodCli.Value;
+            }
+            set
+            {
+                hfCodCli.Value = value;
+            }
+        }
+
         /// <summary>
         /// Gruppo selezionato
         /// </summary>
@@ -117,41 +65,26 @@ namespace MP_ADM.WebUserControls
         {
             get
             {
-                return ddlCodGruppo.SelectedValue;
+                return hfCodGrp.Value;
             }
             set
             {
-                ddlCodGruppo.SelectedValue = value;
+                hfCodGrp.Value = value;
             }
         }
 
         /// <summary>
-        /// Chiave PRE selezione tipo richiesta ordine
+        /// IdxMacchina filtrata
         /// </summary>
-        public string codOrdPre
+        public string IdxMacchina
         {
             get
             {
-                return hfCodPre.Value.Trim();
+                return hfIdxMacc.Value;
             }
             set
             {
-                hfCodPre.Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Abilitazione modifica selettore fase
-        /// </summary>
-        public bool enableSelFase
-        {
-            get
-            {
-                return ddlCodGruppo.Enabled;
-            }
-            set
-            {
-                ddlCodGruppo.Enabled = value;
+                hfIdxMacc.Value = value;
             }
         }
 
@@ -253,48 +186,6 @@ namespace MP_ADM.WebUserControls
             return colonne;
         }
 
-        protected void ddlCodGruppo_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            // salvo in sessione selezione...
-            memLayer.ML.setSessionVal("selFaseBCode", ddlCodGruppo.SelectedValue);
-        }
-
-        protected void doUpdate()
-        {
-            updateGrView();
-            raiseSelNew();
-        }
-
-        /// <summary>
-        /// traduce gli header delle colonne
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void grView_DataBound(object sender, EventArgs e)
-        {
-            if (grView.Rows.Count > 0)
-            {
-                LinkButton lb;
-                // aggiorno gli headers
-                foreach (TableCell cella in grView.HeaderRow.Cells)
-                {
-                    try
-                    {
-                        lb = (LinkButton)cella.Controls[0];
-                        lb.Text = traduci(lb.Text);
-                    }
-                    catch
-                    { }
-                }
-                int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1);
-                lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
-            }
-            else
-            {
-                lblNumRec.Text = "";
-            }
-        }
-
         /// <summary>
         /// salvo comando
         /// </summary>
@@ -323,50 +214,6 @@ namespace MP_ADM.WebUserControls
             raiseNewVal();
         }
 
-        protected void lbtResArt_Click(object sender, EventArgs e)
-        {
-            CodArt = "";
-            DescArt = "";
-            updateGrView();
-        }
-
-        protected void lbtResMacc_Click(object sender, EventArgs e)
-        {
-            idxMacc = "";
-            NomeMacc = "";
-            updateGrView();
-        }
-
-        /// <summary>
-        /// Selezionato un condominio --> riporto selezione
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void lbtSelArt_Click(object sender, EventArgs e)
-        {
-            LinkButton lb = (LinkButton)sender;
-            // imposto articolo, splittando
-            string[] artData = lb.CommandArgument.Split('|');
-            CodArt = artData[0];
-            DescArt = artData[1];
-            updateGrView();
-        }
-
-        /// <summary>
-        /// Selezionato un condominio --> riporto selezione
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void lbtSelMacc_Click(object sender, EventArgs e)
-        {
-            LinkButton lb = (LinkButton)sender;
-            // imposto articolo, splittando
-            string[] maccData = lb.CommandArgument.Split('|');
-            idxMacc = maccData[0];
-            NomeMacc = maccData[1];
-            updateGrView();
-        }
-
         /// <summary>
         /// Richiesto abbassamento priorità = ANTICIPA
         /// </summary>
@@ -417,11 +264,6 @@ namespace MP_ADM.WebUserControls
             if (!Page.IsPostBack)
             {
                 grView.PageSize = pageSize;
-                // se ho in sessione selezione la recupero...
-                if (memLayer.ML.isInSessionObject("selFaseBCode") && enableSelFase)
-                {
-                    ddlCodGruppo.SelectedValue = memLayer.ML.StringSessionObj("selFaseBCode");
-                }
             }
         }
 
@@ -480,6 +322,12 @@ namespace MP_ADM.WebUserControls
             return answ;
         }
 
+        public void doUpdate()
+        {
+            updateGrView();
+            raiseSelNew();
+        }
+
         /// <summary>
         /// formatot url x stampa ODL
         /// </summary>

MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs

@@ -14,78 +14,6 @@ namespace MP_ADM.WebUserControls
     public partial class cmp_PODL_OUT
     {
 
-        /// <summary>
-        /// Controllo ddlCodGruppo.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList ddlCodGruppo;
-
-        /// <summary>
-        /// Controllo odsCodGruppo.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.ObjectDataSource odsCodGruppo;
-
-        /// <summary>
-        /// Controllo lbtResArt.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lbtResArt;
-
-        /// <summary>
-        /// Controllo lblCodArt.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblCodArt;
-
-        /// <summary>
-        /// Controllo lblDescArt.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblDescArt;
-
-        /// <summary>
-        /// Controllo lbtResMacc.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lbtResMacc;
-
-        /// <summary>
-        /// Controllo lblNomeMacc.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblNomeMacc;
-
-        /// <summary>
-        /// Controllo lblIdxMacc.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblIdxMacc;
-
         /// <summary>
         /// Controllo chkUnassigned.
         /// </summary>
@@ -114,22 +42,40 @@ namespace MP_ADM.WebUserControls
         protected global::System.Web.UI.WebControls.GridView grView;
 
         /// <summary>
-        /// Controllo hfCodGruppo.
+        /// Controllo hfIdxMacc.
         /// </summary>
         /// <remarks>
         /// Campo generato automaticamente.
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.HiddenField hfCodGruppo;
+        protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc;
 
         /// <summary>
-        /// Controllo hfCodPre.
+        /// Controllo hfCodGrp.
         /// </summary>
         /// <remarks>
         /// Campo generato automaticamente.
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.HiddenField hfCodPre;
+        protected global::System.Web.UI.WebControls.HiddenField hfCodGrp;
+
+        /// <summary>
+        /// Controllo hfCodArt.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfCodArt;
+
+        /// <summary>
+        /// Controllo hfCodCli.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfCodCli;
 
         /// <summary>
         /// Controllo ods.

MapoDb/DS_Plan.Designer.cs

@@ -11516,9 +11516,10 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod
             this._commandCollection[2].CommandText = "dbo.stp_PODL_OUT_getByMaccArt";
             this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodGruppo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@onlyFree", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
@@ -11581,13 +11582,13 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_Plan.PromesseOUTDataTable getByMaccArt(string IdxMacchina, string CodArticolo, string CodGruppo, global::System.Nullable<bool> onlyFree) {
+        public virtual DS_Plan.PromesseOUTDataTable getByMaccArt(string CodGruppo, string CodArticolo, string IdxMacchina, string CodCliente, global::System.Nullable<bool> onlyFree) {
             this.Adapter.SelectCommand = this.CommandCollection[2];
-            if ((IdxMacchina == null)) {
+            if ((CodGruppo == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodGruppo));
             }
             if ((CodArticolo == null)) {
                 this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
@@ -11595,17 +11596,23 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod
             else {
                 this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodArticolo));
             }
-            if ((CodGruppo == null)) {
+            if ((IdxMacchina == null)) {
                 this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodGruppo));
+                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(IdxMacchina));
             }
-            if ((onlyFree.HasValue == true)) {
-                this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(onlyFree.Value));
+            if ((CodCliente == null)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodCliente));
+            }
+            if ((onlyFree.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[5].Value = ((bool)(onlyFree.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
             DS_Plan.PromesseOUTDataTable dataTable = new DS_Plan.PromesseOUTDataTable();
             this.Adapter.Fill(dataTable);

MapoDb/DS_Plan.xsd

@@ -403,9 +403,10 @@ FROM v_PODL_OUT_exp</CommandText>
                     <CommandText>dbo.stp_PODL_OUT_getByMaccArt</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodGruppo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodCliente" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@onlyFree" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>

MapoDb/DS_Plan.xss

@@ -12,7 +12,7 @@
     <Shape ID="DesignTable:planStatsMacc" ZOrder="15" X="448" Y="292" Height="191" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:Richieste" ZOrder="2" X="102" Y="683" Height="456" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="330" />
     <Shape ID="DesignTable:PromesseIN" ZOrder="3" X="481" Y="717" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PromesseOUT" ZOrder="1" X="833" Y="591" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PromesseOUT" ZOrder="1" X="833" Y="591" Height="402" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
     <Shape ID="DesignTable:ConfWeek" ZOrder="14" X="739" Y="56" Height="267" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
     <Shape ID="DesignTable:CalStop" ZOrder="13" X="950" Y="61" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:CalDisp" ZOrder="8" X="1169" Y="630" Height="191" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />