diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 10225638..24fe0021 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index f882c9f0..6c804d6d 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index b40df9dc..cf97ea09 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index 0d73d731..4e96cc84 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index f882c9f0..6c804d6d 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll index b40df9dc..cf97ea09 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW/WebUserControls/mod_manSAO.ascx b/GMW/WebUserControls/mod_manSAO.ascx index 171cc04d..179600d6 100644 --- a/GMW/WebUserControls/mod_manSAO.ascx +++ b/GMW/WebUserControls/mod_manSAO.ascx @@ -74,6 +74,7 @@
+
diff --git a/GMW/WebUserControls/mod_manSAO.ascx.cs b/GMW/WebUserControls/mod_manSAO.ascx.cs index 73823b61..e84b2f79 100644 --- a/GMW/WebUserControls/mod_manSAO.ascx.cs +++ b/GMW/WebUserControls/mod_manSAO.ascx.cs @@ -248,7 +248,7 @@ namespace GMW.WebUserControls #endregion #region init pagina - + /// /// caricamento pagina /// @@ -346,11 +346,28 @@ namespace GMW.WebUserControls // se ho udc selezionato verifico se sia eliminabile if (udcSel != "") { + // controllo con stored SE sia possibile cancellare UDC: + // inizio stringa può essere OK --> mostro delete (e POTREI aggiungere nota su cosa sia e che posso cancellare) + // ERR --> NON mostro delete ma solo errore + + string answ = ""; + bool showDelUdc = false; + MagClass.magazzino.taUdcChk4Del.GetData(udcSel, ref answ); + // controllo esito + if (answ.StartsWith("OK")) + { + showDelUdc = true; + } + lblOutChkDelUdc.Text = traduci(answ); + btnElimina.Visible = showDelUdc; + lblOutChkDelUdc.Visible = !showDelUdc; + + // vecchia modalità... +#if false string currParticolare = ""; bool isAnima = false; bool isFinitoLiquidiOk = false; - bool isInLDP = true; - + bool isInLDP = true; // calcolo particolare corrente try { @@ -382,13 +399,14 @@ namespace GMW.WebUserControls { } // elimina è visibile SE cond01 o cond02 sono TRUE btnElimina.Visible = (isAnima || (isFinitoLiquidiOk && !isInLDP)); - } + } +#endif } if (idxEvento > 0 && udcSel != "" && MagClass.magazzino.checkUDC(udcSel)) { abilita = true; } - // 201.06.22 visibile stampa se è ok x abilitazione elimina... + // 2014.06.22 visibile stampa se è ok x abilitazione elimina... btnStampa.Visible = abilita; btnElimina.Enabled = abilita; // fix pnl dettaglio UDC @@ -702,6 +720,5 @@ namespace GMW.WebUserControls #endregion - } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_manSAO.ascx.designer.cs b/GMW/WebUserControls/mod_manSAO.ascx.designer.cs index 36ae9939..f62071da 100644 --- a/GMW/WebUserControls/mod_manSAO.ascx.designer.cs +++ b/GMW/WebUserControls/mod_manSAO.ascx.designer.cs @@ -174,6 +174,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnElimina; + /// + /// lblOutChkDelUdc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblOutChkDelUdc; + /// /// grView control. /// diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 778c4022..b13c2007 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index f882c9f0..6c804d6d 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index b40df9dc..cf97ea09 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 783df0cd..00278e64 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_data/DS_Utility.Designer.cs b/GMW_data/DS_Utility.Designer.cs index 30ec387f..d0da7993 100644 --- a/GMW_data/DS_Utility.Designer.cs +++ b/GMW_data/DS_Utility.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs index c7c43515..a7ac9372 100644 --- a/GMW_data/DS_magazzino.Designer.cs +++ b/GMW_data/DS_magazzino.Designer.cs @@ -96,6 +96,8 @@ namespace GMW_data { private v_A2U2DDataTable tablev_A2U2D; + private UDC_check4deleteDataTable tableUDC_check4delete; + private global::System.Data.DataRelation relationFK_PosizioneUdcCorrente_ElencoCartellini; private global::System.Data.DataRelation relationFK_PosizioneUdcStorico_ElencoCartellini; @@ -262,6 +264,9 @@ namespace GMW_data { if ((ds.Tables["v_A2U2D"] != null)) { base.Tables.Add(new v_A2U2DDataTable(ds.Tables["v_A2U2D"])); } + if ((ds.Tables["UDC_check4delete"] != null)) { + base.Tables.Add(new UDC_check4deleteDataTable(ds.Tables["UDC_check4delete"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -640,6 +645,16 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public UDC_check4deleteDataTable UDC_check4delete { + get { + return this.tableUDC_check4delete; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -815,6 +830,9 @@ namespace GMW_data { if ((ds.Tables["v_A2U2D"] != null)) { base.Tables.Add(new v_A2U2DDataTable(ds.Tables["v_A2U2D"])); } + if ((ds.Tables["UDC_check4delete"] != null)) { + base.Tables.Add(new UDC_check4deleteDataTable(ds.Tables["UDC_check4delete"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -1064,6 +1082,12 @@ namespace GMW_data { this.tablev_A2U2D.InitVars(); } } + this.tableUDC_check4delete = ((UDC_check4deleteDataTable)(base.Tables["UDC_check4delete"])); + if ((initTable == true)) { + if ((this.tableUDC_check4delete != null)) { + this.tableUDC_check4delete.InitVars(); + } + } this.relationFK_PosizioneUdcCorrente_ElencoCartellini = this.Relations["FK_PosizioneUdcCorrente_ElencoCartellini"]; this.relationFK_PosizioneUdcStorico_ElencoCartellini = this.Relations["FK_PosizioneUdcStorico_ElencoCartellini"]; this.relationFK_Blocchi_AnagMag = this.Relations["FK_Blocchi_AnagMag"]; @@ -1161,6 +1185,8 @@ namespace GMW_data { base.Tables.Add(this.tableElencoTrattamenti); this.tablev_A2U2D = new v_A2U2DDataTable(); base.Tables.Add(this.tablev_A2U2D); + this.tableUDC_check4delete = new UDC_check4deleteDataTable(); + base.Tables.Add(this.tableUDC_check4delete); this.relationFK_PosizioneUdcCorrente_ElencoCartellini = new global::System.Data.DataRelation("FK_PosizioneUdcCorrente_ElencoCartellini", new global::System.Data.DataColumn[] { this.tableElencoCartellini.UDCColumn}, new global::System.Data.DataColumn[] { this.tablePosizioneUdcCorrente.UDCColumn}, false); @@ -1443,6 +1469,12 @@ namespace GMW_data { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private bool ShouldSerializeUDC_check4delete() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1606,6 +1638,9 @@ namespace GMW_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public delegate void v_A2U2DRowChangeEventHandler(object sender, v_A2U2DRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public delegate void UDC_check4deleteRowChangeEventHandler(object sender, UDC_check4deleteRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -14976,6 +15011,255 @@ namespace GMW_data { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class UDC_check4deleteDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnChkRes; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteDataTable() { + this.TableName = "UDC_check4delete"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal UDC_check4deleteDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected UDC_check4deleteDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn ChkResColumn { + get { + return this.columnChkRes; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteRow this[int index] { + get { + return ((UDC_check4deleteRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UDC_check4deleteRowChangeEventHandler UDC_check4deleteRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UDC_check4deleteRowChangeEventHandler UDC_check4deleteRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UDC_check4deleteRowChangeEventHandler UDC_check4deleteRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UDC_check4deleteRowChangeEventHandler UDC_check4deleteRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void AddUDC_check4deleteRow(UDC_check4deleteRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteRow AddUDC_check4deleteRow(string ChkRes) { + UDC_check4deleteRow rowUDC_check4deleteRow = ((UDC_check4deleteRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + ChkRes}; + rowUDC_check4deleteRow.ItemArray = columnValuesArray; + this.Rows.Add(rowUDC_check4deleteRow); + return rowUDC_check4deleteRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public override global::System.Data.DataTable Clone() { + UDC_check4deleteDataTable cln = ((UDC_check4deleteDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new UDC_check4deleteDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal void InitVars() { + this.columnChkRes = base.Columns["ChkRes"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitClass() { + this.columnChkRes = new global::System.Data.DataColumn("ChkRes", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnChkRes); + this.columnChkRes.ReadOnly = true; + this.columnChkRes.MaxLength = 50; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteRow NewUDC_check4deleteRow() { + return ((UDC_check4deleteRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new UDC_check4deleteRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(UDC_check4deleteRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.UDC_check4deleteRowChanged != null)) { + this.UDC_check4deleteRowChanged(this, new UDC_check4deleteRowChangeEvent(((UDC_check4deleteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.UDC_check4deleteRowChanging != null)) { + this.UDC_check4deleteRowChanging(this, new UDC_check4deleteRowChangeEvent(((UDC_check4deleteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.UDC_check4deleteRowDeleted != null)) { + this.UDC_check4deleteRowDeleted(this, new UDC_check4deleteRowChangeEvent(((UDC_check4deleteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.UDC_check4deleteRowDeleting != null)) { + this.UDC_check4deleteRowDeleting(this, new UDC_check4deleteRowChangeEvent(((UDC_check4deleteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void RemoveUDC_check4deleteRow(UDC_check4deleteRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_magazzino ds = new DS_magazzino(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "UDC_check4deleteDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -21835,6 +22119,49 @@ namespace GMW_data { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class UDC_check4deleteRow : global::System.Data.DataRow { + + private UDC_check4deleteDataTable tableUDC_check4delete; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal UDC_check4deleteRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableUDC_check4delete = ((UDC_check4deleteDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string ChkRes { + get { + try { + return ((string)(this[this.tableUDC_check4delete.ChkResColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'ChkRes\' in table \'UDC_check4delete\' is DBNull.", e); + } + } + set { + this[this.tableUDC_check4delete.ChkResColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsChkResNull() { + return this.IsNull(this.tableUDC_check4delete.ChkResColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetChkResNull() { + this[this.tableUDC_check4delete.ChkResColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -23058,6 +23385,40 @@ namespace GMW_data { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public class UDC_check4deleteRowChangeEvent : global::System.EventArgs { + + private UDC_check4deleteRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteRowChangeEvent(UDC_check4deleteRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace GMW_data.DS_magazzinoTableAdapters { @@ -42894,6 +43255,214 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class UDC_check4deleteTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UDC_check4deleteTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "UDC_check4delete"; + tableMapping.ColumnMappings.Add("ChkRes", "ChkRes"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.GMWConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "dbo.stp_SAO_check4delete"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[0].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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Result", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(DS_magazzino.UDC_check4deleteDataTable dataTable, string UDC, ref string Result) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + if ((Result == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Result)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + if (((this.Adapter.SelectCommand.Parameters[2].Value == null) + || (this.Adapter.SelectCommand.Parameters[2].Value.GetType() == typeof(global::System.DBNull)))) { + Result = null; + } + else { + Result = ((string)(this.Adapter.SelectCommand.Parameters[2].Value)); + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_magazzino.UDC_check4deleteDataTable GetData(string UDC, ref string Result) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + if ((Result == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Result)); + } + DS_magazzino.UDC_check4deleteDataTable dataTable = new DS_magazzino.UDC_check4deleteDataTable(); + this.Adapter.Fill(dataTable); + if (((this.Adapter.SelectCommand.Parameters[2].Value == null) + || (this.Adapter.SelectCommand.Parameters[2].Value.GetType() == typeof(global::System.DBNull)))) { + Result = null; + } + else { + Result = ((string)(this.Adapter.SelectCommand.Parameters[2].Value)); + } + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -43451,15 +44020,6 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } - if ((this._tipoListaPrelievoTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.TipoListaPrelievo.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._tipoListaPrelievoTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._tipoCellaTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.TipoCella.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43469,12 +44029,12 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } - if ((this._elencoAssiemiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.ElencoAssiemi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._tipoListaPrelievoTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.TipoListaPrelievo.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._elencoAssiemiTableAdapter.Update(updatedRows)); + result = (result + this._tipoListaPrelievoTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -43496,57 +44056,12 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } - if ((this._anagImballiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagImballi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._elencoAssiemiTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.ElencoAssiemi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._anagImballiTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._aL2UDCTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AL2UDC.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._aL2UDCTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._posizioneUdcCorrenteTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.PosizioneUdcCorrente.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._posizioneUdcCorrenteTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._attr2UDCTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Attr2UDC.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._attr2UDCTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._anagLineeTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagLinee.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._anagLineeTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._storicoAzioniOperatoreTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.StoricoAzioniOperatore.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._storicoAzioniOperatoreTableAdapter.Update(updatedRows)); + result = (result + this._elencoAssiemiTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -43559,6 +44074,24 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } + if ((this._storicoAzioniOperatoreTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.StoricoAzioniOperatore.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._storicoAzioniOperatoreTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._anagLineeTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AnagLinee.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._anagLineeTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._anagParticolariTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.AnagParticolari.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43568,12 +44101,21 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } - if ((this._rapQualTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.RapQual.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._attr2UDCTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Attr2UDC.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._rapQualTableAdapter.Update(updatedRows)); + result = (result + this._attr2UDCTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._aL2UDCTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AL2UDC.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._aL2UDCTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -43586,12 +44128,12 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } - if ((this._posizioneUdcStoricoTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.PosizioneUdcStorico.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._rapQualTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.RapQual.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._posizioneUdcStoricoTableAdapter.Update(updatedRows)); + result = (result + this._rapQualTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -43604,6 +44146,33 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(updatedRows); } } + if ((this._anagImballiTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AnagImballi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._anagImballiTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._posizioneUdcStoricoTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.PosizioneUdcStorico.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._posizioneUdcStoricoTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._posizioneUdcCorrenteTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.PosizioneUdcCorrente.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._posizioneUdcCorrenteTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -43638,14 +44207,6 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } - if ((this._tipoListaPrelievoTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.TipoListaPrelievo.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._tipoListaPrelievoTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._tipoCellaTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.TipoCella.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43654,11 +44215,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } - if ((this._elencoAssiemiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.ElencoAssiemi.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._tipoListaPrelievoTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.TipoListaPrelievo.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._elencoAssiemiTableAdapter.Update(addedRows)); + result = (result + this._tipoListaPrelievoTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -43678,51 +44239,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } - if ((this._anagImballiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagImballi.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._elencoAssiemiTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.ElencoAssiemi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._anagImballiTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._aL2UDCTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AL2UDC.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._aL2UDCTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._posizioneUdcCorrenteTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.PosizioneUdcCorrente.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._posizioneUdcCorrenteTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._attr2UDCTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Attr2UDC.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._attr2UDCTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._anagLineeTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagLinee.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._anagLineeTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._storicoAzioniOperatoreTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.StoricoAzioniOperatore.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._storicoAzioniOperatoreTableAdapter.Update(addedRows)); + result = (result + this._elencoAssiemiTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -43734,6 +44255,22 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } + if ((this._storicoAzioniOperatoreTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.StoricoAzioniOperatore.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._storicoAzioniOperatoreTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._anagLineeTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AnagLinee.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._anagLineeTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._anagParticolariTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.AnagParticolari.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43742,11 +44279,19 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } - if ((this._rapQualTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.RapQual.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._attr2UDCTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Attr2UDC.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._rapQualTableAdapter.Update(addedRows)); + result = (result + this._attr2UDCTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._aL2UDCTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AL2UDC.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._aL2UDCTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -43758,11 +44303,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } - if ((this._posizioneUdcStoricoTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.PosizioneUdcStorico.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._rapQualTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.RapQual.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._posizioneUdcStoricoTableAdapter.Update(addedRows)); + result = (result + this._rapQualTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -43774,6 +44319,30 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allAddedRows.AddRange(addedRows); } } + if ((this._anagImballiTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AnagImballi.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._anagImballiTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._posizioneUdcStoricoTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.PosizioneUdcStorico.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._posizioneUdcStoricoTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._posizioneUdcCorrenteTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.PosizioneUdcCorrente.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._posizioneUdcCorrenteTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -43784,11 +44353,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateDeletedRows(DS_magazzino dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._righeListePrelievoTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.RigheListePrelievo.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._posizioneUdcCorrenteTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.PosizioneUdcCorrente.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._righeListePrelievoTableAdapter.Update(deletedRows)); + result = (result + this._posizioneUdcCorrenteTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43800,11 +44369,19 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(deletedRows); } } - if ((this._elencoTrattamentiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ElencoTrattamenti.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._anagImballiTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.AnagImballi.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._elencoTrattamentiTableAdapter.Update(deletedRows)); + result = (result + this._anagImballiTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._righeListePrelievoTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.RigheListePrelievo.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._righeListePrelievoTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43816,51 +44393,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(deletedRows); } } - if ((this._anagParticolariTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagParticolari.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._elencoTrattamentiTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ElencoTrattamenti.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._anagParticolariTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._anagLegheTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagLeghe.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._anagLegheTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._storicoAzioniOperatoreTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.StoricoAzioniOperatore.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._storicoAzioniOperatoreTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._anagLineeTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagLinee.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._anagLineeTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._attr2UDCTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Attr2UDC.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._attr2UDCTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._posizioneUdcCorrenteTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.PosizioneUdcCorrente.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._posizioneUdcCorrenteTableAdapter.Update(deletedRows)); + result = (result + this._elencoTrattamentiTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43872,11 +44409,51 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(deletedRows); } } - if ((this._anagImballiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagImballi.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._attr2UDCTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Attr2UDC.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._anagImballiTableAdapter.Update(deletedRows)); + result = (result + this._attr2UDCTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._anagParticolariTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.AnagParticolari.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._anagParticolariTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._anagLineeTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.AnagLinee.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._anagLineeTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._storicoAzioniOperatoreTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.StoricoAzioniOperatore.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._storicoAzioniOperatoreTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._anagLegheTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.AnagLeghe.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._anagLegheTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._elencoAssiemiTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ElencoAssiemi.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._elencoAssiemiTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43896,11 +44473,11 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(deletedRows); } } - if ((this._elencoAssiemiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ElencoAssiemi.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._tipoListaPrelievoTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.TipoListaPrelievo.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._elencoAssiemiTableAdapter.Update(deletedRows)); + result = (result + this._tipoListaPrelievoTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43912,14 +44489,6 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, allChangedRows.AddRange(deletedRows); } } - if ((this._tipoListaPrelievoTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.TipoListaPrelievo.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._tipoListaPrelievoTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._blocchiTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Blocchi.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd index 5e38d6fc..58a37155 100644 --- a/GMW_data/DS_magazzino.xsd +++ b/GMW_data/DS_magazzino.xsd @@ -406,7 +406,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_UDC_setDL_DC @@ -418,7 +418,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_UDC_travasoQty @@ -479,7 +479,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_UDC_updateNote @@ -4319,6 +4319,26 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, + + + + + + dbo.stp_SAO_check4delete + + + + + + + + + + + + + + @@ -5454,7 +5474,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5511,7 +5531,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5543,7 +5563,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5565,7 +5585,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5599,7 +5619,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5655,14 +5675,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + - + @@ -5698,7 +5718,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5755,7 +5775,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5783,7 +5803,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5830,7 +5850,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - + @@ -5859,6 +5879,19 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, + + + + + + + + + + + + + @@ -6024,21 +6057,21 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur, - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index ad9efab3..de8e29df 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -46,6 +46,7 @@ namespace GMW_data public DS_magazzinoTableAdapters.AL2UDCTableAdapter taAL2UDC; public DS_magazzinoTableAdapters.ElencoTrattamentiTableAdapter taET; public DS_magazzinoTableAdapters.v_A2U2DTableAdapter taA2U2D; + public DS_magazzinoTableAdapters.UDC_check4deleteTableAdapter taUdcChk4Del; /// @@ -85,6 +86,7 @@ namespace GMW_data taAL2UDC = new DS_magazzinoTableAdapters.AL2UDCTableAdapter(); taET = new DS_magazzinoTableAdapters.ElencoTrattamentiTableAdapter(); taA2U2D = new DS_magazzinoTableAdapters.v_A2U2DTableAdapter(); + taUdcChk4Del = new DS_magazzinoTableAdapters.UDC_check4deleteTableAdapter(); } /// /// effettua setup dei connection strings da web.config delal singola applicazione @@ -123,6 +125,7 @@ namespace GMW_data taAL2UDC.Connection.ConnectionString = connString; taET.Connection.ConnectionString = connString; taA2U2D.Connection.ConnectionString = connString; + taUdcChk4Del.Connection.ConnectionString = connString; } #endregion diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index 4fee3ba2..65d69765 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.832.2103")] -[assembly: AssemblyFileVersion("3.2.832.2103")] +[assembly: AssemblyVersion("3.2.833.2103")] +[assembly: AssemblyFileVersion("3.2.833.2103")] [assembly: AssemblyCopyright("Steamware © 2007-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index 4c6026d1..26a6996c 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.832.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("3.2.832.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("3.2.833.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("3.2.833.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+