diff --git a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs index 1a13622b..1a9c0d4b 100644 --- a/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs @@ -148,7 +148,7 @@ namespace MP_ADM.WebUserControls DataLayerObj.taPromOut.updAttiva(IdxPromessa, isAttivabile); } } - doUpdate(); + updateGrView(); } /// @@ -157,6 +157,7 @@ namespace MP_ADM.WebUserControls private void updateGrView() { grView.DataBind(); + raiseNewVal(); } #endregion Private Methods @@ -276,7 +277,7 @@ namespace MP_ADM.WebUserControls } } } - doUpdate(); + updateGrView(); } /// @@ -390,8 +391,7 @@ namespace MP_ADM.WebUserControls public void doUpdate() { - updateGrView(); - raiseSelNew(); + grView.DataBind(); } /// diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs index 39fc800c..306212ed 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs @@ -105,6 +105,7 @@ namespace MP_ADM.WebUserControls decimal tempoMinTot = 0; Dictionary ElArticoli = new Dictionary(); string CodArt = ""; + txtNumPz.Text = "0"; foreach (GridViewRow riga in grView.Rows) { QtaRem = 0; diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx b/MP-TAB/WebUserControls/mod_ODL.ascx index febf465a..6ae17ff1 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx +++ b/MP-TAB/WebUserControls/mod_ODL.ascx @@ -46,6 +46,7 @@ + diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index 5f7a7527..a9fae22c 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -1276,6 +1276,10 @@ namespace MoonProTablet.WebUserControls { mod_tempoMSMC.modoTempo = timeMode.MC; } + // verifico parametro attivabilità come filtraggio + bool OptOdlStartAttivabili = memLayer.ML.cdvb("OptOdlStartAttivabili"); + hfFiltroAttivabili.Value = $"{OptOdlStartAttivabili}"; + // fix buttons fixSplitBtn(false); } cmp_newODL.eh_newVal += Cmp_newODL_eh_newVal; diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs index 7f7f0528..5566b6b8 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs @@ -86,6 +86,15 @@ namespace MoonProTablet.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfIdxMacchina; + /// + /// Controllo hfFiltroAttivabili. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfFiltroAttivabili; + /// /// Controllo odsODL. /// diff --git a/MapoDb/DS_Plan.Designer.cs b/MapoDb/DS_Plan.Designer.cs index d3936fc6..a34fa5d4 100644 --- a/MapoDb/DS_Plan.Designer.cs +++ b/MapoDb/DS_Plan.Designer.cs @@ -3280,6 +3280,8 @@ namespace MapoDb { private global::System.Data.DataColumn columnDescCliente; + private global::System.Data.DataColumn columnCodCliente; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public PromesseOUTDataTable() { @@ -3497,6 +3499,14 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn CodClienteColumn { + get { + return this.columnCodCliente; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3556,7 +3566,8 @@ namespace MapoDb { string DescrMacc, string Disegno, string DescArticolo, - string DescCliente) { + string DescCliente, + string CodCliente) { PromesseOUTRow rowPromesseOUTRow = ((PromesseOUTRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3581,7 +3592,8 @@ namespace MapoDb { DescrMacc, Disegno, DescArticolo, - DescCliente}; + DescCliente, + CodCliente}; rowPromesseOUTRow.ItemArray = columnValuesArray; this.Rows.Add(rowPromesseOUTRow); return rowPromesseOUTRow; @@ -3634,6 +3646,7 @@ namespace MapoDb { this.columnDisegno = base.Columns["Disegno"]; this.columnDescArticolo = base.Columns["DescArticolo"]; this.columnDescCliente = base.Columns["DescCliente"]; + this.columnCodCliente = base.Columns["CodCliente"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3685,6 +3698,8 @@ namespace MapoDb { base.Columns.Add(this.columnDescArticolo); this.columnDescCliente = new global::System.Data.DataColumn("DescCliente", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescCliente); + this.columnCodCliente = new global::System.Data.DataColumn("CodCliente", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodCliente); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxPromessa}, true)); this.columnidxPromessa.AutoIncrement = true; @@ -3727,6 +3742,7 @@ namespace MapoDb { this.columnDescArticolo.MaxLength = 250; this.columnDescCliente.ReadOnly = true; this.columnDescCliente.MaxLength = 500; + this.columnCodCliente.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8056,6 +8072,22 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string CodCliente { + get { + try { + return ((string)(this[this.tablePromesseOUT.CodClienteColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'CodCliente\' nella tabella \'PromesseOUT\' è DBNull.", e); + } + } + set { + this[this.tablePromesseOUT.CodClienteColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsCodMacchinaNull() { @@ -8163,6 +8195,18 @@ namespace MapoDb { public void SetDescClienteNull() { this[this.tablePromesseOUT.DescClienteColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsCodClienteNull() { + return this.IsNull(this.tablePromesseOUT.CodClienteColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetCodClienteNull() { + this[this.tablePromesseOUT.CodClienteColumn] = global::System.Convert.DBNull; + } } /// @@ -11487,6 +11531,7 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod tableMapping.ColumnMappings.Add("Disegno", "Disegno"); tableMapping.ColumnMappings.Add("DescArticolo", "DescArticolo"); tableMapping.ColumnMappings.Add("DescCliente", "DescCliente"); + tableMapping.ColumnMappings.Add("CodCliente", "CodCliente"); this._adapter.TableMappings.Add(tableMapping); } @@ -11530,7 +11575,7 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod this._commandCollection[3].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[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_PODL_insertQuery"; + this._commandCollection[4].CommandText = "dbo.stp_PODL_OUT_insertQuery"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@KeyRichiesta", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/MapoDb/DS_Plan.xsd b/MapoDb/DS_Plan.xsd index 2314db92..d61753c9 100644 --- a/MapoDb/DS_Plan.xsd +++ b/MapoDb/DS_Plan.xsd @@ -384,6 +384,7 @@ FROM v_PODL_OUT_exp + @@ -424,10 +425,10 @@ FROM v_PODL_OUT_exp - + - dbo.stp_PODL_insertQuery + dbo.stp_PODL_OUT_insertQuery @@ -1136,6 +1137,13 @@ ORDER BY TotOreRich DESC + + + + + + + diff --git a/MapoDb/DS_Plan.xss b/MapoDb/DS_Plan.xss index c8770e13..931a12c4 100644 --- a/MapoDb/DS_Plan.xss +++ b/MapoDb/DS_Plan.xss @@ -12,7 +12,7 @@ - +