From ac4e472cf1170cc04130d35eb5204469c7fea7e4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 5 Oct 2017 12:49:47 +0200 Subject: [PATCH] mostra selezioen tavola + articoli --- MP-Tablet/WebUserControls/mod_confProd.ascx | 2 +- MapoDb/DS_applicazione.Designer.cs | 50 ++++++++++++++++- MapoDb/DS_applicazione.xsd | 62 ++++++++++++--------- MapoDb/DS_applicazione.xss | 4 +- 4 files changed, 86 insertions(+), 32 deletions(-) diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx b/MP-Tablet/WebUserControls/mod_confProd.ascx index 53152b61..089e4bdc 100644 --- a/MP-Tablet/WebUserControls/mod_confProd.ascx +++ b/MP-Tablet/WebUserControls/mod_confProd.ascx @@ -9,7 +9,7 @@ data-theme="e" data-inline="false" Visible="false" OnClick="btnSalva_Click" Width="100%" />
- + diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs index 91d04d07..84e1ee28 100644 --- a/MapoDb/DS_applicazione.Designer.cs +++ b/MapoDb/DS_applicazione.Designer.cs @@ -8663,6 +8663,8 @@ namespace MapoDb { private global::System.Data.DataColumn columnpallet; + private global::System.Data.DataColumn columnCodMaccArticolo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public MSFDDataTable() { @@ -8888,6 +8890,14 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CodMaccArticoloColumn { + get { + return this.columnCodMaccArticolo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8949,7 +8959,8 @@ namespace MapoDb { double TempoCicloBase, int PzPalletProd, int MatrOpr, - string pallet) { + string pallet, + string CodMaccArticolo) { MSFDRow rowMSFDRow = ((MSFDRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxMacchina, @@ -8975,7 +8986,8 @@ namespace MapoDb { TempoCicloBase, PzPalletProd, MatrOpr, - pallet}; + pallet, + CodMaccArticolo}; rowMSFDRow.ItemArray = columnValuesArray; this.Rows.Add(rowMSFDRow); return rowMSFDRow; @@ -9029,6 +9041,7 @@ namespace MapoDb { this.columnPzPalletProd = base.Columns["PzPalletProd"]; this.columnMatrOpr = base.Columns["MatrOpr"]; this.columnpallet = base.Columns["pallet"]; + this.columnCodMaccArticolo = base.Columns["CodMaccArticolo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9082,6 +9095,8 @@ namespace MapoDb { base.Columns.Add(this.columnMatrOpr); this.columnpallet = new global::System.Data.DataColumn("pallet", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpallet); + this.columnCodMaccArticolo = new global::System.Data.DataColumn("CodMaccArticolo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodMaccArticolo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxMacchina}, true)); this.columnIdxMacchina.AllowDBNull = false; @@ -9116,6 +9131,8 @@ namespace MapoDb { this.columnMatrOpr.ReadOnly = true; this.columnpallet.ReadOnly = true; this.columnpallet.MaxLength = 20; + this.columnCodMaccArticolo.ReadOnly = true; + this.columnCodMaccArticolo.MaxLength = 103; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12813,6 +12830,22 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string CodMaccArticolo { + get { + try { + return ((string)(this[this.tableMSFD.CodMaccArticoloColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'CodMaccArticolo\' nella tabella \'MSFD\' รจ DBNull.", e); + } + } + set { + this[this.tableMSFD.CodMaccArticoloColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscodmacchinaNull() { @@ -13088,6 +13121,18 @@ namespace MapoDb { public void SetpalletNull() { this[this.tableMSFD.palletColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsCodMaccArticoloNull() { + return this.IsNull(this.tableMSFD.CodMaccArticoloColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetCodMaccArticoloNull() { + this[this.tableMSFD.CodMaccArticoloColumn] = global::System.Convert.DBNull; + } } /// @@ -24925,6 +24970,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli tableMapping.ColumnMappings.Add("PzPalletProd", "PzPalletProd"); tableMapping.ColumnMappings.Add("MatrOpr", "MatrOpr"); tableMapping.ColumnMappings.Add("pallet", "pallet"); + tableMapping.ColumnMappings.Add("CodMaccArticolo", "CodMaccArticolo"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd index 1396e0f6..59f5bf4a 100644 --- a/MapoDb/DS_applicazione.xsd +++ b/MapoDb/DS_applicazione.xsd @@ -2372,6 +2372,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli + @@ -2825,7 +2826,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -2847,7 +2848,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -2883,7 +2884,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -2919,7 +2920,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -2936,7 +2937,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -2960,7 +2961,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -2995,7 +2996,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - + @@ -3064,6 +3065,13 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli + + + + + + + @@ -3181,26 +3189,26 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss index df763f9e..fc7ee2e7 100644 --- a/MapoDb/DS_applicazione.xss +++ b/MapoDb/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -29,7 +29,7 @@ - +