From 807a6d5e45110fe7b6ab155f9d7e694e9833ad24 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 11:14:19 +0200 Subject: [PATCH 01/23] Aggiunta metodi chiamate stored ricalcolo --- AppData/ComLib.cs | 82 ++ AppData/DS_App.Designer.cs | 2036 ++++++++++++++++++++++++++++++++++-- AppData/DS_App.xsd | 339 ++++-- AppData/DS_App.xss | 112 +- AppData/DataLayer.cs | 14 +- 5 files changed, 2371 insertions(+), 212 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 0dd9690..bf4ad28 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2141,6 +2141,18 @@ namespace AppData return answ; } + /// + /// Effettua divisione evitando zeri a den... + /// + /// + /// + /// + public static double ratioProt(double num, double den) + { + den = den == 0 ? 1 : den; + return num / den; + } + /// /// Leggo il Takt inviato /// @@ -3362,6 +3374,76 @@ namespace AppData return answ; } + /// + /// Effettua il ricalcolo delle statistiche x SheetStat --> BatchStat dato un BatchID recuperando i dati da MongoDB + /// + /// + /// + public bool updateSheetStatsByBatch(int BatchID) + { + bool answ = false; + DataLayer DLMan = new DataLayer(); + List PaintPartList = new List(); + + // cerco da lista salvataggi Estim/Nest... + var nestAnsw = getNestAnsw(BatchID); + if (nestAnsw != null) + { + // inizio eliminando le vecchie statistiche x foglio + DLMan.taShStats.resetBatch(BatchID); + + // recupero i pitturati + try + { + if (nestAnsw.BinList != null) + { + foreach (var bin in nestAnsw.BinList) + { + // se ho parti le aggiungo + if (bin.PartList != null) + { + foreach (var Part in bin.PartList) + { + PaintPartList.Add(Part.PartId); + } + } + } + } + } + catch + { } + + // il tot delle part è in bunk > Sheet > part + try + { + if (nestAnsw.BunkList != null) + { + foreach (var bunk in nestAnsw.BunkList) + { + foreach (var sheet in bunk.SheetList) + { + // dati resa superfici + double num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0; + double den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1; + // parts del foglio + List PartList = sheet.PartList.Select(x => x.PartId).ToList(); + int numPaint = PartList.Intersect(PaintPartList).Count(); + + // qui salvo le statistiche + DLMan.taShStats.upsertQuery(BatchID, sheet.SheetIndex, sheet.MatId, (decimal)num, (decimal)den, sheet.PartList.Count, numPaint); + } + } + } + } + catch + { } + // finisco calcolando le statistiche x Batch... + DLMan.taBStats.refresh(BatchID); + } + + return answ; + } + #endregion Public Methods #region Public Classes diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index e754832..954bf04 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -108,6 +108,10 @@ namespace AppData { private UpdManDataTable tableUpdMan; + private SheetStatsDataTable tableSheetStats; + + private BatchStatsDataTable tableBatchStats; + private global::System.Data.DataRelation relationFK_ItemList_Materials1; private global::System.Data.DataRelation relationFK_OffOrd2Item_OfflineOrderList; @@ -286,6 +290,12 @@ namespace AppData { if ((ds.Tables["UpdMan"] != null)) { base.Tables.Add(new UpdManDataTable(ds.Tables["UpdMan"])); } + if ((ds.Tables["SheetStats"] != null)) { + base.Tables.Add(new SheetStatsDataTable(ds.Tables["SheetStats"])); + } + if ((ds.Tables["BatchStats"] != null)) { + base.Tables.Add(new BatchStatsDataTable(ds.Tables["BatchStats"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -724,6 +734,26 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public SheetStatsDataTable SheetStats { + get { + return this.tableSheetStats; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public BatchStatsDataTable BatchStats { + get { + return this.tableBatchStats; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -917,6 +947,12 @@ namespace AppData { if ((ds.Tables["UpdMan"] != null)) { base.Tables.Add(new UpdManDataTable(ds.Tables["UpdMan"])); } + if ((ds.Tables["SheetStats"] != null)) { + base.Tables.Add(new SheetStatsDataTable(ds.Tables["SheetStats"])); + } + if ((ds.Tables["BatchStats"] != null)) { + base.Tables.Add(new BatchStatsDataTable(ds.Tables["BatchStats"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -1202,6 +1238,18 @@ namespace AppData { this.tableUpdMan.InitVars(); } } + this.tableSheetStats = ((SheetStatsDataTable)(base.Tables["SheetStats"])); + if ((initTable == true)) { + if ((this.tableSheetStats != null)) { + this.tableSheetStats.InitVars(); + } + } + this.tableBatchStats = ((BatchStatsDataTable)(base.Tables["BatchStats"])); + if ((initTable == true)) { + if ((this.tableBatchStats != null)) { + this.tableBatchStats.InitVars(); + } + } this.relationFK_ItemList_Materials1 = this.Relations["FK_ItemList_Materials1"]; this.relationFK_OffOrd2Item_OfflineOrderList = this.Relations["FK_OffOrd2Item_OfflineOrderList"]; this.relationFK_ItemList_KitList = this.Relations["FK_ItemList_KitList"]; @@ -1308,6 +1356,10 @@ namespace AppData { base.Tables.Add(this.tableStatusDecode); this.tableUpdMan = new UpdManDataTable(); base.Tables.Add(this.tableUpdMan); + this.tableSheetStats = new SheetStatsDataTable(); + base.Tables.Add(this.tableSheetStats); + this.tableBatchStats = new BatchStatsDataTable(); + base.Tables.Add(this.tableBatchStats); this.relationFK_ItemList_Materials1 = new global::System.Data.DataRelation("FK_ItemList_Materials1", new global::System.Data.DataColumn[] { this.tableMaterials.MatIDColumn}, new global::System.Data.DataColumn[] { this.tableItemList.MatIDColumn}, false); @@ -1610,6 +1662,18 @@ namespace AppData { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeSheetStats() { + return false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeBatchStats() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1791,6 +1855,12 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void UpdManRowChangeEventHandler(object sender, UpdManRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void SheetStatsRowChangeEventHandler(object sender, SheetStatsRowChangeEvent e); + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void BatchStatsRowChangeEventHandler(object sender, BatchStatsRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -18705,6 +18775,749 @@ namespace AppData { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class SheetStatsDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnBatchID; + + private global::System.Data.DataColumn columnSheetIndex; + + private global::System.Data.DataColumn columnMatID; + + private global::System.Data.DataColumn columnWorkArea; + + private global::System.Data.DataColumn columnTotalArea; + + private global::System.Data.DataColumn columnNumParts; + + private global::System.Data.DataColumn columnNumPainted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsDataTable() { + this.TableName = "SheetStats"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal SheetStatsDataTable(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", "16.0.0.0")] + protected SheetStatsDataTable(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", "16.0.0.0")] + public global::System.Data.DataColumn BatchIDColumn { + get { + return this.columnBatchID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn SheetIndexColumn { + get { + return this.columnSheetIndex; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn MatIDColumn { + get { + return this.columnMatID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn WorkAreaColumn { + get { + return this.columnWorkArea; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotalAreaColumn { + get { + return this.columnTotalArea; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPartsColumn { + get { + return this.columnNumParts; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPaintedColumn { + get { + return this.columnNumPainted; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.0.0.0")] + public SheetStatsRow this[int index] { + get { + return ((SheetStatsRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddSheetStatsRow(SheetStatsRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRow AddSheetStatsRow(int BatchID, int SheetIndex, int MatID, decimal WorkArea, decimal TotalArea, int NumParts, int NumPainted) { + SheetStatsRow rowSheetStatsRow = ((SheetStatsRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + BatchID, + SheetIndex, + MatID, + WorkArea, + TotalArea, + NumParts, + NumPainted}; + rowSheetStatsRow.ItemArray = columnValuesArray; + this.Rows.Add(rowSheetStatsRow); + return rowSheetStatsRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRow FindByBatchIDSheetIndex(int BatchID, int SheetIndex) { + return ((SheetStatsRow)(this.Rows.Find(new object[] { + BatchID, + SheetIndex}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + SheetStatsDataTable cln = ((SheetStatsDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new SheetStatsDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnBatchID = base.Columns["BatchID"]; + this.columnSheetIndex = base.Columns["SheetIndex"]; + this.columnMatID = base.Columns["MatID"]; + this.columnWorkArea = base.Columns["WorkArea"]; + this.columnTotalArea = base.Columns["TotalArea"]; + this.columnNumParts = base.Columns["NumParts"]; + this.columnNumPainted = base.Columns["NumPainted"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchID); + this.columnSheetIndex = new global::System.Data.DataColumn("SheetIndex", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSheetIndex); + this.columnMatID = new global::System.Data.DataColumn("MatID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnMatID); + this.columnWorkArea = new global::System.Data.DataColumn("WorkArea", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnWorkArea); + this.columnTotalArea = new global::System.Data.DataColumn("TotalArea", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotalArea); + this.columnNumParts = new global::System.Data.DataColumn("NumParts", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumParts); + this.columnNumPainted = new global::System.Data.DataColumn("NumPainted", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumPainted); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnBatchID, + this.columnSheetIndex}, true)); + this.columnBatchID.AllowDBNull = false; + this.columnSheetIndex.AllowDBNull = false; + this.columnMatID.AllowDBNull = false; + this.columnWorkArea.AllowDBNull = false; + this.columnTotalArea.AllowDBNull = false; + this.columnNumParts.AllowDBNull = false; + this.columnNumPainted.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRow NewSheetStatsRow() { + return ((SheetStatsRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new SheetStatsRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(SheetStatsRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.SheetStatsRowChanged != null)) { + this.SheetStatsRowChanged(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.SheetStatsRowChanging != null)) { + this.SheetStatsRowChanging(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.SheetStatsRowDeleted != null)) { + this.SheetStatsRowDeleted(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.SheetStatsRowDeleting != null)) { + this.SheetStatsRowDeleting(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveSheetStatsRow(SheetStatsRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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_App ds = new DS_App(); + 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 = "SheetStatsDataTable"; + 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 the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class BatchStatsDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnBatchID; + + private global::System.Data.DataColumn columnTakt; + + private global::System.Data.DataColumn columnAvgYeld; + + private global::System.Data.DataColumn columnTotalArea; + + private global::System.Data.DataColumn columnNumMat; + + private global::System.Data.DataColumn columnNumSheets; + + private global::System.Data.DataColumn columnNumModel; + + private global::System.Data.DataColumn columnNumKit; + + private global::System.Data.DataColumn columnNumParts; + + private global::System.Data.DataColumn columnNumPainted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsDataTable() { + this.TableName = "BatchStats"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal BatchStatsDataTable(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", "16.0.0.0")] + protected BatchStatsDataTable(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", "16.0.0.0")] + public global::System.Data.DataColumn BatchIDColumn { + get { + return this.columnBatchID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TaktColumn { + get { + return this.columnTakt; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn AvgYeldColumn { + get { + return this.columnAvgYeld; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotalAreaColumn { + get { + return this.columnTotalArea; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumMatColumn { + get { + return this.columnNumMat; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumSheetsColumn { + get { + return this.columnNumSheets; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumModelColumn { + get { + return this.columnNumModel; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumKitColumn { + get { + return this.columnNumKit; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPartsColumn { + get { + return this.columnNumParts; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPaintedColumn { + get { + return this.columnNumPainted; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.0.0.0")] + public BatchStatsRow this[int index] { + get { + return ((BatchStatsRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddBatchStatsRow(BatchStatsRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRow AddBatchStatsRow(int BatchID, string Takt, decimal AvgYeld, decimal TotalArea, int NumMat, int NumSheets, int NumModel, int NumKit, int NumParts, int NumPainted) { + BatchStatsRow rowBatchStatsRow = ((BatchStatsRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + BatchID, + Takt, + AvgYeld, + TotalArea, + NumMat, + NumSheets, + NumModel, + NumKit, + NumParts, + NumPainted}; + rowBatchStatsRow.ItemArray = columnValuesArray; + this.Rows.Add(rowBatchStatsRow); + return rowBatchStatsRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRow FindByBatchID(int BatchID) { + return ((BatchStatsRow)(this.Rows.Find(new object[] { + BatchID}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + BatchStatsDataTable cln = ((BatchStatsDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new BatchStatsDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnBatchID = base.Columns["BatchID"]; + this.columnTakt = base.Columns["Takt"]; + this.columnAvgYeld = base.Columns["AvgYeld"]; + this.columnTotalArea = base.Columns["TotalArea"]; + this.columnNumMat = base.Columns["NumMat"]; + this.columnNumSheets = base.Columns["NumSheets"]; + this.columnNumModel = base.Columns["NumModel"]; + this.columnNumKit = base.Columns["NumKit"]; + this.columnNumParts = base.Columns["NumParts"]; + this.columnNumPainted = base.Columns["NumPainted"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchID); + this.columnTakt = new global::System.Data.DataColumn("Takt", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTakt); + this.columnAvgYeld = new global::System.Data.DataColumn("AvgYeld", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAvgYeld); + this.columnTotalArea = new global::System.Data.DataColumn("TotalArea", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotalArea); + this.columnNumMat = new global::System.Data.DataColumn("NumMat", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumMat); + this.columnNumSheets = new global::System.Data.DataColumn("NumSheets", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSheets); + this.columnNumModel = new global::System.Data.DataColumn("NumModel", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumModel); + this.columnNumKit = new global::System.Data.DataColumn("NumKit", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumKit); + this.columnNumParts = new global::System.Data.DataColumn("NumParts", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumParts); + this.columnNumPainted = new global::System.Data.DataColumn("NumPainted", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumPainted); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnBatchID}, true)); + this.columnBatchID.AllowDBNull = false; + this.columnBatchID.Unique = true; + this.columnTakt.AllowDBNull = false; + this.columnTakt.MaxLength = 50; + this.columnAvgYeld.AllowDBNull = false; + this.columnTotalArea.AllowDBNull = false; + this.columnNumMat.AllowDBNull = false; + this.columnNumSheets.AllowDBNull = false; + this.columnNumModel.AllowDBNull = false; + this.columnNumKit.AllowDBNull = false; + this.columnNumParts.AllowDBNull = false; + this.columnNumPainted.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRow NewBatchStatsRow() { + return ((BatchStatsRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new BatchStatsRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(BatchStatsRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.BatchStatsRowChanged != null)) { + this.BatchStatsRowChanged(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.BatchStatsRowChanging != null)) { + this.BatchStatsRowChanging(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.BatchStatsRowDeleted != null)) { + this.BatchStatsRowDeleted(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.BatchStatsRowDeleting != null)) { + this.BatchStatsRowDeleting(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveBatchStatsRow(BatchStatsRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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_App ds = new DS_App(); + 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 = "BatchStatsDataTable"; + 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. /// @@ -26767,6 +27580,223 @@ namespace AppData { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class SheetStatsRow : global::System.Data.DataRow { + + private SheetStatsDataTable tableSheetStats; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal SheetStatsRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableSheetStats = ((SheetStatsDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int BatchID { + get { + return ((int)(this[this.tableSheetStats.BatchIDColumn])); + } + set { + this[this.tableSheetStats.BatchIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int SheetIndex { + get { + return ((int)(this[this.tableSheetStats.SheetIndexColumn])); + } + set { + this[this.tableSheetStats.SheetIndexColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int MatID { + get { + return ((int)(this[this.tableSheetStats.MatIDColumn])); + } + set { + this[this.tableSheetStats.MatIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal WorkArea { + get { + return ((decimal)(this[this.tableSheetStats.WorkAreaColumn])); + } + set { + this[this.tableSheetStats.WorkAreaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal TotalArea { + get { + return ((decimal)(this[this.tableSheetStats.TotalAreaColumn])); + } + set { + this[this.tableSheetStats.TotalAreaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumParts { + get { + return ((int)(this[this.tableSheetStats.NumPartsColumn])); + } + set { + this[this.tableSheetStats.NumPartsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumPainted { + get { + return ((int)(this[this.tableSheetStats.NumPaintedColumn])); + } + set { + this[this.tableSheetStats.NumPaintedColumn] = value; + } + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class BatchStatsRow : global::System.Data.DataRow { + + private BatchStatsDataTable tableBatchStats; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal BatchStatsRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableBatchStats = ((BatchStatsDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int BatchID { + get { + return ((int)(this[this.tableBatchStats.BatchIDColumn])); + } + set { + this[this.tableBatchStats.BatchIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string Takt { + get { + return ((string)(this[this.tableBatchStats.TaktColumn])); + } + set { + this[this.tableBatchStats.TaktColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal AvgYeld { + get { + return ((decimal)(this[this.tableBatchStats.AvgYeldColumn])); + } + set { + this[this.tableBatchStats.AvgYeldColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal TotalArea { + get { + return ((decimal)(this[this.tableBatchStats.TotalAreaColumn])); + } + set { + this[this.tableBatchStats.TotalAreaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumMat { + get { + return ((int)(this[this.tableBatchStats.NumMatColumn])); + } + set { + this[this.tableBatchStats.NumMatColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumSheets { + get { + return ((int)(this[this.tableBatchStats.NumSheetsColumn])); + } + set { + this[this.tableBatchStats.NumSheetsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumModel { + get { + return ((int)(this[this.tableBatchStats.NumModelColumn])); + } + set { + this[this.tableBatchStats.NumModelColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumKit { + get { + return ((int)(this[this.tableBatchStats.NumKitColumn])); + } + set { + this[this.tableBatchStats.NumKitColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumParts { + get { + return ((int)(this[this.tableBatchStats.NumPartsColumn])); + } + set { + this[this.tableBatchStats.NumPartsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumPainted { + get { + return ((int)(this[this.tableBatchStats.NumPaintedColumn])); + } + set { + this[this.tableBatchStats.NumPaintedColumn] = value; + } + } + } + /// ///Row event argument class /// @@ -28194,6 +29224,74 @@ namespace AppData { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class SheetStatsRowChangeEvent : global::System.EventArgs { + + private SheetStatsRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRowChangeEvent(SheetStatsRow 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", "16.0.0.0")] + public SheetStatsRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class BatchStatsRowChangeEvent : global::System.EventArgs { + + private BatchStatsRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRowChangeEvent(BatchStatsRow 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", "16.0.0.0")] + public BatchStatsRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace AppData.DS_AppTableAdapters { @@ -42805,6 +43903,626 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update } } + /// + ///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 SheetStatsTableAdapter : 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", "16.0.0.0")] + public SheetStatsTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.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", "16.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", "16.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", "16.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", "16.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 = "SheetStats"; + tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("SheetIndex", "SheetIndex"); + tableMapping.ColumnMappings.Add("MatID", "MatID"); + tableMapping.ColumnMappings.Add("WorkArea", "WorkArea"); + tableMapping.ColumnMappings.Add("TotalArea", "TotalArea"); + tableMapping.ColumnMappings.Add("NumParts", "NumParts"); + tableMapping.ColumnMappings.Add("NumPainted", "NumPainted"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [SheetStats] WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex]" + + " = @Original_SheetIndex))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [SheetStats] ([BatchID], [SheetIndex], [MatID], [WorkArea], [TotalArea], [NumParts], [NumPainted]) VALUES (@BatchID, @SheetIndex, @MatID, @WorkArea, @TotalArea, @NumParts, @NumPainted); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex)"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WorkArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "WorkArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [SheetStats] SET [BatchID] = @BatchID, [SheetIndex] = @SheetIndex, [MatID] = @MatID, [WorkArea] = @WorkArea, [TotalArea] = @TotalArea, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex] = @Original_SheetIndex)); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WorkArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "WorkArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::AppData.Properties.Settings.Default.Sauder_NKCConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM SheetStats"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_SheetStat_resetQuery"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_SheetStat_upsertQuery"; + 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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WorkArea", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Fill, true)] + public virtual int Fill(DS_App.SheetStatsDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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, true)] + public virtual DS_App.SheetStatsDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.SheetStatsDataTable dataTable = new DS_App.SheetStatsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App.SheetStatsDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App dataSet) { + return this.Adapter.Update(dataSet, "SheetStats"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int resetBatch(global::System.Nullable BatchID) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int upsertQuery(global::System.Nullable BatchID, global::System.Nullable SheetIndex, global::System.Nullable MatID, global::System.Nullable WorkArea, global::System.Nullable TotalArea, global::System.Nullable NumParts, global::System.Nullable NumPainted) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((SheetIndex.HasValue == true)) { + command.Parameters[2].Value = ((int)(SheetIndex.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((MatID.HasValue == true)) { + command.Parameters[3].Value = ((int)(MatID.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((WorkArea.HasValue == true)) { + command.Parameters[4].Value = ((decimal)(WorkArea.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((TotalArea.HasValue == true)) { + command.Parameters[5].Value = ((decimal)(TotalArea.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + if ((NumParts.HasValue == true)) { + command.Parameters[6].Value = ((int)(NumParts.Value)); + } + else { + command.Parameters[6].Value = global::System.DBNull.Value; + } + if ((NumPainted.HasValue == true)) { + command.Parameters[7].Value = ((int)(NumPainted.Value)); + } + else { + command.Parameters[7].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + + /// + ///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 BatchStatsTableAdapter : 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", "16.0.0.0")] + public BatchStatsTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.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", "16.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", "16.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", "16.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", "16.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 = "BatchStats"; + tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("Takt", "Takt"); + tableMapping.ColumnMappings.Add("AvgYeld", "AvgYeld"); + tableMapping.ColumnMappings.Add("TotalArea", "TotalArea"); + tableMapping.ColumnMappings.Add("NumMat", "NumMat"); + tableMapping.ColumnMappings.Add("NumSheets", "NumSheets"); + tableMapping.ColumnMappings.Add("NumModel", "NumModel"); + tableMapping.ColumnMappings.Add("NumKit", "NumKit"); + tableMapping.ColumnMappings.Add("NumParts", "NumParts"); + tableMapping.ColumnMappings.Add("NumPainted", "NumPainted"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [BatchStats] WHERE (([BatchID] = @Original_BatchID))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [BatchStats] ([BatchID], [Takt], [AvgYeld], [TotalArea], [NumMat], [NumSheets], [NumModel], [NumKit], [NumParts], [NumPainted]) VALUES (@BatchID, @Takt, @AvgYeld, @TotalArea, @NumMat, @NumSheets, @NumModel, @NumKit, @NumParts, @NumPainted); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID)"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Takt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AvgYeld", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 9, "AvgYeld", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumMat", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumMat", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumSheets", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumSheets", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumModel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumKit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumKit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [BatchStats] SET [BatchID] = @BatchID, [Takt] = @Takt, [AvgYeld] = @AvgYeld, [TotalArea] = @TotalArea, [NumMat] = @NumMat, [NumSheets] = @NumSheets, [NumModel] = @NumModel, [NumKit] = @NumKit, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID)); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Takt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AvgYeld", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 9, "AvgYeld", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumMat", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumMat", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumSheets", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumSheets", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumModel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumKit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumKit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::AppData.Properties.Settings.Default.Sauder_NKCConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT * FROM BatchStats"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_BatchStat_refresh"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Fill, true)] + public virtual int Fill(DS_App.BatchStatsDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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, true)] + public virtual DS_App.BatchStatsDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.BatchStatsDataTable dataTable = new DS_App.BatchStatsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App.BatchStatsDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App dataSet) { + return this.Adapter.Update(dataSet, "BatchStats"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int refresh(global::System.Nullable BatchID) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -42849,6 +44567,10 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update private UpdManTableAdapter _updManTableAdapter; + private SheetStatsTableAdapter _sheetStatsTableAdapter; + + private BatchStatsTableAdapter _batchStatsTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -43088,6 +44810,34 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public SheetStatsTableAdapter SheetStatsTableAdapter { + get { + return this._sheetStatsTableAdapter; + } + set { + this._sheetStatsTableAdapter = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public BatchStatsTableAdapter BatchStatsTableAdapter { + get { + return this._batchStatsTableAdapter; + } + set { + this._batchStatsTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -43171,6 +44921,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update && (this._updManTableAdapter.Connection != null))) { return this._updManTableAdapter.Connection; } + if (((this._sheetStatsTableAdapter != null) + && (this._sheetStatsTableAdapter.Connection != null))) { + return this._sheetStatsTableAdapter.Connection; + } + if (((this._batchStatsTableAdapter != null) + && (this._batchStatsTableAdapter.Connection != null))) { + return this._batchStatsTableAdapter.Connection; + } return null; } set { @@ -43232,6 +44990,12 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update if ((this._updManTableAdapter != null)) { count = (count + 1); } + if ((this._sheetStatsTableAdapter != null)) { + count = (count + 1); + } + if ((this._batchStatsTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -43261,15 +45025,6 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } - if ((this._placesTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._placesTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43279,6 +45034,15 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } + if ((this._placesTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._placesTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43297,6 +45061,33 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._updManTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43333,6 +45124,15 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._countersTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._errorsLogTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43351,39 +45151,21 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._sheetStatsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.SheetStats.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(updatedRows)); + result = (result + this._sheetStatsTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._batchStatsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.BatchStats.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._countersTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._updManTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._updManTableAdapter.Update(updatedRows)); + result = (result + this._batchStatsTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -43413,14 +45195,6 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } - if ((this._placesTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._placesTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43429,6 +45203,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } + if ((this._placesTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._placesTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43445,6 +45227,30 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._updManTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43477,6 +45283,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._countersTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._errorsLogTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43493,35 +45307,19 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._sheetStatsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.SheetStats.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(addedRows)); + result = (result + this._sheetStatsTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._batchStatsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.BatchStats.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._countersTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._updManTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._updManTableAdapter.Update(addedRows)); + result = (result + this._batchStatsTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -43535,35 +45333,19 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateDeletedRows(DS_App dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._updManTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._batchStatsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.BatchStats.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._updManTableAdapter.Update(deletedRows)); + result = (result + this._batchStatsTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._sheetStatsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.SheetStats.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._countersTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(deletedRows)); + result = (result + this._sheetStatsTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43583,6 +45365,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._countersTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._order2FinalKitTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43615,6 +45405,30 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._updManTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._fileValidationTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.FileValidation.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43631,14 +45445,6 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } - if ((this._itemListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._itemListTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._placesTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43647,6 +45453,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } + if ((this._itemListTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._itemListTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._kitListTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43782,6 +45596,16 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } + if (((this._sheetStatsTableAdapter != null) + && (this.MatchTableAdapterConnection(this._sheetStatsTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); + } + if (((this._batchStatsTableAdapter != null) + && (this.MatchTableAdapterConnection(this._batchStatsTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + @@ -43958,6 +45782,24 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update adaptersWithAcceptChangesDuringUpdate.Add(this._updManTableAdapter.Adapter); } } + if ((this._sheetStatsTableAdapter != null)) { + revertConnections.Add(this._sheetStatsTableAdapter, this._sheetStatsTableAdapter.Connection); + this._sheetStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._sheetStatsTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._sheetStatsTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._sheetStatsTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._sheetStatsTableAdapter.Adapter); + } + } + if ((this._batchStatsTableAdapter != null)) { + revertConnections.Add(this._batchStatsTableAdapter, this._batchStatsTableAdapter.Connection); + this._batchStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._batchStatsTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._batchStatsTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._batchStatsTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._batchStatsTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -44080,6 +45922,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update this._updManTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._updManTableAdapter])); this._updManTableAdapter.Transaction = null; } + if ((this._sheetStatsTableAdapter != null)) { + this._sheetStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._sheetStatsTableAdapter])); + this._sheetStatsTableAdapter.Transaction = null; + } + if ((this._batchStatsTableAdapter != null)) { + this._batchStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._batchStatsTableAdapter])); + this._batchStatsTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 7bcb127..75d6ef6 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1040,7 +1040,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateExtCodeFromBinNesting @@ -1053,7 +1053,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateExtCodeFromNesting @@ -1066,7 +1066,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateFromNesting @@ -1081,7 +1081,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateSheetStatus @@ -1094,7 +1094,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateSheetStatusPU @@ -1106,7 +1106,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateStatus @@ -3657,6 +3657,181 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update + + + + + + DELETE FROM [SheetStats] WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex] = @Original_SheetIndex)) + + + + + + + + + INSERT INTO [SheetStats] ([BatchID], [SheetIndex], [MatID], [WorkArea], [TotalArea], [NumParts], [NumPainted]) VALUES (@BatchID, @SheetIndex, @MatID, @WorkArea, @TotalArea, @NumParts, @NumPainted); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex) + + + + + + + + + + + + + + SELECT * +FROM SheetStats + + + + + + UPDATE [SheetStats] SET [BatchID] = @BatchID, [SheetIndex] = @SheetIndex, [MatID] = @MatID, [WorkArea] = @WorkArea, [TotalArea] = @TotalArea, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex] = @Original_SheetIndex)); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dbo.stp_SheetStat_resetQuery + + + + + + + + + + + dbo.stp_SheetStat_upsertQuery + + + + + + + + + + + + + + + + + + + + + DELETE FROM [BatchStats] WHERE (([BatchID] = @Original_BatchID)) + + + + + + + + INSERT INTO [BatchStats] ([BatchID], [Takt], [AvgYeld], [TotalArea], [NumMat], [NumSheets], [NumModel], [NumKit], [NumParts], [NumPainted]) VALUES (@BatchID, @Takt, @AvgYeld, @TotalArea, @NumMat, @NumSheets, @NumModel, @NumKit, @NumParts, @NumPainted); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID) + + + + + + + + + + + + + + + + + SELECT * FROM BatchStats + + + + + + UPDATE [BatchStats] SET [BatchID] = @BatchID, [Takt] = @Takt, [AvgYeld] = @AvgYeld, [TotalArea] = @TotalArea, [NumMat] = @NumMat, [NumSheets] = @NumSheets, [NumModel] = @NumModel, [NumKit] = @NumKit, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID)); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dbo.stp_BatchStat_refresh + + + + + + + + + @@ -3665,7 +3840,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3723,7 +3898,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3748,7 +3923,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3803,7 +3978,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3876,7 +4051,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3945,7 +4120,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3978,7 +4153,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4050,7 +4225,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4069,7 +4244,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4100,7 +4275,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4108,7 +4283,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4125,7 +4300,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4134,7 +4309,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4165,7 +4340,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4173,7 +4348,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4189,7 +4364,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4197,7 +4372,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4225,7 +4400,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4261,7 +4436,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4277,7 +4452,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4287,7 +4462,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4304,7 +4479,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4317,7 +4492,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4366,7 +4541,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4395,7 +4570,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4437,7 +4612,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4548,7 +4723,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4611,7 +4786,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4656,7 +4831,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4682,7 +4857,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4775,7 +4950,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4838,7 +5013,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4897,7 +5072,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4946,7 +5121,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4985,7 +5160,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5038,7 +5213,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5055,7 +5230,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5068,7 +5243,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5090,7 +5265,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5118,7 +5293,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5155,7 +5330,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5189,7 +5364,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5231,6 +5406,41 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5398,21 +5608,30 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index e32b6b4..dc113d6 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,53 +4,55 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 1189 @@ -62,7 +64,7 @@ - + 1028 @@ -74,7 +76,7 @@ - + 828 @@ -86,7 +88,7 @@ - + 1116 @@ -102,7 +104,7 @@ - + 721 @@ -114,7 +116,7 @@ - + 482 @@ -126,7 +128,7 @@ - + 1113 @@ -138,7 +140,7 @@ - + 1364 @@ -150,7 +152,7 @@ - + 1153 @@ -162,7 +164,7 @@ - + 115 @@ -174,7 +176,7 @@ - + 284 @@ -186,7 +188,7 @@ - + 1042 diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index d3d7396..d3496c2 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -12,6 +12,7 @@ namespace AppData public DS_AppTableAdapters.BatchListTableAdapter taBL; public DS_AppTableAdapters.BinsTableAdapter taBN; public DS_AppTableAdapters.BinListTableAdapter taBNLS; + public DS_AppTableAdapters.BatchStatsTableAdapter taBStats; public DS_AppTableAdapters.CartsTableAdapter taCL; public DS_AppTableAdapters.CartOnKitTableAdapter taCOK; public DS_AppTableAdapters.CountersTableAdapter taCount; @@ -52,12 +53,13 @@ namespace AppData public DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter taRepOtherPart; public DS_ReportTableAdapters.stp_prt_PartTableAdapter taRepPart; public DS_AppTableAdapters.SheetListTableAdapter taSHL; + public DS_AppTableAdapters.SheetStatsTableAdapter taShStats; public DS_AppTableAdapters.SheetsPreviewTableAdapter taSP; public DS_AppTableAdapters.StatusDecodeTableAdapter taStatDec; public DS_AppTableAdapters.StatusLogTableAdapter taStatLog; public DS_AppTableAdapters.StackListTableAdapter taSTL; public DS_AppTableAdapters.UpdManTableAdapter taUpdMan; - public DS_AppTableAdapters.UnloadStatsTableAdapter taUS; + public DS_AppTableAdapters.UnloadStatsTableAdapter taUStat; #endregion Public Fields @@ -160,6 +162,7 @@ namespace AppData taBL = new DS_AppTableAdapters.BatchListTableAdapter(); taBN = new DS_AppTableAdapters.BinsTableAdapter(); taBNLS = new DS_AppTableAdapters.BinListTableAdapter(); + taBStats = new DS_AppTableAdapters.BatchStatsTableAdapter(); taCL = new DS_AppTableAdapters.CartsTableAdapter(); taCOK = new DS_AppTableAdapters.CartOnKitTableAdapter(); taCount = new DS_AppTableAdapters.CountersTableAdapter(); @@ -204,8 +207,9 @@ namespace AppData taRepOtherPart = new DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter(); taRepIRK = new DS_ReportTableAdapters.stp_prt_IRKTableAdapter(); taRepIRKSum = new DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter(); - taUS = new DS_AppTableAdapters.UnloadStatsTableAdapter(); + taShStats = new DS_AppTableAdapters.SheetStatsTableAdapter(); taUpdMan = new DS_AppTableAdapters.UpdManTableAdapter(); + taUStat = new DS_AppTableAdapters.UnloadStatsTableAdapter(); } private void setupConnString() @@ -214,6 +218,7 @@ namespace AppData taBL.Connection.ConnectionString = connString; taBN.Connection.ConnectionString = connString; taBNLS.Connection.ConnectionString = connString; + taBStats.Connection.ConnectionString = connString; taCL.Connection.ConnectionString = connString; taCOK.Connection.ConnectionString = connString; taCount.Connection.ConnectionString = connString; @@ -258,7 +263,8 @@ namespace AppData taRepOtherPart.Connection.ConnectionString = connString; taRepIRK.Connection.ConnectionString = connString; taRepIRKSum.Connection.ConnectionString = connString; - taUS.Connection.ConnectionString = connString; + taShStats.Connection.ConnectionString = connString; + taUStat.Connection.ConnectionString = connString; taUpdMan.Connection.ConnectionString = connString; } @@ -476,7 +482,7 @@ namespace AppData if (!trovato) { // se non trovo leggo - answ = taUS.GetData(BatchID, StatLevel); + answ = taUStat.GetData(BatchID, StatLevel); rawData = JsonConvert.SerializeObject(answ); // salvo in redis memLayer.ML.setRSV(redKey, rawData, cacheDataTTL); From f5fefb8070b96a07a0819939195025e0ed4ecb25 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 11:14:44 +0200 Subject: [PATCH 02/23] Aggiunta button in devUtils x ricalcolo --- .../cmp_batchDetailMongo.ascx.cs | 14 +---- NKC_WF/WebUserControls/cmp_devUtils.ascx | 43 ++++++++------ NKC_WF/WebUserControls/cmp_devUtils.ascx.cs | 45 ++++++++++++++ .../cmp_devUtils.ascx.designer.cs | 58 ++++++++++++------- 4 files changed, 110 insertions(+), 50 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs index 2fe290c..92ca17b 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs @@ -172,7 +172,7 @@ namespace NKC_WF.WebUserControls totPartNum += sheet.PartList.Count; num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0; den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1; - currRatio = ratioProt(num, den); + currRatio = ComLib.ratioProt(num, den); workRatio.Add(currRatio); if (!materialsList.Contains(sheet.MatId)) { @@ -258,18 +258,6 @@ namespace NKC_WF.WebUserControls { } - /// - /// Effettua divisione evitando zeri a den... - /// - /// - /// - /// - protected double ratioProt(double num, double den) - { - den = den == 0 ? 1 : den; - return num / den; - } - #endregion Protected Methods } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx b/NKC_WF/WebUserControls/cmp_devUtils.ascx index 00cdb2e..a6a8387 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx @@ -1,20 +1,29 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_devUtils.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_devUtils" %>
-
-
- <%: traduci ("reset") %>
Stack building +
+
+ Calc
Stats (Re)Build +
+
+ Batch +
+ +
+
+
+ <%: traduci ("reset") %>
Stack building +
+
+ <%: traduci ("reset") %>
Nesting Calls +
+
+ # <%: traduci ("Save") %>
LAST Call +
+
+ <%: traduci ("Debug") %>
QRCode +
+
+ # <%: traduci ("reset") %>
PROD call +
-
- <%: traduci ("reset") %>
Nesting Calls -
-
- # <%: traduci ("Save") %>
LAST Call -
-
- <%: traduci ("Debug") %>
QRCode -
-
- # <%: traduci ("reset") %>
PROD call -
-
-
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index 8b98a11..a05d066 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -2,13 +2,58 @@ using Newtonsoft.Json; using NKC_SDK; using System; +using System.Diagnostics; namespace NKC_WF.WebUserControls { public partial class cmp_devUtils : BaseUserControl { + #region Protected Properties + + protected int BatchID + { + get + { + int answ = -1; + int.TryParse(txtNumBatch.Text, out answ); + return answ; + } + set + { + txtNumBatch.Text = $"{value}"; + } + } + + #endregion Protected Properties + #region Protected Methods + protected void lbtRedoStats_Click(object sender, EventArgs e) + { + Stopwatch stopWatch = new Stopwatch(); + // ricalcolo per singolo batch o per tutti i batch (rich 0) le statistiche + if (BatchID > 0) + { + stopWatch.Restart(); + ComLib.man.updateSheetStatsByBatch(BatchID); + stopWatch.Stop(); + Log.Instance.Info($"Batch Recalculation | BatchID: {BatchID} | elapsed {stopWatch.Elapsed.TotalMilliseconds} ms"); + } + else + { + // ciclo su tutti + DataLayer DLMan = new DataLayer(); + var batchList = DLMan.taBL.GetData(); + foreach (var batch in batchList) + { + stopWatch.Restart(); + ComLib.man.updateSheetStatsByBatch(batch.BatchID); + stopWatch.Stop(); + Log.Instance.Info($"Batch Recalculation | BatchID: {batch.BatchID} | elapsed {stopWatch.Elapsed.TotalMilliseconds} ms"); + } + } + } + protected void lbtResetNest_Click(object sender, EventArgs e) { DLMan.taBL.resetNesting(-9999); diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs index cf3ecdc..a932b9b 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace NKC_WF.WebUserControls @@ -15,47 +15,65 @@ namespace NKC_WF.WebUserControls { /// - /// Controllo lbtResetStackBuild. + /// lbtRedoStats control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtRedoStats; + + /// + /// txtNumBatch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumBatch; + + /// + /// lbtResetStackBuild control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetStackBuild; /// - /// Controllo lbtResetNest. + /// lbtResetNest control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetNest; /// - /// Controllo lbtSaveLastAnsw. + /// lbtSaveLastAnsw control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtSaveLastAnsw; /// - /// Controllo hlDbgQrCode. + /// hlDbgQrCode control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlDbgQrCode; /// - /// Controllo lbtResetProd. + /// lbtResetProd control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetProd; } From 8e6a086e18cfe3a169cf9a0a80f8e67a96fb8b19 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 11:18:09 +0200 Subject: [PATCH 03/23] Display tempo calcolo a fine esecuzione --- NKC_WF/WebUserControls/cmp_devUtils.ascx | 1 + NKC_WF/WebUserControls/cmp_devUtils.ascx.cs | 23 +++++++++++++------ .../cmp_devUtils.ascx.designer.cs | 9 ++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx b/NKC_WF/WebUserControls/cmp_devUtils.ascx index a6a8387..c743bf2 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx @@ -8,6 +8,7 @@ Batch +
diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index a05d066..bde4c5e 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -30,14 +30,18 @@ namespace NKC_WF.WebUserControls protected void lbtRedoStats_Click(object sender, EventArgs e) { - Stopwatch stopWatch = new Stopwatch(); + Stopwatch stopWatchTotal = new Stopwatch(); + Stopwatch stopWatchLap = new Stopwatch(); + stopWatchTotal.Start(); + int numBatch = 0; // ricalcolo per singolo batch o per tutti i batch (rich 0) le statistiche if (BatchID > 0) { - stopWatch.Restart(); + numBatch++; + stopWatchLap.Restart(); ComLib.man.updateSheetStatsByBatch(BatchID); - stopWatch.Stop(); - Log.Instance.Info($"Batch Recalculation | BatchID: {BatchID} | elapsed {stopWatch.Elapsed.TotalMilliseconds} ms"); + stopWatchLap.Stop(); + Log.Instance.Info($"Batch Recalculation | BatchID: {BatchID} | elapsed {stopWatchLap.Elapsed.TotalMilliseconds} ms"); } else { @@ -46,12 +50,17 @@ namespace NKC_WF.WebUserControls var batchList = DLMan.taBL.GetData(); foreach (var batch in batchList) { - stopWatch.Restart(); + numBatch++; + stopWatchLap.Restart(); ComLib.man.updateSheetStatsByBatch(batch.BatchID); - stopWatch.Stop(); - Log.Instance.Info($"Batch Recalculation | BatchID: {batch.BatchID} | elapsed {stopWatch.Elapsed.TotalMilliseconds} ms"); + stopWatchLap.Stop(); + Log.Instance.Info($"Batch Recalculation | BatchID: {batch.BatchID} | elapsed {stopWatchLap.Elapsed.TotalMilliseconds} ms"); } } + stopWatchTotal.Stop(); + string outMsg = $"FULLBatch Recalculation | # Batch: {numBatch} | total elapsed {stopWatchLap.Elapsed.TotalSeconds} sec"; + Log.Instance.Info(outMsg); + lblMsgOut.Text = outMsg; } protected void lbtResetNest_Click(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs index a932b9b..4966493 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs @@ -32,6 +32,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.TextBox txtNumBatch; + /// + /// lblMsgOut control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMsgOut; + /// /// lbtResetStackBuild control. /// From 385936a16752421e33196cd2a265253eb08b07fb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 11:42:13 +0200 Subject: [PATCH 04/23] Refresh grafico pagina dev tools --- NKC_WF/WebUserControls/cmp_devUtils.ascx | 57 ++++++++++++------- NKC_WF/WebUserControls/cmp_devUtils.ascx.cs | 2 +- .../cmp_devUtils.ascx.designer.cs | 18 +++--- 3 files changed, 46 insertions(+), 31 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx b/NKC_WF/WebUserControls/cmp_devUtils.ascx index c743bf2..bc1f327 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx @@ -1,30 +1,45 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_devUtils.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_devUtils" %>
-
- Calc
Stats (Re)Build -
-
- Batch +
+
+
+

Batch Stats

+
+
+
+ Calc
Stats (Re)Build +
+ +
+
+
+
+ Batch +
+ +
- -
-
- <%: traduci ("reset") %>
Stack building -
-
- <%: traduci ("reset") %>
Nesting Calls -
-
- # <%: traduci ("Save") %>
LAST Call -
-
- <%: traduci ("Debug") %>
QRCode -
-
- # <%: traduci ("reset") %>
PROD call +
+
+
+ <%: traduci ("reset") %>
Stack building +
+
+ <%: traduci ("reset") %>
Nesting Calls +
+
+ # <%: traduci ("Save") %>
LAST Call +
+
+ <%: traduci ("Debug") %>
QRCode +
+
+ # <%: traduci ("reset") %>
PROD call +
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index bde4c5e..1bb2990 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -58,7 +58,7 @@ namespace NKC_WF.WebUserControls } } stopWatchTotal.Stop(); - string outMsg = $"FULLBatch Recalculation | # Batch: {numBatch} | total elapsed {stopWatchLap.Elapsed.TotalSeconds} sec"; + string outMsg = $"Done! # Batch: {numBatch} | elapsed {stopWatchLap.Elapsed.TotalSeconds:N3} sec"; Log.Instance.Info(outMsg); lblMsgOut.Text = outMsg; } diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs index 4966493..b3c57d6 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs @@ -23,15 +23,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.LinkButton lbtRedoStats; - /// - /// txtNumBatch control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtNumBatch; - /// /// lblMsgOut control. /// @@ -41,6 +32,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblMsgOut; + /// + /// txtNumBatch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumBatch; + /// /// lbtResetStackBuild control. /// From 9a8272f0216b85ede5daecabd83ebe70e9d6a346 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 11:47:22 +0200 Subject: [PATCH 05/23] Aggiunto calcolo statistiche a fine batch --- NKC_WF/Controllers/BatchProcController.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 502e011..cfc5bc7 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using NKC_SDK; using SteamWare; using System; +using System.Diagnostics; using System.IO; using System.Web.Http; @@ -135,7 +136,7 @@ namespace NKC_WF.Controllers * - è BatchReq / OfflineOrder * - è stima iniziale o NEST dettagliato * - si tratta di una stima di validazione ITEM ... - * + * * 2021.07.21: aggiunto controllo coerenza risposta: accetto solo se sono in stato di richiesta (se ho annullato in precedenza scarto la risposta) * *************************************************/ @@ -453,8 +454,6 @@ namespace NKC_WF.Controllers } else { - - // 2020.01.16 salvo su mongoDb la risposta... ComLib.man.saveNestAnsw(rispNest); @@ -512,6 +511,13 @@ namespace NKC_WF.Controllers } isSplitReq = ComLib.checkSendBatchSplit(rispNest.BatchID); + + // effettuo calcolo statistiche + Stopwatch stopWatchLap = new Stopwatch(); + stopWatchLap.Start(); + ComLib.man.updateSheetStatsByBatch(rispNest.BatchID); + stopWatchLap.Stop(); + Log.Instance.Info($"Batch Stat Calculation after NEST answ | BatchID: {rispNest.BatchID} | elapsed {stopWatchLap.Elapsed.TotalMilliseconds} ms"); } // registro OK From f1bb875ecc30f476685c92c68943560f6ff4a89c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 12:09:39 +0200 Subject: [PATCH 06/23] Versione iniziale gitlab conf --- .gitlab-ci.yml | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..953a6b9 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,97 @@ +variables: + NUGET_PATH: 'C:\Tools\nuget.exe' + MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' + ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' + EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\NKC\Release' + DEPLOY_FOLDER: 'c:\Projects\Deploy\NKC\Builds' + VERS_MAIN: '2.0' + NEW_REL: '' + +# VARIABILI +# Tema numero versione: si potrebbe usare la variabile CI_COMMIT_TAG con $env:CI_COMMIT_TAG, in questo caso SOLO SE c'è un tag sistema versione... +# Tema compilazione x branch: $CI_COMMIT_BRANCH == "my-branch" potrebbe essere condizione if x fare alcuni sscript... +# rif: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html + +# Da approfondire: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET.gitlab-ci.yml +# https://www.google.com/search?q=gitlab+variable+year+month&rlz=1C1GCEA_enIT945IT945&oq=gitlab+variable+year+month&aqs=chrome..69i57j69i64.5262j0j7&sourceid=chrome&ie=UTF-8 +# https://docs.gitlab.com/ee/ci/examples/README.html +# https://docs.gitlab.com/ee/ci/quick_start/index.html +# https://docs.gitlab.com/ee/ci/yaml/ + +# helper x fix pacchetti nuget da repo locale nexus.steamware.net +.nuget-fix: &nuget-fix + - | + $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C + if ($hasSource -eq 0) { + C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } else { + C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } + echo $hasSource + +# helper x fix version number +.version-fix: &version-fix + - | + $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format ddHH) + echo "Set vers: $env:NEW_REL" + $contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw + $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL + $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' + +stages: + - build + - deploy + - installer + + +build: + stage: build + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln' # path alla solution corrente + - *version-fix + script: + - '& "$env:MSBUILD_PATH" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +IIS01:deploy: + stage: deploy + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + needs: ["build"] + +IIS02:deploy: + stage: deploy + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + needs: ["build"] + +# install: +# stage: installer +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' +# when: manual +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore NKC_WF.sln' +# - *version-fix +# script: +# # Admin ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Admin.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj' +# # Commesse ZIP package +# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Commesse.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj' +# needs: ["AC:build"] + + From 2e7b8f11aaa7e8d4a4a9c25a092a29e31d3a43a3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 12:20:42 +0200 Subject: [PATCH 07/23] Add tag x win --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 953a6b9..59ff5f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,8 @@ stages: build: stage: build + tags: + - win before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore NKC_WF.sln' # path alla solution corrente @@ -56,6 +58,8 @@ build: IIS01:deploy: stage: deploy + tags: + - win rules: - if: '$CI_COMMIT_BRANCH == "develop"' before_script: @@ -68,6 +72,8 @@ IIS01:deploy: IIS02:deploy: stage: deploy + tags: + - win rules: - if: '$CI_COMMIT_BRANCH == "master"' before_script: @@ -80,6 +86,8 @@ IIS02:deploy: # install: # stage: installer +# tags: +# - win # rules: # - if: '$CI_COMMIT_BRANCH == "master"' # when: manual From ca6f82f11816552de887117d118885edc1696290 Mon Sep 17 00:00:00 2001 From: Samuele Emilio Locatelli Date: Thu, 2 Sep 2021 10:22:02 +0000 Subject: [PATCH 08/23] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59ff5f8..632e595 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ stages: build: stage: build - tags: + tags: - win before_script: - *nuget-fix @@ -58,7 +58,7 @@ build: IIS01:deploy: stage: deploy - tags: + tags: - win rules: - if: '$CI_COMMIT_BRANCH == "develop"' @@ -72,7 +72,7 @@ IIS01:deploy: IIS02:deploy: stage: deploy - tags: + tags: - win rules: - if: '$CI_COMMIT_BRANCH == "master"' From 221c9d9a3e05d4bc502ab836be8ed965d306a4be Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 14:10:06 +0200 Subject: [PATCH 09/23] Update yaml x build/install --- .gitlab-ci.yml | 53 ++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 632e595..b299419 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,23 +51,23 @@ build: - win before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' # path alla solution corrente + - dotnet restore NKC_WF.sln - *version-fix script: - - '& "$env:MSBUILD_PATH" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + - dotnet build -p:Configuration=Release -p:Platform="Any CPU" -verbosity=minimal NKC_WF/NKC_WF.csproj IIS01:deploy: stage: deploy tags: - win - rules: - - if: '$CI_COMMIT_BRANCH == "develop"' +# rules: +# - if: '$CI_COMMIT_BRANCH == "develop"' before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - dotnet restore NKC_WF.sln - *version-fix - script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + script: + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity=minimal NKC_WF/NKC_WF.csproj -o:publish needs: ["build"] IIS02:deploy: @@ -78,28 +78,35 @@ IIS02:deploy: - if: '$CI_COMMIT_BRANCH == "master"' before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - dotnet restore NKC_WF.sln + # - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity=minimal NKC_WF/NKC_WF.csproj -o:publish + # - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' needs: ["build"] -# install: -# stage: installer -# tags: -# - win +install: + stage: installer + tags: + - win # rules: # - if: '$CI_COMMIT_BRANCH == "master"' # when: manual -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore NKC_WF.sln' -# - *version-fix -# script: -# # Admin ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Admin.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj' -# # Commesse ZIP package -# - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/GPW_Commesse.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj' -# needs: ["AC:build"] + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - *version-fix + script: + # - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish + - dotnet publish -p:PublishProfile=${env.BRANCH_NAME}.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:PackageLocation=Release/$env:NEW_REL/NKC_WF.zip -p:DeployIisAppPath="Default Web Site/NKC" -p:PackageAsSingleFile=True -p:OutputPath=bin/ NKC_WF/NKC_WF.csproj -o:publish + # # altra modalità build + # - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/NKC_WF.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + + + needs: ["build"] From 0d74d84fd65446ab6efca70ce396192a9dac6a60 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 14:13:06 +0200 Subject: [PATCH 10/23] fix yaml syntax --- .gitlab-ci.yml | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b299419..a3ff933 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,8 @@ variables: DEPLOY_FOLDER: 'c:\Projects\Deploy\NKC\Builds' VERS_MAIN: '2.0' NEW_REL: '' + NEXUS_PATH: 'NKC' + APP_NAME: 'NKC' # VARIABILI # Tema numero versione: si potrebbe usare la variabile CI_COMMIT_TAG con $env:CI_COMMIT_TAG, in questo caso SOLO SE c'è un tag sistema versione... @@ -39,6 +41,44 @@ variables: $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' +# helper creazione hash files +.hashBuild: &hashBuild + - | + $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" + $MD5 = Get-FileHash $Target -Algorithm MD5 + $SHA1 = Get-FileHash $Target -Algorithm SHA1 + New-Item $Target".md5" + New-Item $Target".sha1" + $MD5.Hash | Set-Content -Path $Target".md5" + $SHA1.Hash | Set-Content -Path $Target".sha1" + + echo "Created HASH files for $Target" + +# helper x send su NEXUS +.nexusUpload: &nexusUpload + - | + Set-Alias mCurl C:\Windows\system32\curl.exe + $currentDate = get-date -format yyMM; + $currentTime = get-date -format ddHH; + $VersNumb = Get-Content "Resources\VersNum.txt" + echo "Curr Version: $VersNumb" + if($CI_COMMIT_BRANCH -eq "master") + { + $version = "stable" + } + else + { + $version = "unstable" + } + $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") + ForEach ($File in $File2Send) { + $FileName = Split-Path $File -leaf + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName + } + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/ChangeLog.html + stages: - build - deploy @@ -105,8 +145,5 @@ install: # qui il deploy su nexus... - *hashBuild - *nexusUpload - - needs: ["build"] - - + \ No newline at end of file From 763caff2e491eeae6f7034a643dd213e8894fbcd Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 14:16:27 +0200 Subject: [PATCH 11/23] update tag verbosity --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3ff933..0b559a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ build: - dotnet restore NKC_WF.sln - *version-fix script: - - dotnet build -p:Configuration=Release -p:Platform="Any CPU" -verbosity=minimal NKC_WF/NKC_WF.csproj + - dotnet build -p:Configuration=Release -p:Platform="Any CPU" -v m NKC_WF/NKC_WF.csproj IIS01:deploy: stage: deploy @@ -107,7 +107,7 @@ IIS01:deploy: - dotnet restore NKC_WF.sln - *version-fix script: - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity=minimal NKC_WF/NKC_WF.csproj -o:publish + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -v m NKC_WF/NKC_WF.csproj -o:publish needs: ["build"] IIS02:deploy: @@ -122,7 +122,7 @@ IIS02:deploy: # - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -verbosity=minimal NKC_WF/NKC_WF.csproj -o:publish + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -v m NKC_WF/NKC_WF.csproj -o:publish # - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' needs: ["build"] @@ -139,7 +139,7 @@ install: - *version-fix script: # - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish - - dotnet publish -p:PublishProfile=${env.BRANCH_NAME}.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:PackageLocation=Release/$env:NEW_REL/NKC_WF.zip -p:DeployIisAppPath="Default Web Site/NKC" -p:PackageAsSingleFile=True -p:OutputPath=bin/ NKC_WF/NKC_WF.csproj -o:publish + - dotnet publish -p:PublishProfile=${env.BRANCH_NAME}.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:PackageLocation=Release/$env:NEW_REL/NKC_WF.zip -p:DeployIisAppPath="Default Web Site/NKC" -p:PackageAsSingleFile=True -p:OutputPath=bin/ NKC_WF/NKC_WF.csproj -o:publish -v m # # altra modalità build # - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/NKC_WF.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' # qui il deploy su nexus... From 57aa6c9af9bc44e39fc57c6efa9b7f3dbb7e9216 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 14:23:33 +0200 Subject: [PATCH 12/23] =?UTF-8?q?cambio=20modalit=C3=A0=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b559a2..2c67287 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,10 +91,11 @@ build: - win before_script: - *nuget-fix - - dotnet restore NKC_WF.sln + - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix - script: - - dotnet build -p:Configuration=Release -p:Platform="Any CPU" -v m NKC_WF/NKC_WF.csproj + script: + - '& "$env:MSBUILD_PATH" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + IIS01:deploy: stage: deploy @@ -104,10 +105,10 @@ IIS01:deploy: # - if: '$CI_COMMIT_BRANCH == "develop"' before_script: - *nuget-fix - - dotnet restore NKC_WF.sln + - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -v m NKC_WF/NKC_WF.csproj -o:publish + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' needs: ["build"] IIS02:deploy: @@ -118,12 +119,10 @@ IIS02:deploy: - if: '$CI_COMMIT_BRANCH == "master"' before_script: - *nuget-fix - - dotnet restore NKC_WF.sln - # - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix - script: - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:OutputPath=bin/ -v m NKC_WF/NKC_WF.csproj -o:publish - # - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + script: + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' needs: ["build"] install: @@ -138,10 +137,7 @@ install: - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - # - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish - - dotnet publish -p:PublishProfile=${env.BRANCH_NAME}.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:PackageLocation=Release/$env:NEW_REL/NKC_WF.zip -p:DeployIisAppPath="Default Web Site/NKC" -p:PackageAsSingleFile=True -p:OutputPath=bin/ NKC_WF/NKC_WF.csproj -o:publish -v m - # # altra modalità build - # - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/NKC_WF.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/NKC_WF.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' # qui il deploy su nexus... - *hashBuild - *nexusUpload From f5dec22e60577722fbc17e2839e64c379320e125 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 14:35:40 +0200 Subject: [PATCH 13/23] Ancora test yaml CiCd --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c67287..7e2f36f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,9 +42,10 @@ variables: $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' # helper creazione hash files + # $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" .hashBuild: &hashBuild - | - $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" + $Target = "\Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -70,7 +71,7 @@ variables: { $version = "unstable" } - $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") + $File2Send = Get-ChildItem($env:APP_NAME + "\Release\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName @@ -101,14 +102,14 @@ IIS01:deploy: stage: deploy tags: - win -# rules: -# - if: '$CI_COMMIT_BRANCH == "develop"' + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' needs: ["build"] IIS02:deploy: @@ -122,7 +123,7 @@ IIS02:deploy: - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' needs: ["build"] install: @@ -137,7 +138,7 @@ install: - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$env:NEW_REL/NKC_WF.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Releases/NKC.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' # qui il deploy su nexus... - *hashBuild - *nexusUpload From 66f4ddc340f91cb4adc218168684b1d41fa62e04 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 14:55:12 +0200 Subject: [PATCH 14/23] ancora test yaml CiCd --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e2f36f..5543afd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,10 +42,9 @@ variables: $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' # helper creazione hash files - # $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip" .hashBuild: &hashBuild - | - $Target = "\Release\" + $env:APP_NAME + ".zip" + $Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -102,8 +101,8 @@ IIS01:deploy: stage: deploy tags: - win - rules: - - if: '$CI_COMMIT_BRANCH == "develop"' +# rules: +# - if: '$CI_COMMIT_BRANCH == "develop"' before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore NKC_WF.sln' @@ -138,7 +137,7 @@ install: - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Releases/NKC.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=${env:APP_NAME}/Releases/${env:APP_NAME}.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' # qui il deploy su nexus... - *hashBuild - *nexusUpload From 836c3515dace674c20a17606a8476bf95855ac95 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:02:12 +0200 Subject: [PATCH 15/23] ancora modifica yaml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5543afd..3bb628e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ variables: # helper creazione hash files .hashBuild: &hashBuild - | - $Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip" + $Target = "Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -70,7 +70,7 @@ variables: { $version = "unstable" } - $File2Send = Get-ChildItem($env:APP_NAME + "\Release\*") + $File2Send = Get-ChildItem("Release\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName @@ -137,7 +137,7 @@ install: - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=${env:APP_NAME}/Releases/${env:APP_NAME}.zip /p:DeployIisAppPath="Default Web Site/GPW/ADMIN" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Releases/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/NKC" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' # qui il deploy su nexus... - *hashBuild - *nexusUpload From a5ba2a0eaf87d527b04ef678b4e9a4f130673c13 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:02:35 +0200 Subject: [PATCH 16/23] fix develop install x IIS01 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bb628e..a8a6be5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,8 +101,8 @@ IIS01:deploy: stage: deploy tags: - win -# rules: -# - if: '$CI_COMMIT_BRANCH == "develop"' + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore NKC_WF.sln' From 9c536f41e174ede265dd7b7a3638019c4cc9ae8c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:07:35 +0200 Subject: [PATCH 17/23] fix path x recupero filkx e nexus --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8a6be5..93f357a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: VERS_MAIN: '2.0' NEW_REL: '' NEXUS_PATH: 'NKC' + PROJ_NAME: 'NKC_WF' APP_NAME: 'NKC' # VARIABILI @@ -44,7 +45,7 @@ variables: # helper creazione hash files .hashBuild: &hashBuild - | - $Target = "Release\" + $env:APP_NAME + ".zip" + $Target = $env:PROJ_NAME + "\Release\" + $env:APP_NAME + ".zip" $MD5 = Get-FileHash $Target -Algorithm MD5 $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" @@ -70,7 +71,7 @@ variables: { $version = "unstable" } - $File2Send = Get-ChildItem("Release\*") + $File2Send = Get-ChildItem($env:PROJ_NAME + "\Release\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName From fc0dfd9d2e7224f59a34681f2a787e46711d6e71 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:20:05 +0200 Subject: [PATCH 18/23] modifica yaml CiCd --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93f357a..06a27bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,11 +74,11 @@ variables: $File2Send = Get-ChildItem($env:PROJ_NAME + "\Release\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName } - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/manifest.xml - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/ChangeLog.html + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html stages: - build From c7fd3961affc698c28545c1049b356268c6443b7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:22:37 +0200 Subject: [PATCH 19/23] fix typo: releases --> release --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06a27bb..20073e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ install: - '& "$env:NUGET_PATH" restore NKC_WF.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Releases/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/NKC" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/NKC" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' # qui il deploy su nexus... - *hashBuild - *nexusUpload From 17f32f80d706adde149ed99c9793a7725ebb24c6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:29:30 +0200 Subject: [PATCH 20/23] fix nexus upload (hope) --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20073e7..4a97cfc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,12 +56,13 @@ variables: echo "Created HASH files for $Target" # helper x send su NEXUS + # $VersNumb = $Get-Content "Resources\VersNum.txt" .nexusUpload: &nexusUpload - | Set-Alias mCurl C:\Windows\system32\curl.exe $currentDate = get-date -format yyMM; $currentTime = get-date -format ddHH; - $VersNumb = Get-Content "Resources\VersNum.txt" + $VersNumb = $env:NEW_REL echo "Curr Version: $VersNumb" if($CI_COMMIT_BRANCH -eq "master") { From 8379252c12994d0ed94d99688d5e3e1061667472 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:45:13 +0200 Subject: [PATCH 21/23] riduzione verbosita e path manifest/changelog x upload --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a97cfc..95122fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,8 +78,8 @@ variables: mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName } - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html stages: - build @@ -93,7 +93,7 @@ build: - win before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' @@ -107,7 +107,7 @@ IIS01:deploy: - if: '$CI_COMMIT_BRANCH == "develop"' before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' @@ -121,7 +121,7 @@ IIS02:deploy: - if: '$CI_COMMIT_BRANCH == "master"' before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' @@ -136,7 +136,7 @@ install: # when: manual before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore NKC_WF.sln' + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/NKC" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' From d6189635652a0e5eba2150463135180d0e18183d Mon Sep 17 00:00:00 2001 From: Samuele Emilio Locatelli Date: Thu, 2 Sep 2021 13:52:42 +0000 Subject: [PATCH 22/23] Feature/jenkins2 gitlab --- .gitlab-ci.yml | 147 ++ AppData/ComLib.cs | 82 + AppData/DS_App.Designer.cs | 2036 ++++++++++++++++- AppData/DS_App.xsd | 339 ++- AppData/DS_App.xss | 112 +- AppData/DataLayer.cs | 14 +- NKC_WF/Controllers/BatchProcController.cs | 12 +- .../cmp_batchDetailMongo.ascx.cs | 14 +- NKC_WF/WebUserControls/cmp_devUtils.ascx | 59 +- NKC_WF/WebUserControls/cmp_devUtils.ascx.cs | 54 + .../cmp_devUtils.ascx.designer.cs | 67 +- 11 files changed, 2671 insertions(+), 265 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..95122fb --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,147 @@ +variables: + NUGET_PATH: 'C:\Tools\nuget.exe' + MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' + ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' + EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\NKC\Release' + DEPLOY_FOLDER: 'c:\Projects\Deploy\NKC\Builds' + VERS_MAIN: '2.0' + NEW_REL: '' + NEXUS_PATH: 'NKC' + PROJ_NAME: 'NKC_WF' + APP_NAME: 'NKC' + +# VARIABILI +# Tema numero versione: si potrebbe usare la variabile CI_COMMIT_TAG con $env:CI_COMMIT_TAG, in questo caso SOLO SE c'è un tag sistema versione... +# Tema compilazione x branch: $CI_COMMIT_BRANCH == "my-branch" potrebbe essere condizione if x fare alcuni sscript... +# rif: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html + +# Da approfondire: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET.gitlab-ci.yml +# https://www.google.com/search?q=gitlab+variable+year+month&rlz=1C1GCEA_enIT945IT945&oq=gitlab+variable+year+month&aqs=chrome..69i57j69i64.5262j0j7&sourceid=chrome&ie=UTF-8 +# https://docs.gitlab.com/ee/ci/examples/README.html +# https://docs.gitlab.com/ee/ci/quick_start/index.html +# https://docs.gitlab.com/ee/ci/yaml/ + +# helper x fix pacchetti nuget da repo locale nexus.steamware.net +.nuget-fix: &nuget-fix + - | + $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C + if ($hasSource -eq 0) { + C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } else { + C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } + echo $hasSource + +# helper x fix version number +.version-fix: &version-fix + - | + $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format ddHH) + echo "Set vers: $env:NEW_REL" + $contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw + $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL + $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' + +# helper creazione hash files +.hashBuild: &hashBuild + - | + $Target = $env:PROJ_NAME + "\Release\" + $env:APP_NAME + ".zip" + $MD5 = Get-FileHash $Target -Algorithm MD5 + $SHA1 = Get-FileHash $Target -Algorithm SHA1 + New-Item $Target".md5" + New-Item $Target".sha1" + $MD5.Hash | Set-Content -Path $Target".md5" + $SHA1.Hash | Set-Content -Path $Target".sha1" + + echo "Created HASH files for $Target" + +# helper x send su NEXUS + # $VersNumb = $Get-Content "Resources\VersNum.txt" +.nexusUpload: &nexusUpload + - | + Set-Alias mCurl C:\Windows\system32\curl.exe + $currentDate = get-date -format yyMM; + $currentTime = get-date -format ddHH; + $VersNumb = $env:NEW_REL + echo "Curr Version: $VersNumb" + if($CI_COMMIT_BRANCH -eq "master") + { + $version = "stable" + } + else + { + $version = "unstable" + } + $File2Send = Get-ChildItem($env:PROJ_NAME + "\Release\*") + ForEach ($File in $File2Send) { + $FileName = Split-Path $File -leaf + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName + } + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html + +stages: + - build + - deploy + - installer + + +build: + stage: build + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" NKC_WF/NKC_WF.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + + +IIS01:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + needs: ["build"] + +IIS02:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal NKC_WF/NKC_WF.csproj' + needs: ["build"] + +install: + stage: installer + tags: + - win +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' +# when: manual + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/NKC" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj' + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + needs: ["build"] + \ No newline at end of file diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 0dd9690..bf4ad28 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2141,6 +2141,18 @@ namespace AppData return answ; } + /// + /// Effettua divisione evitando zeri a den... + /// + /// + /// + /// + public static double ratioProt(double num, double den) + { + den = den == 0 ? 1 : den; + return num / den; + } + /// /// Leggo il Takt inviato /// @@ -3362,6 +3374,76 @@ namespace AppData return answ; } + /// + /// Effettua il ricalcolo delle statistiche x SheetStat --> BatchStat dato un BatchID recuperando i dati da MongoDB + /// + /// + /// + public bool updateSheetStatsByBatch(int BatchID) + { + bool answ = false; + DataLayer DLMan = new DataLayer(); + List PaintPartList = new List(); + + // cerco da lista salvataggi Estim/Nest... + var nestAnsw = getNestAnsw(BatchID); + if (nestAnsw != null) + { + // inizio eliminando le vecchie statistiche x foglio + DLMan.taShStats.resetBatch(BatchID); + + // recupero i pitturati + try + { + if (nestAnsw.BinList != null) + { + foreach (var bin in nestAnsw.BinList) + { + // se ho parti le aggiungo + if (bin.PartList != null) + { + foreach (var Part in bin.PartList) + { + PaintPartList.Add(Part.PartId); + } + } + } + } + } + catch + { } + + // il tot delle part è in bunk > Sheet > part + try + { + if (nestAnsw.BunkList != null) + { + foreach (var bunk in nestAnsw.BunkList) + { + foreach (var sheet in bunk.SheetList) + { + // dati resa superfici + double num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0; + double den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1; + // parts del foglio + List PartList = sheet.PartList.Select(x => x.PartId).ToList(); + int numPaint = PartList.Intersect(PaintPartList).Count(); + + // qui salvo le statistiche + DLMan.taShStats.upsertQuery(BatchID, sheet.SheetIndex, sheet.MatId, (decimal)num, (decimal)den, sheet.PartList.Count, numPaint); + } + } + } + } + catch + { } + // finisco calcolando le statistiche x Batch... + DLMan.taBStats.refresh(BatchID); + } + + return answ; + } + #endregion Public Methods #region Public Classes diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index e754832..954bf04 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -108,6 +108,10 @@ namespace AppData { private UpdManDataTable tableUpdMan; + private SheetStatsDataTable tableSheetStats; + + private BatchStatsDataTable tableBatchStats; + private global::System.Data.DataRelation relationFK_ItemList_Materials1; private global::System.Data.DataRelation relationFK_OffOrd2Item_OfflineOrderList; @@ -286,6 +290,12 @@ namespace AppData { if ((ds.Tables["UpdMan"] != null)) { base.Tables.Add(new UpdManDataTable(ds.Tables["UpdMan"])); } + if ((ds.Tables["SheetStats"] != null)) { + base.Tables.Add(new SheetStatsDataTable(ds.Tables["SheetStats"])); + } + if ((ds.Tables["BatchStats"] != null)) { + base.Tables.Add(new BatchStatsDataTable(ds.Tables["BatchStats"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -724,6 +734,26 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public SheetStatsDataTable SheetStats { + get { + return this.tableSheetStats; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public BatchStatsDataTable BatchStats { + get { + return this.tableBatchStats; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -917,6 +947,12 @@ namespace AppData { if ((ds.Tables["UpdMan"] != null)) { base.Tables.Add(new UpdManDataTable(ds.Tables["UpdMan"])); } + if ((ds.Tables["SheetStats"] != null)) { + base.Tables.Add(new SheetStatsDataTable(ds.Tables["SheetStats"])); + } + if ((ds.Tables["BatchStats"] != null)) { + base.Tables.Add(new BatchStatsDataTable(ds.Tables["BatchStats"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -1202,6 +1238,18 @@ namespace AppData { this.tableUpdMan.InitVars(); } } + this.tableSheetStats = ((SheetStatsDataTable)(base.Tables["SheetStats"])); + if ((initTable == true)) { + if ((this.tableSheetStats != null)) { + this.tableSheetStats.InitVars(); + } + } + this.tableBatchStats = ((BatchStatsDataTable)(base.Tables["BatchStats"])); + if ((initTable == true)) { + if ((this.tableBatchStats != null)) { + this.tableBatchStats.InitVars(); + } + } this.relationFK_ItemList_Materials1 = this.Relations["FK_ItemList_Materials1"]; this.relationFK_OffOrd2Item_OfflineOrderList = this.Relations["FK_OffOrd2Item_OfflineOrderList"]; this.relationFK_ItemList_KitList = this.Relations["FK_ItemList_KitList"]; @@ -1308,6 +1356,10 @@ namespace AppData { base.Tables.Add(this.tableStatusDecode); this.tableUpdMan = new UpdManDataTable(); base.Tables.Add(this.tableUpdMan); + this.tableSheetStats = new SheetStatsDataTable(); + base.Tables.Add(this.tableSheetStats); + this.tableBatchStats = new BatchStatsDataTable(); + base.Tables.Add(this.tableBatchStats); this.relationFK_ItemList_Materials1 = new global::System.Data.DataRelation("FK_ItemList_Materials1", new global::System.Data.DataColumn[] { this.tableMaterials.MatIDColumn}, new global::System.Data.DataColumn[] { this.tableItemList.MatIDColumn}, false); @@ -1610,6 +1662,18 @@ namespace AppData { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeSheetStats() { + return false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeBatchStats() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1791,6 +1855,12 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void UpdManRowChangeEventHandler(object sender, UpdManRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void SheetStatsRowChangeEventHandler(object sender, SheetStatsRowChangeEvent e); + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void BatchStatsRowChangeEventHandler(object sender, BatchStatsRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -18705,6 +18775,749 @@ namespace AppData { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class SheetStatsDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnBatchID; + + private global::System.Data.DataColumn columnSheetIndex; + + private global::System.Data.DataColumn columnMatID; + + private global::System.Data.DataColumn columnWorkArea; + + private global::System.Data.DataColumn columnTotalArea; + + private global::System.Data.DataColumn columnNumParts; + + private global::System.Data.DataColumn columnNumPainted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsDataTable() { + this.TableName = "SheetStats"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal SheetStatsDataTable(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", "16.0.0.0")] + protected SheetStatsDataTable(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", "16.0.0.0")] + public global::System.Data.DataColumn BatchIDColumn { + get { + return this.columnBatchID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn SheetIndexColumn { + get { + return this.columnSheetIndex; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn MatIDColumn { + get { + return this.columnMatID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn WorkAreaColumn { + get { + return this.columnWorkArea; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotalAreaColumn { + get { + return this.columnTotalArea; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPartsColumn { + get { + return this.columnNumParts; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPaintedColumn { + get { + return this.columnNumPainted; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.0.0.0")] + public SheetStatsRow this[int index] { + get { + return ((SheetStatsRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event SheetStatsRowChangeEventHandler SheetStatsRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddSheetStatsRow(SheetStatsRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRow AddSheetStatsRow(int BatchID, int SheetIndex, int MatID, decimal WorkArea, decimal TotalArea, int NumParts, int NumPainted) { + SheetStatsRow rowSheetStatsRow = ((SheetStatsRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + BatchID, + SheetIndex, + MatID, + WorkArea, + TotalArea, + NumParts, + NumPainted}; + rowSheetStatsRow.ItemArray = columnValuesArray; + this.Rows.Add(rowSheetStatsRow); + return rowSheetStatsRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRow FindByBatchIDSheetIndex(int BatchID, int SheetIndex) { + return ((SheetStatsRow)(this.Rows.Find(new object[] { + BatchID, + SheetIndex}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + SheetStatsDataTable cln = ((SheetStatsDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new SheetStatsDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnBatchID = base.Columns["BatchID"]; + this.columnSheetIndex = base.Columns["SheetIndex"]; + this.columnMatID = base.Columns["MatID"]; + this.columnWorkArea = base.Columns["WorkArea"]; + this.columnTotalArea = base.Columns["TotalArea"]; + this.columnNumParts = base.Columns["NumParts"]; + this.columnNumPainted = base.Columns["NumPainted"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchID); + this.columnSheetIndex = new global::System.Data.DataColumn("SheetIndex", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSheetIndex); + this.columnMatID = new global::System.Data.DataColumn("MatID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnMatID); + this.columnWorkArea = new global::System.Data.DataColumn("WorkArea", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnWorkArea); + this.columnTotalArea = new global::System.Data.DataColumn("TotalArea", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotalArea); + this.columnNumParts = new global::System.Data.DataColumn("NumParts", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumParts); + this.columnNumPainted = new global::System.Data.DataColumn("NumPainted", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumPainted); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnBatchID, + this.columnSheetIndex}, true)); + this.columnBatchID.AllowDBNull = false; + this.columnSheetIndex.AllowDBNull = false; + this.columnMatID.AllowDBNull = false; + this.columnWorkArea.AllowDBNull = false; + this.columnTotalArea.AllowDBNull = false; + this.columnNumParts.AllowDBNull = false; + this.columnNumPainted.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRow NewSheetStatsRow() { + return ((SheetStatsRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new SheetStatsRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(SheetStatsRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.SheetStatsRowChanged != null)) { + this.SheetStatsRowChanged(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.SheetStatsRowChanging != null)) { + this.SheetStatsRowChanging(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.SheetStatsRowDeleted != null)) { + this.SheetStatsRowDeleted(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.SheetStatsRowDeleting != null)) { + this.SheetStatsRowDeleting(this, new SheetStatsRowChangeEvent(((SheetStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveSheetStatsRow(SheetStatsRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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_App ds = new DS_App(); + 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 = "SheetStatsDataTable"; + 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 the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class BatchStatsDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnBatchID; + + private global::System.Data.DataColumn columnTakt; + + private global::System.Data.DataColumn columnAvgYeld; + + private global::System.Data.DataColumn columnTotalArea; + + private global::System.Data.DataColumn columnNumMat; + + private global::System.Data.DataColumn columnNumSheets; + + private global::System.Data.DataColumn columnNumModel; + + private global::System.Data.DataColumn columnNumKit; + + private global::System.Data.DataColumn columnNumParts; + + private global::System.Data.DataColumn columnNumPainted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsDataTable() { + this.TableName = "BatchStats"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal BatchStatsDataTable(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", "16.0.0.0")] + protected BatchStatsDataTable(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", "16.0.0.0")] + public global::System.Data.DataColumn BatchIDColumn { + get { + return this.columnBatchID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TaktColumn { + get { + return this.columnTakt; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn AvgYeldColumn { + get { + return this.columnAvgYeld; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotalAreaColumn { + get { + return this.columnTotalArea; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumMatColumn { + get { + return this.columnNumMat; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumSheetsColumn { + get { + return this.columnNumSheets; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumModelColumn { + get { + return this.columnNumModel; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumKitColumn { + get { + return this.columnNumKit; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPartsColumn { + get { + return this.columnNumParts; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumPaintedColumn { + get { + return this.columnNumPainted; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.0.0.0")] + public BatchStatsRow this[int index] { + get { + return ((BatchStatsRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event BatchStatsRowChangeEventHandler BatchStatsRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddBatchStatsRow(BatchStatsRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRow AddBatchStatsRow(int BatchID, string Takt, decimal AvgYeld, decimal TotalArea, int NumMat, int NumSheets, int NumModel, int NumKit, int NumParts, int NumPainted) { + BatchStatsRow rowBatchStatsRow = ((BatchStatsRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + BatchID, + Takt, + AvgYeld, + TotalArea, + NumMat, + NumSheets, + NumModel, + NumKit, + NumParts, + NumPainted}; + rowBatchStatsRow.ItemArray = columnValuesArray; + this.Rows.Add(rowBatchStatsRow); + return rowBatchStatsRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRow FindByBatchID(int BatchID) { + return ((BatchStatsRow)(this.Rows.Find(new object[] { + BatchID}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + BatchStatsDataTable cln = ((BatchStatsDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new BatchStatsDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnBatchID = base.Columns["BatchID"]; + this.columnTakt = base.Columns["Takt"]; + this.columnAvgYeld = base.Columns["AvgYeld"]; + this.columnTotalArea = base.Columns["TotalArea"]; + this.columnNumMat = base.Columns["NumMat"]; + this.columnNumSheets = base.Columns["NumSheets"]; + this.columnNumModel = base.Columns["NumModel"]; + this.columnNumKit = base.Columns["NumKit"]; + this.columnNumParts = base.Columns["NumParts"]; + this.columnNumPainted = base.Columns["NumPainted"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchID); + this.columnTakt = new global::System.Data.DataColumn("Takt", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTakt); + this.columnAvgYeld = new global::System.Data.DataColumn("AvgYeld", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAvgYeld); + this.columnTotalArea = new global::System.Data.DataColumn("TotalArea", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotalArea); + this.columnNumMat = new global::System.Data.DataColumn("NumMat", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumMat); + this.columnNumSheets = new global::System.Data.DataColumn("NumSheets", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSheets); + this.columnNumModel = new global::System.Data.DataColumn("NumModel", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumModel); + this.columnNumKit = new global::System.Data.DataColumn("NumKit", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumKit); + this.columnNumParts = new global::System.Data.DataColumn("NumParts", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumParts); + this.columnNumPainted = new global::System.Data.DataColumn("NumPainted", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumPainted); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnBatchID}, true)); + this.columnBatchID.AllowDBNull = false; + this.columnBatchID.Unique = true; + this.columnTakt.AllowDBNull = false; + this.columnTakt.MaxLength = 50; + this.columnAvgYeld.AllowDBNull = false; + this.columnTotalArea.AllowDBNull = false; + this.columnNumMat.AllowDBNull = false; + this.columnNumSheets.AllowDBNull = false; + this.columnNumModel.AllowDBNull = false; + this.columnNumKit.AllowDBNull = false; + this.columnNumParts.AllowDBNull = false; + this.columnNumPainted.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRow NewBatchStatsRow() { + return ((BatchStatsRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new BatchStatsRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(BatchStatsRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.BatchStatsRowChanged != null)) { + this.BatchStatsRowChanged(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.BatchStatsRowChanging != null)) { + this.BatchStatsRowChanging(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.BatchStatsRowDeleted != null)) { + this.BatchStatsRowDeleted(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.BatchStatsRowDeleting != null)) { + this.BatchStatsRowDeleting(this, new BatchStatsRowChangeEvent(((BatchStatsRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveBatchStatsRow(BatchStatsRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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_App ds = new DS_App(); + 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 = "BatchStatsDataTable"; + 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. /// @@ -26767,6 +27580,223 @@ namespace AppData { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class SheetStatsRow : global::System.Data.DataRow { + + private SheetStatsDataTable tableSheetStats; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal SheetStatsRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableSheetStats = ((SheetStatsDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int BatchID { + get { + return ((int)(this[this.tableSheetStats.BatchIDColumn])); + } + set { + this[this.tableSheetStats.BatchIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int SheetIndex { + get { + return ((int)(this[this.tableSheetStats.SheetIndexColumn])); + } + set { + this[this.tableSheetStats.SheetIndexColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int MatID { + get { + return ((int)(this[this.tableSheetStats.MatIDColumn])); + } + set { + this[this.tableSheetStats.MatIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal WorkArea { + get { + return ((decimal)(this[this.tableSheetStats.WorkAreaColumn])); + } + set { + this[this.tableSheetStats.WorkAreaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal TotalArea { + get { + return ((decimal)(this[this.tableSheetStats.TotalAreaColumn])); + } + set { + this[this.tableSheetStats.TotalAreaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumParts { + get { + return ((int)(this[this.tableSheetStats.NumPartsColumn])); + } + set { + this[this.tableSheetStats.NumPartsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumPainted { + get { + return ((int)(this[this.tableSheetStats.NumPaintedColumn])); + } + set { + this[this.tableSheetStats.NumPaintedColumn] = value; + } + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class BatchStatsRow : global::System.Data.DataRow { + + private BatchStatsDataTable tableBatchStats; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal BatchStatsRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableBatchStats = ((BatchStatsDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int BatchID { + get { + return ((int)(this[this.tableBatchStats.BatchIDColumn])); + } + set { + this[this.tableBatchStats.BatchIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string Takt { + get { + return ((string)(this[this.tableBatchStats.TaktColumn])); + } + set { + this[this.tableBatchStats.TaktColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal AvgYeld { + get { + return ((decimal)(this[this.tableBatchStats.AvgYeldColumn])); + } + set { + this[this.tableBatchStats.AvgYeldColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public decimal TotalArea { + get { + return ((decimal)(this[this.tableBatchStats.TotalAreaColumn])); + } + set { + this[this.tableBatchStats.TotalAreaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumMat { + get { + return ((int)(this[this.tableBatchStats.NumMatColumn])); + } + set { + this[this.tableBatchStats.NumMatColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumSheets { + get { + return ((int)(this[this.tableBatchStats.NumSheetsColumn])); + } + set { + this[this.tableBatchStats.NumSheetsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumModel { + get { + return ((int)(this[this.tableBatchStats.NumModelColumn])); + } + set { + this[this.tableBatchStats.NumModelColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumKit { + get { + return ((int)(this[this.tableBatchStats.NumKitColumn])); + } + set { + this[this.tableBatchStats.NumKitColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumParts { + get { + return ((int)(this[this.tableBatchStats.NumPartsColumn])); + } + set { + this[this.tableBatchStats.NumPartsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumPainted { + get { + return ((int)(this[this.tableBatchStats.NumPaintedColumn])); + } + set { + this[this.tableBatchStats.NumPaintedColumn] = value; + } + } + } + /// ///Row event argument class /// @@ -28194,6 +29224,74 @@ namespace AppData { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class SheetStatsRowChangeEvent : global::System.EventArgs { + + private SheetStatsRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public SheetStatsRowChangeEvent(SheetStatsRow 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", "16.0.0.0")] + public SheetStatsRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class BatchStatsRowChangeEvent : global::System.EventArgs { + + private BatchStatsRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public BatchStatsRowChangeEvent(BatchStatsRow 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", "16.0.0.0")] + public BatchStatsRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace AppData.DS_AppTableAdapters { @@ -42805,6 +43903,626 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update } } + /// + ///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 SheetStatsTableAdapter : 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", "16.0.0.0")] + public SheetStatsTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.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", "16.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", "16.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", "16.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", "16.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 = "SheetStats"; + tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("SheetIndex", "SheetIndex"); + tableMapping.ColumnMappings.Add("MatID", "MatID"); + tableMapping.ColumnMappings.Add("WorkArea", "WorkArea"); + tableMapping.ColumnMappings.Add("TotalArea", "TotalArea"); + tableMapping.ColumnMappings.Add("NumParts", "NumParts"); + tableMapping.ColumnMappings.Add("NumPainted", "NumPainted"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [SheetStats] WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex]" + + " = @Original_SheetIndex))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [SheetStats] ([BatchID], [SheetIndex], [MatID], [WorkArea], [TotalArea], [NumParts], [NumPainted]) VALUES (@BatchID, @SheetIndex, @MatID, @WorkArea, @TotalArea, @NumParts, @NumPainted); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex)"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WorkArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "WorkArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [SheetStats] SET [BatchID] = @BatchID, [SheetIndex] = @SheetIndex, [MatID] = @MatID, [WorkArea] = @WorkArea, [TotalArea] = @TotalArea, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex] = @Original_SheetIndex)); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WorkArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "WorkArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SheetIndex", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SheetIndex", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::AppData.Properties.Settings.Default.Sauder_NKCConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM SheetStats"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_SheetStat_resetQuery"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_SheetStat_upsertQuery"; + 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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WorkArea", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Fill, true)] + public virtual int Fill(DS_App.SheetStatsDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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, true)] + public virtual DS_App.SheetStatsDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.SheetStatsDataTable dataTable = new DS_App.SheetStatsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App.SheetStatsDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App dataSet) { + return this.Adapter.Update(dataSet, "SheetStats"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int resetBatch(global::System.Nullable BatchID) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int upsertQuery(global::System.Nullable BatchID, global::System.Nullable SheetIndex, global::System.Nullable MatID, global::System.Nullable WorkArea, global::System.Nullable TotalArea, global::System.Nullable NumParts, global::System.Nullable NumPainted) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((SheetIndex.HasValue == true)) { + command.Parameters[2].Value = ((int)(SheetIndex.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((MatID.HasValue == true)) { + command.Parameters[3].Value = ((int)(MatID.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((WorkArea.HasValue == true)) { + command.Parameters[4].Value = ((decimal)(WorkArea.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((TotalArea.HasValue == true)) { + command.Parameters[5].Value = ((decimal)(TotalArea.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + if ((NumParts.HasValue == true)) { + command.Parameters[6].Value = ((int)(NumParts.Value)); + } + else { + command.Parameters[6].Value = global::System.DBNull.Value; + } + if ((NumPainted.HasValue == true)) { + command.Parameters[7].Value = ((int)(NumPainted.Value)); + } + else { + command.Parameters[7].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + + /// + ///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 BatchStatsTableAdapter : 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", "16.0.0.0")] + public BatchStatsTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.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", "16.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", "16.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", "16.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", "16.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 = "BatchStats"; + tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("Takt", "Takt"); + tableMapping.ColumnMappings.Add("AvgYeld", "AvgYeld"); + tableMapping.ColumnMappings.Add("TotalArea", "TotalArea"); + tableMapping.ColumnMappings.Add("NumMat", "NumMat"); + tableMapping.ColumnMappings.Add("NumSheets", "NumSheets"); + tableMapping.ColumnMappings.Add("NumModel", "NumModel"); + tableMapping.ColumnMappings.Add("NumKit", "NumKit"); + tableMapping.ColumnMappings.Add("NumParts", "NumParts"); + tableMapping.ColumnMappings.Add("NumPainted", "NumPainted"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [BatchStats] WHERE (([BatchID] = @Original_BatchID))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [BatchStats] ([BatchID], [Takt], [AvgYeld], [TotalArea], [NumMat], [NumSheets], [NumModel], [NumKit], [NumParts], [NumPainted]) VALUES (@BatchID, @Takt, @AvgYeld, @TotalArea, @NumMat, @NumSheets, @NumModel, @NumKit, @NumParts, @NumPainted); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID)"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Takt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AvgYeld", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 9, "AvgYeld", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumMat", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumMat", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumSheets", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumSheets", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumModel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumKit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumKit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [BatchStats] SET [BatchID] = @BatchID, [Takt] = @Takt, [AvgYeld] = @AvgYeld, [TotalArea] = @TotalArea, [NumMat] = @NumMat, [NumSheets] = @NumSheets, [NumModel] = @NumModel, [NumKit] = @NumKit, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID)); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Takt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AvgYeld", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 9, "AvgYeld", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalArea", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "TotalArea", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumMat", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumMat", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumSheets", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumSheets", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumModel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumModel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumKit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumKit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumParts", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumParts", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumPainted", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NumPainted", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BatchID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::AppData.Properties.Settings.Default.Sauder_NKCConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT * FROM BatchStats"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_BatchStat_refresh"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Fill, true)] + public virtual int Fill(DS_App.BatchStatsDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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, true)] + public virtual DS_App.BatchStatsDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.BatchStatsDataTable dataTable = new DS_App.BatchStatsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App.BatchStatsDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_App dataSet) { + return this.Adapter.Update(dataSet, "BatchStats"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int refresh(global::System.Nullable BatchID) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -42849,6 +44567,10 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update private UpdManTableAdapter _updManTableAdapter; + private SheetStatsTableAdapter _sheetStatsTableAdapter; + + private BatchStatsTableAdapter _batchStatsTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -43088,6 +44810,34 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public SheetStatsTableAdapter SheetStatsTableAdapter { + get { + return this._sheetStatsTableAdapter; + } + set { + this._sheetStatsTableAdapter = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public BatchStatsTableAdapter BatchStatsTableAdapter { + get { + return this._batchStatsTableAdapter; + } + set { + this._batchStatsTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -43171,6 +44921,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update && (this._updManTableAdapter.Connection != null))) { return this._updManTableAdapter.Connection; } + if (((this._sheetStatsTableAdapter != null) + && (this._sheetStatsTableAdapter.Connection != null))) { + return this._sheetStatsTableAdapter.Connection; + } + if (((this._batchStatsTableAdapter != null) + && (this._batchStatsTableAdapter.Connection != null))) { + return this._batchStatsTableAdapter.Connection; + } return null; } set { @@ -43232,6 +44990,12 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update if ((this._updManTableAdapter != null)) { count = (count + 1); } + if ((this._sheetStatsTableAdapter != null)) { + count = (count + 1); + } + if ((this._batchStatsTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -43261,15 +45025,6 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } - if ((this._placesTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._placesTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43279,6 +45034,15 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } + if ((this._placesTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._placesTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43297,6 +45061,33 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._updManTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43333,6 +45124,15 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._countersTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._errorsLogTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -43351,39 +45151,21 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(updatedRows); } } - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._sheetStatsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.SheetStats.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(updatedRows)); + result = (result + this._sheetStatsTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._batchStatsTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.BatchStats.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._countersTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._updManTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._updManTableAdapter.Update(updatedRows)); + result = (result + this._batchStatsTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -43413,14 +45195,6 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } - if ((this._placesTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._placesTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._itemListTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43429,6 +45203,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } + if ((this._placesTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._placesTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._finalKitTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43445,6 +45227,30 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._updManTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43477,6 +45283,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._countersTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._errorsLogTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ErrorsLog.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -43493,35 +45307,19 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allAddedRows.AddRange(addedRows); } } - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._sheetStatsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.SheetStats.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(addedRows)); + result = (result + this._sheetStatsTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._batchStatsTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.BatchStats.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._countersTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._updManTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._updManTableAdapter.Update(addedRows)); + result = (result + this._batchStatsTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -43535,35 +45333,19 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateDeletedRows(DS_App dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._updManTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._batchStatsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.BatchStats.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._updManTableAdapter.Update(deletedRows)); + result = (result + this._batchStatsTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } - if ((this._countersTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._sheetStatsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.SheetStats.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._countersTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._remnantsTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._remnantsTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._statusDecodeTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._statusDecodeTableAdapter.Update(deletedRows)); + result = (result + this._sheetStatsTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -43583,6 +45365,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } + if ((this._countersTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._countersTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._order2FinalKitTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43615,6 +45405,30 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } + if ((this._remnantsTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Remnants.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._remnantsTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._updManTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.UpdMan.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._updManTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._statusDecodeTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.StatusDecode.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._statusDecodeTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._fileValidationTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.FileValidation.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43631,14 +45445,6 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } - if ((this._itemListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._itemListTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._placesTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Places.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43647,6 +45453,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update allChangedRows.AddRange(deletedRows); } } + if ((this._itemListTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ItemList.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._itemListTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._kitListTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.KitList.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -43782,6 +45596,16 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } + if (((this._sheetStatsTableAdapter != null) + && (this.MatchTableAdapterConnection(this._sheetStatsTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); + } + if (((this._batchStatsTableAdapter != null) + && (this.MatchTableAdapterConnection(this._batchStatsTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + @@ -43958,6 +45782,24 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update adaptersWithAcceptChangesDuringUpdate.Add(this._updManTableAdapter.Adapter); } } + if ((this._sheetStatsTableAdapter != null)) { + revertConnections.Add(this._sheetStatsTableAdapter, this._sheetStatsTableAdapter.Connection); + this._sheetStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._sheetStatsTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._sheetStatsTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._sheetStatsTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._sheetStatsTableAdapter.Adapter); + } + } + if ((this._batchStatsTableAdapter != null)) { + revertConnections.Add(this._batchStatsTableAdapter, this._batchStatsTableAdapter.Connection); + this._batchStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._batchStatsTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._batchStatsTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._batchStatsTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._batchStatsTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -44080,6 +45922,14 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update this._updManTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._updManTableAdapter])); this._updManTableAdapter.Transaction = null; } + if ((this._sheetStatsTableAdapter != null)) { + this._sheetStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._sheetStatsTableAdapter])); + this._sheetStatsTableAdapter.Transaction = null; + } + if ((this._batchStatsTableAdapter != null)) { + this._batchStatsTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._batchStatsTableAdapter])); + this._batchStatsTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 7bcb127..75d6ef6 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1040,7 +1040,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateExtCodeFromBinNesting @@ -1053,7 +1053,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateExtCodeFromNesting @@ -1066,7 +1066,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateFromNesting @@ -1081,7 +1081,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateSheetStatus @@ -1094,7 +1094,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateSheetStatusPU @@ -1106,7 +1106,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateStatus @@ -3657,6 +3657,181 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update + + + + + + DELETE FROM [SheetStats] WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex] = @Original_SheetIndex)) + + + + + + + + + INSERT INTO [SheetStats] ([BatchID], [SheetIndex], [MatID], [WorkArea], [TotalArea], [NumParts], [NumPainted]) VALUES (@BatchID, @SheetIndex, @MatID, @WorkArea, @TotalArea, @NumParts, @NumPainted); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex) + + + + + + + + + + + + + + SELECT * +FROM SheetStats + + + + + + UPDATE [SheetStats] SET [BatchID] = @BatchID, [SheetIndex] = @SheetIndex, [MatID] = @MatID, [WorkArea] = @WorkArea, [TotalArea] = @TotalArea, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID) AND ([SheetIndex] = @Original_SheetIndex)); +SELECT BatchID, SheetIndex, MatID, WorkArea, TotalArea, NumParts, NumPainted FROM SheetStats WHERE (BatchID = @BatchID) AND (SheetIndex = @SheetIndex) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dbo.stp_SheetStat_resetQuery + + + + + + + + + + + dbo.stp_SheetStat_upsertQuery + + + + + + + + + + + + + + + + + + + + + DELETE FROM [BatchStats] WHERE (([BatchID] = @Original_BatchID)) + + + + + + + + INSERT INTO [BatchStats] ([BatchID], [Takt], [AvgYeld], [TotalArea], [NumMat], [NumSheets], [NumModel], [NumKit], [NumParts], [NumPainted]) VALUES (@BatchID, @Takt, @AvgYeld, @TotalArea, @NumMat, @NumSheets, @NumModel, @NumKit, @NumParts, @NumPainted); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID) + + + + + + + + + + + + + + + + + SELECT * FROM BatchStats + + + + + + UPDATE [BatchStats] SET [BatchID] = @BatchID, [Takt] = @Takt, [AvgYeld] = @AvgYeld, [TotalArea] = @TotalArea, [NumMat] = @NumMat, [NumSheets] = @NumSheets, [NumModel] = @NumModel, [NumKit] = @NumKit, [NumParts] = @NumParts, [NumPainted] = @NumPainted WHERE (([BatchID] = @Original_BatchID)); +SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, NumParts, NumPainted FROM BatchStats WHERE (BatchID = @BatchID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dbo.stp_BatchStat_refresh + + + + + + + + + @@ -3665,7 +3840,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3723,7 +3898,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3748,7 +3923,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3803,7 +3978,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3876,7 +4051,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3945,7 +4120,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -3978,7 +4153,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4050,7 +4225,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4069,7 +4244,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4100,7 +4275,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4108,7 +4283,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4125,7 +4300,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4134,7 +4309,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4165,7 +4340,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4173,7 +4348,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4189,7 +4364,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4197,7 +4372,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4225,7 +4400,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4261,7 +4436,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4277,7 +4452,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4287,7 +4462,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4304,7 +4479,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4317,7 +4492,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4366,7 +4541,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4395,7 +4570,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4437,7 +4612,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4548,7 +4723,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4611,7 +4786,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4656,7 +4831,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4682,7 +4857,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4775,7 +4950,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4838,7 +5013,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4897,7 +5072,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4946,7 +5121,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -4985,7 +5160,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5038,7 +5213,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5055,7 +5230,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5068,7 +5243,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5090,7 +5265,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5118,7 +5293,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5155,7 +5330,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5189,7 +5364,7 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update - + @@ -5231,6 +5406,41 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5398,21 +5608,30 @@ SELECT AppName, ManifestUrl, IsAuth, LocalRepo, PackName, LicenseKey FROM Update + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index e32b6b4..dc113d6 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,53 +4,55 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 1189 @@ -62,7 +64,7 @@ - + 1028 @@ -74,7 +76,7 @@ - + 828 @@ -86,7 +88,7 @@ - + 1116 @@ -102,7 +104,7 @@ - + 721 @@ -114,7 +116,7 @@ - + 482 @@ -126,7 +128,7 @@ - + 1113 @@ -138,7 +140,7 @@ - + 1364 @@ -150,7 +152,7 @@ - + 1153 @@ -162,7 +164,7 @@ - + 115 @@ -174,7 +176,7 @@ - + 284 @@ -186,7 +188,7 @@ - + 1042 diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index d3d7396..d3496c2 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -12,6 +12,7 @@ namespace AppData public DS_AppTableAdapters.BatchListTableAdapter taBL; public DS_AppTableAdapters.BinsTableAdapter taBN; public DS_AppTableAdapters.BinListTableAdapter taBNLS; + public DS_AppTableAdapters.BatchStatsTableAdapter taBStats; public DS_AppTableAdapters.CartsTableAdapter taCL; public DS_AppTableAdapters.CartOnKitTableAdapter taCOK; public DS_AppTableAdapters.CountersTableAdapter taCount; @@ -52,12 +53,13 @@ namespace AppData public DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter taRepOtherPart; public DS_ReportTableAdapters.stp_prt_PartTableAdapter taRepPart; public DS_AppTableAdapters.SheetListTableAdapter taSHL; + public DS_AppTableAdapters.SheetStatsTableAdapter taShStats; public DS_AppTableAdapters.SheetsPreviewTableAdapter taSP; public DS_AppTableAdapters.StatusDecodeTableAdapter taStatDec; public DS_AppTableAdapters.StatusLogTableAdapter taStatLog; public DS_AppTableAdapters.StackListTableAdapter taSTL; public DS_AppTableAdapters.UpdManTableAdapter taUpdMan; - public DS_AppTableAdapters.UnloadStatsTableAdapter taUS; + public DS_AppTableAdapters.UnloadStatsTableAdapter taUStat; #endregion Public Fields @@ -160,6 +162,7 @@ namespace AppData taBL = new DS_AppTableAdapters.BatchListTableAdapter(); taBN = new DS_AppTableAdapters.BinsTableAdapter(); taBNLS = new DS_AppTableAdapters.BinListTableAdapter(); + taBStats = new DS_AppTableAdapters.BatchStatsTableAdapter(); taCL = new DS_AppTableAdapters.CartsTableAdapter(); taCOK = new DS_AppTableAdapters.CartOnKitTableAdapter(); taCount = new DS_AppTableAdapters.CountersTableAdapter(); @@ -204,8 +207,9 @@ namespace AppData taRepOtherPart = new DS_ReportTableAdapters.stp_prt_OtherPartTableAdapter(); taRepIRK = new DS_ReportTableAdapters.stp_prt_IRKTableAdapter(); taRepIRKSum = new DS_ReportTableAdapters.stp_prt_IRK_SumTableAdapter(); - taUS = new DS_AppTableAdapters.UnloadStatsTableAdapter(); + taShStats = new DS_AppTableAdapters.SheetStatsTableAdapter(); taUpdMan = new DS_AppTableAdapters.UpdManTableAdapter(); + taUStat = new DS_AppTableAdapters.UnloadStatsTableAdapter(); } private void setupConnString() @@ -214,6 +218,7 @@ namespace AppData taBL.Connection.ConnectionString = connString; taBN.Connection.ConnectionString = connString; taBNLS.Connection.ConnectionString = connString; + taBStats.Connection.ConnectionString = connString; taCL.Connection.ConnectionString = connString; taCOK.Connection.ConnectionString = connString; taCount.Connection.ConnectionString = connString; @@ -258,7 +263,8 @@ namespace AppData taRepOtherPart.Connection.ConnectionString = connString; taRepIRK.Connection.ConnectionString = connString; taRepIRKSum.Connection.ConnectionString = connString; - taUS.Connection.ConnectionString = connString; + taShStats.Connection.ConnectionString = connString; + taUStat.Connection.ConnectionString = connString; taUpdMan.Connection.ConnectionString = connString; } @@ -476,7 +482,7 @@ namespace AppData if (!trovato) { // se non trovo leggo - answ = taUS.GetData(BatchID, StatLevel); + answ = taUStat.GetData(BatchID, StatLevel); rawData = JsonConvert.SerializeObject(answ); // salvo in redis memLayer.ML.setRSV(redKey, rawData, cacheDataTTL); diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 502e011..cfc5bc7 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using NKC_SDK; using SteamWare; using System; +using System.Diagnostics; using System.IO; using System.Web.Http; @@ -135,7 +136,7 @@ namespace NKC_WF.Controllers * - è BatchReq / OfflineOrder * - è stima iniziale o NEST dettagliato * - si tratta di una stima di validazione ITEM ... - * + * * 2021.07.21: aggiunto controllo coerenza risposta: accetto solo se sono in stato di richiesta (se ho annullato in precedenza scarto la risposta) * *************************************************/ @@ -453,8 +454,6 @@ namespace NKC_WF.Controllers } else { - - // 2020.01.16 salvo su mongoDb la risposta... ComLib.man.saveNestAnsw(rispNest); @@ -512,6 +511,13 @@ namespace NKC_WF.Controllers } isSplitReq = ComLib.checkSendBatchSplit(rispNest.BatchID); + + // effettuo calcolo statistiche + Stopwatch stopWatchLap = new Stopwatch(); + stopWatchLap.Start(); + ComLib.man.updateSheetStatsByBatch(rispNest.BatchID); + stopWatchLap.Stop(); + Log.Instance.Info($"Batch Stat Calculation after NEST answ | BatchID: {rispNest.BatchID} | elapsed {stopWatchLap.Elapsed.TotalMilliseconds} ms"); } // registro OK diff --git a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs index 2fe290c..92ca17b 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs @@ -172,7 +172,7 @@ namespace NKC_WF.WebUserControls totPartNum += sheet.PartList.Count; num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0; den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1; - currRatio = ratioProt(num, den); + currRatio = ComLib.ratioProt(num, den); workRatio.Add(currRatio); if (!materialsList.Contains(sheet.MatId)) { @@ -258,18 +258,6 @@ namespace NKC_WF.WebUserControls { } - /// - /// Effettua divisione evitando zeri a den... - /// - /// - /// - /// - protected double ratioProt(double num, double den) - { - den = den == 0 ? 1 : den; - return num / den; - } - #endregion Protected Methods } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx b/NKC_WF/WebUserControls/cmp_devUtils.ascx index 00cdb2e..bc1f327 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx @@ -1,20 +1,45 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_devUtils.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_devUtils" %>
-
-
- <%: traduci ("reset") %>
Stack building +
+
+
+
+

Batch Stats

+
+
+
+ Calc
Stats (Re)Build +
+ +
+
+
+
+ Batch +
+ +
+
+
+
+
+
+
+ <%: traduci ("reset") %>
Stack building +
+
+ <%: traduci ("reset") %>
Nesting Calls +
+
+ # <%: traduci ("Save") %>
LAST Call +
+
+ <%: traduci ("Debug") %>
QRCode +
+
+ # <%: traduci ("reset") %>
PROD call +
+
+
-
- <%: traduci ("reset") %>
Nesting Calls -
-
- # <%: traduci ("Save") %>
LAST Call -
-
- <%: traduci ("Debug") %>
QRCode -
-
- # <%: traduci ("reset") %>
PROD call -
-
-
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index 8b98a11..1bb2990 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -2,13 +2,67 @@ using Newtonsoft.Json; using NKC_SDK; using System; +using System.Diagnostics; namespace NKC_WF.WebUserControls { public partial class cmp_devUtils : BaseUserControl { + #region Protected Properties + + protected int BatchID + { + get + { + int answ = -1; + int.TryParse(txtNumBatch.Text, out answ); + return answ; + } + set + { + txtNumBatch.Text = $"{value}"; + } + } + + #endregion Protected Properties + #region Protected Methods + protected void lbtRedoStats_Click(object sender, EventArgs e) + { + Stopwatch stopWatchTotal = new Stopwatch(); + Stopwatch stopWatchLap = new Stopwatch(); + stopWatchTotal.Start(); + int numBatch = 0; + // ricalcolo per singolo batch o per tutti i batch (rich 0) le statistiche + if (BatchID > 0) + { + numBatch++; + stopWatchLap.Restart(); + ComLib.man.updateSheetStatsByBatch(BatchID); + stopWatchLap.Stop(); + Log.Instance.Info($"Batch Recalculation | BatchID: {BatchID} | elapsed {stopWatchLap.Elapsed.TotalMilliseconds} ms"); + } + else + { + // ciclo su tutti + DataLayer DLMan = new DataLayer(); + var batchList = DLMan.taBL.GetData(); + foreach (var batch in batchList) + { + numBatch++; + stopWatchLap.Restart(); + ComLib.man.updateSheetStatsByBatch(batch.BatchID); + stopWatchLap.Stop(); + Log.Instance.Info($"Batch Recalculation | BatchID: {batch.BatchID} | elapsed {stopWatchLap.Elapsed.TotalMilliseconds} ms"); + } + } + stopWatchTotal.Stop(); + string outMsg = $"Done! # Batch: {numBatch} | elapsed {stopWatchLap.Elapsed.TotalSeconds:N3} sec"; + Log.Instance.Info(outMsg); + lblMsgOut.Text = outMsg; + } + protected void lbtResetNest_Click(object sender, EventArgs e) { DLMan.taBL.resetNesting(-9999); diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs index cf3ecdc..b3c57d6 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace NKC_WF.WebUserControls @@ -15,47 +15,74 @@ namespace NKC_WF.WebUserControls { /// - /// Controllo lbtResetStackBuild. + /// lbtRedoStats control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtRedoStats; + + /// + /// lblMsgOut control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMsgOut; + + /// + /// txtNumBatch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumBatch; + + /// + /// lbtResetStackBuild control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetStackBuild; /// - /// Controllo lbtResetNest. + /// lbtResetNest control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetNest; /// - /// Controllo lbtSaveLastAnsw. + /// lbtSaveLastAnsw control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtSaveLastAnsw; /// - /// Controllo hlDbgQrCode. + /// hlDbgQrCode control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlDbgQrCode; /// - /// Controllo lbtResetProd. + /// lbtResetProd control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResetProd; } From 07ff67b1c856d2e723ecffd271212160bbf23436 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 2 Sep 2021 15:55:01 +0200 Subject: [PATCH 23/23] Fix timing esecuzioen batch stat import --- NKC_WF/WebUserControls/cmp_devUtils.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs index 1bb2990..db2c59f 100644 --- a/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_devUtils.ascx.cs @@ -58,7 +58,7 @@ namespace NKC_WF.WebUserControls } } stopWatchTotal.Stop(); - string outMsg = $"Done! # Batch: {numBatch} | elapsed {stopWatchLap.Elapsed.TotalSeconds:N3} sec"; + string outMsg = $"Done! # Batch: {numBatch} | elapsed {stopWatchTotal.Elapsed.TotalSeconds:N3} sec"; Log.Instance.Info(outMsg); lblMsgOut.Text = outMsg; }