diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 8be596f..a2a0070 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -112,7 +112,7 @@ namespace AppData { private BatchStatsDataTable tableBatchStats; - private DailyProdStatsDataTable tableDailyProdStats; + private ProductionStatsDayDataTable tableProductionStatsDay; private global::System.Data.DataRelation relationFK_ItemList_Materials1; @@ -298,8 +298,8 @@ namespace AppData { if ((ds.Tables["BatchStats"] != null)) { base.Tables.Add(new BatchStatsDataTable(ds.Tables["BatchStats"])); } - if ((ds.Tables["DailyProdStats"] != null)) { - base.Tables.Add(new DailyProdStatsDataTable(ds.Tables["DailyProdStats"])); + if ((ds.Tables["ProductionStatsDay"] != null)) { + base.Tables.Add(new ProductionStatsDayDataTable(ds.Tables["ProductionStatsDay"])); } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; @@ -763,9 +763,9 @@ namespace AppData { [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 DailyProdStatsDataTable DailyProdStats { + public ProductionStatsDayDataTable ProductionStatsDay { get { - return this.tableDailyProdStats; + return this.tableProductionStatsDay; } } @@ -968,8 +968,8 @@ namespace AppData { if ((ds.Tables["BatchStats"] != null)) { base.Tables.Add(new BatchStatsDataTable(ds.Tables["BatchStats"])); } - if ((ds.Tables["DailyProdStats"] != null)) { - base.Tables.Add(new DailyProdStatsDataTable(ds.Tables["DailyProdStats"])); + if ((ds.Tables["ProductionStatsDay"] != null)) { + base.Tables.Add(new ProductionStatsDayDataTable(ds.Tables["ProductionStatsDay"])); } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; @@ -1268,10 +1268,10 @@ namespace AppData { this.tableBatchStats.InitVars(); } } - this.tableDailyProdStats = ((DailyProdStatsDataTable)(base.Tables["DailyProdStats"])); + this.tableProductionStatsDay = ((ProductionStatsDayDataTable)(base.Tables["ProductionStatsDay"])); if ((initTable == true)) { - if ((this.tableDailyProdStats != null)) { - this.tableDailyProdStats.InitVars(); + if ((this.tableProductionStatsDay != null)) { + this.tableProductionStatsDay.InitVars(); } } this.relationFK_ItemList_Materials1 = this.Relations["FK_ItemList_Materials1"]; @@ -1384,8 +1384,8 @@ namespace AppData { base.Tables.Add(this.tableSheetStats); this.tableBatchStats = new BatchStatsDataTable(); base.Tables.Add(this.tableBatchStats); - this.tableDailyProdStats = new DailyProdStatsDataTable(); - base.Tables.Add(this.tableDailyProdStats); + this.tableProductionStatsDay = new ProductionStatsDayDataTable(); + base.Tables.Add(this.tableProductionStatsDay); 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); @@ -1702,7 +1702,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - private bool ShouldSerializeDailyProdStats() { + private bool ShouldSerializeProductionStatsDay() { return false; } @@ -1894,7 +1894,7 @@ namespace AppData { public delegate void BatchStatsRowChangeEventHandler(object sender, BatchStatsRowChangeEvent e); [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public delegate void DailyProdStatsRowChangeEventHandler(object sender, DailyProdStatsRowChangeEvent e); + public delegate void ProductionStatsDayRowChangeEventHandler(object sender, ProductionStatsDayRowChangeEvent e); /// ///Represents the strongly named DataTable class. @@ -19558,14 +19558,14 @@ namespace AppData { /// [global::System.Serializable()] [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class DailyProdStatsDataTable : global::System.Data.TypedTableBase { + public partial class ProductionStatsDayDataTable : global::System.Data.TypedTableBase { private global::System.Data.DataColumn columnPlaceCod; - private global::System.Data.DataColumn columnDataOraRif; - private global::System.Data.DataColumn columnDataRif; + private global::System.Data.DataColumn columnDataOraRif; + private global::System.Data.DataColumn columnItmProd; private global::System.Data.DataColumn columnItmScrap; @@ -19576,8 +19576,8 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DailyProdStatsDataTable() { - this.TableName = "DailyProdStats"; + public ProductionStatsDayDataTable() { + this.TableName = "ProductionStatsDay"; this.BeginInit(); this.InitClass(); this.EndInit(); @@ -19585,7 +19585,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal DailyProdStatsDataTable(global::System.Data.DataTable table) { + internal ProductionStatsDayDataTable(global::System.Data.DataTable table) { this.TableName = table.TableName; if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { this.CaseSensitive = table.CaseSensitive; @@ -19602,7 +19602,7 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - protected DailyProdStatsDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + protected ProductionStatsDayDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context) { this.InitVars(); } @@ -19617,17 +19617,17 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn DataOraRifColumn { + public global::System.Data.DataColumn DataRifColumn { get { - return this.columnDataOraRif; + return this.columnDataRif; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn DataRifColumn { + public global::System.Data.DataColumn DataOraRifColumn { get { - return this.columnDataRif; + return this.columnDataOraRif; } } @@ -19674,51 +19674,59 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DailyProdStatsRow this[int index] { + public ProductionStatsDayRow this[int index] { get { - return ((DailyProdStatsRow)(this.Rows[index])); + return ((ProductionStatsDayRow)(this.Rows[index])); } } [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event DailyProdStatsRowChangeEventHandler DailyProdStatsRowChanging; + public event ProductionStatsDayRowChangeEventHandler ProductionStatsDayRowChanging; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event DailyProdStatsRowChangeEventHandler DailyProdStatsRowChanged; + public event ProductionStatsDayRowChangeEventHandler ProductionStatsDayRowChanged; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event DailyProdStatsRowChangeEventHandler DailyProdStatsRowDeleting; + public event ProductionStatsDayRowChangeEventHandler ProductionStatsDayRowDeleting; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public event DailyProdStatsRowChangeEventHandler DailyProdStatsRowDeleted; + public event ProductionStatsDayRowChangeEventHandler ProductionStatsDayRowDeleted; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void AddDailyProdStatsRow(DailyProdStatsRow row) { + public void AddProductionStatsDayRow(ProductionStatsDayRow row) { this.Rows.Add(row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DailyProdStatsRow AddDailyProdStatsRow(string PlaceCod, System.DateTime DataOraRif, System.DateTime DataRif, int ItmProd, int ItmScrap, long MinRun, int MinDisp) { - DailyProdStatsRow rowDailyProdStatsRow = ((DailyProdStatsRow)(this.NewRow())); + public ProductionStatsDayRow AddProductionStatsDayRow(string PlaceCod, System.DateTime DataRif, System.DateTime DataOraRif, int ItmProd, int ItmScrap, int MinRun, int MinDisp) { + ProductionStatsDayRow rowProductionStatsDayRow = ((ProductionStatsDayRow)(this.NewRow())); object[] columnValuesArray = new object[] { PlaceCod, - DataOraRif, DataRif, + DataOraRif, ItmProd, ItmScrap, MinRun, MinDisp}; - rowDailyProdStatsRow.ItemArray = columnValuesArray; - this.Rows.Add(rowDailyProdStatsRow); - return rowDailyProdStatsRow; + rowProductionStatsDayRow.ItemArray = columnValuesArray; + this.Rows.Add(rowProductionStatsDayRow); + return rowProductionStatsDayRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public ProductionStatsDayRow FindByPlaceCodDataRif(string PlaceCod, System.DateTime DataRif) { + return ((ProductionStatsDayRow)(this.Rows.Find(new object[] { + PlaceCod, + DataRif}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public override global::System.Data.DataTable Clone() { - DailyProdStatsDataTable cln = ((DailyProdStatsDataTable)(base.Clone())); + ProductionStatsDayDataTable cln = ((ProductionStatsDayDataTable)(base.Clone())); cln.InitVars(); return cln; } @@ -19726,15 +19734,15 @@ namespace AppData { [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 DailyProdStatsDataTable(); + return new ProductionStatsDayDataTable(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] internal void InitVars() { this.columnPlaceCod = base.Columns["PlaceCod"]; - this.columnDataOraRif = base.Columns["DataOraRif"]; this.columnDataRif = base.Columns["DataRif"]; + this.columnDataOraRif = base.Columns["DataOraRif"]; this.columnItmProd = base.Columns["ItmProd"]; this.columnItmScrap = base.Columns["ItmScrap"]; this.columnMinRun = base.Columns["MinRun"]; @@ -19746,55 +19754,55 @@ namespace AppData { private void InitClass() { this.columnPlaceCod = new global::System.Data.DataColumn("PlaceCod", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPlaceCod); - this.columnDataOraRif = new global::System.Data.DataColumn("DataOraRif", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnDataOraRif); this.columnDataRif = new global::System.Data.DataColumn("DataRif", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDataRif); + this.columnDataOraRif = new global::System.Data.DataColumn("DataOraRif", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDataOraRif); this.columnItmProd = new global::System.Data.DataColumn("ItmProd", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnItmProd); this.columnItmScrap = new global::System.Data.DataColumn("ItmScrap", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnItmScrap); - this.columnMinRun = new global::System.Data.DataColumn("MinRun", typeof(long), null, global::System.Data.MappingType.Element); + this.columnMinRun = new global::System.Data.DataColumn("MinRun", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnMinRun); this.columnMinDisp = new global::System.Data.DataColumn("MinDisp", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnMinDisp); - this.Constraints.Add(new global::System.Data.UniqueConstraint("DailyProdStatsKey1", new global::System.Data.DataColumn[] { + this.Constraints.Add(new global::System.Data.UniqueConstraint("ProductionStatsDayKey1", new global::System.Data.DataColumn[] { this.columnPlaceCod, - this.columnDataOraRif}, false)); + this.columnDataRif}, true)); this.columnPlaceCod.AllowDBNull = false; this.columnPlaceCod.MaxLength = 50; - this.columnDataOraRif.AllowDBNull = false; this.columnDataRif.AllowDBNull = false; - this.columnItmProd.ReadOnly = true; - this.columnItmScrap.ReadOnly = true; - this.columnMinRun.ReadOnly = true; - this.columnMinDisp.ReadOnly = true; + this.columnDataOraRif.AllowDBNull = false; + this.columnItmProd.AllowDBNull = false; + this.columnItmScrap.AllowDBNull = false; + this.columnMinRun.AllowDBNull = false; + this.columnMinDisp.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DailyProdStatsRow NewDailyProdStatsRow() { - return ((DailyProdStatsRow)(this.NewRow())); + public ProductionStatsDayRow NewProductionStatsDayRow() { + return ((ProductionStatsDayRow)(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 DailyProdStatsRow(builder); + return new ProductionStatsDayRow(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(DailyProdStatsRow); + return typeof(ProductionStatsDayRow); } [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.DailyProdStatsRowChanged != null)) { - this.DailyProdStatsRowChanged(this, new DailyProdStatsRowChangeEvent(((DailyProdStatsRow)(e.Row)), e.Action)); + if ((this.ProductionStatsDayRowChanged != null)) { + this.ProductionStatsDayRowChanged(this, new ProductionStatsDayRowChangeEvent(((ProductionStatsDayRow)(e.Row)), e.Action)); } } @@ -19802,8 +19810,8 @@ namespace AppData { [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.DailyProdStatsRowChanging != null)) { - this.DailyProdStatsRowChanging(this, new DailyProdStatsRowChangeEvent(((DailyProdStatsRow)(e.Row)), e.Action)); + if ((this.ProductionStatsDayRowChanging != null)) { + this.ProductionStatsDayRowChanging(this, new ProductionStatsDayRowChangeEvent(((ProductionStatsDayRow)(e.Row)), e.Action)); } } @@ -19811,8 +19819,8 @@ namespace AppData { [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.DailyProdStatsRowDeleted != null)) { - this.DailyProdStatsRowDeleted(this, new DailyProdStatsRowChangeEvent(((DailyProdStatsRow)(e.Row)), e.Action)); + if ((this.ProductionStatsDayRowDeleted != null)) { + this.ProductionStatsDayRowDeleted(this, new ProductionStatsDayRowChangeEvent(((ProductionStatsDayRow)(e.Row)), e.Action)); } } @@ -19820,14 +19828,14 @@ namespace AppData { [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.DailyProdStatsRowDeleting != null)) { - this.DailyProdStatsRowDeleting(this, new DailyProdStatsRowChangeEvent(((DailyProdStatsRow)(e.Row)), e.Action)); + if ((this.ProductionStatsDayRowDeleting != null)) { + this.ProductionStatsDayRowDeleting(this, new ProductionStatsDayRowChangeEvent(((ProductionStatsDayRow)(e.Row)), e.Action)); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void RemoveDailyProdStatsRow(DailyProdStatsRow row) { + public void RemoveProductionStatsDayRow(ProductionStatsDayRow row) { this.Rows.Remove(row); } @@ -19854,7 +19862,7 @@ namespace AppData { type.Attributes.Add(attribute1); global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); attribute2.Name = "tableTypeName"; - attribute2.FixedValue = "DailyProdStatsDataTable"; + attribute2.FixedValue = "ProductionStatsDayDataTable"; type.Attributes.Add(attribute2); type.Particle = sequence; global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); @@ -28177,36 +28185,25 @@ namespace AppData { /// ///Represents strongly named DataRow class. /// - public partial class DailyProdStatsRow : global::System.Data.DataRow { + public partial class ProductionStatsDayRow : global::System.Data.DataRow { - private DailyProdStatsDataTable tableDailyProdStats; + private ProductionStatsDayDataTable tableProductionStatsDay; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - internal DailyProdStatsRow(global::System.Data.DataRowBuilder rb) : + internal ProductionStatsDayRow(global::System.Data.DataRowBuilder rb) : base(rb) { - this.tableDailyProdStats = ((DailyProdStatsDataTable)(this.Table)); + this.tableProductionStatsDay = ((ProductionStatsDayDataTable)(this.Table)); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string PlaceCod { get { - return ((string)(this[this.tableDailyProdStats.PlaceCodColumn])); + return ((string)(this[this.tableProductionStatsDay.PlaceCodColumn])); } set { - this[this.tableDailyProdStats.PlaceCodColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public System.DateTime DataOraRif { - get { - return ((global::System.DateTime)(this[this.tableDailyProdStats.DataOraRifColumn])); - } - set { - this[this.tableDailyProdStats.DataOraRifColumn] = value; + this[this.tableProductionStatsDay.PlaceCodColumn] = value; } } @@ -28214,10 +28211,21 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public System.DateTime DataRif { get { - return ((global::System.DateTime)(this[this.tableDailyProdStats.DataRifColumn])); + return ((global::System.DateTime)(this[this.tableProductionStatsDay.DataRifColumn])); } set { - this[this.tableDailyProdStats.DataRifColumn] = value; + this[this.tableProductionStatsDay.DataRifColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime DataOraRif { + get { + return ((global::System.DateTime)(this[this.tableProductionStatsDay.DataOraRifColumn])); + } + set { + this[this.tableProductionStatsDay.DataOraRifColumn] = value; } } @@ -28225,15 +28233,10 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int ItmProd { get { - try { - return ((int)(this[this.tableDailyProdStats.ItmProdColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'ItmProd\' in table \'DailyProdStats\' is DBNull.", e); - } + return ((int)(this[this.tableProductionStatsDay.ItmProdColumn])); } set { - this[this.tableDailyProdStats.ItmProdColumn] = value; + this[this.tableProductionStatsDay.ItmProdColumn] = value; } } @@ -28241,31 +28244,21 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int ItmScrap { get { - try { - return ((int)(this[this.tableDailyProdStats.ItmScrapColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'ItmScrap\' in table \'DailyProdStats\' is DBNull.", e); - } + return ((int)(this[this.tableProductionStatsDay.ItmScrapColumn])); } set { - this[this.tableDailyProdStats.ItmScrapColumn] = value; + this[this.tableProductionStatsDay.ItmScrapColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public long MinRun { + public int MinRun { get { - try { - return ((long)(this[this.tableDailyProdStats.MinRunColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'MinRun\' in table \'DailyProdStats\' is DBNull.", e); - } + return ((int)(this[this.tableProductionStatsDay.MinRunColumn])); } set { - this[this.tableDailyProdStats.MinRunColumn] = value; + this[this.tableProductionStatsDay.MinRunColumn] = value; } } @@ -28273,65 +28266,12 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int MinDisp { get { - try { - return ((int)(this[this.tableDailyProdStats.MinDispColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'MinDisp\' in table \'DailyProdStats\' is DBNull.", e); - } + return ((int)(this[this.tableProductionStatsDay.MinDispColumn])); } set { - this[this.tableDailyProdStats.MinDispColumn] = value; + this[this.tableProductionStatsDay.MinDispColumn] = value; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsItmProdNull() { - return this.IsNull(this.tableDailyProdStats.ItmProdColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetItmProdNull() { - this[this.tableDailyProdStats.ItmProdColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsItmScrapNull() { - return this.IsNull(this.tableDailyProdStats.ItmScrapColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetItmScrapNull() { - this[this.tableDailyProdStats.ItmScrapColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsMinRunNull() { - return this.IsNull(this.tableDailyProdStats.MinRunColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetMinRunNull() { - this[this.tableDailyProdStats.MinRunColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsMinDispNull() { - return this.IsNull(this.tableDailyProdStats.MinDispColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetMinDispNull() { - this[this.tableDailyProdStats.MinDispColumn] = global::System.Convert.DBNull; - } } /// @@ -29834,22 +29774,22 @@ namespace AppData { ///Row event argument class /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public class DailyProdStatsRowChangeEvent : global::System.EventArgs { + public class ProductionStatsDayRowChangeEvent : global::System.EventArgs { - private DailyProdStatsRow eventRow; + private ProductionStatsDayRow 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 DailyProdStatsRowChangeEvent(DailyProdStatsRow row, global::System.Data.DataRowAction action) { + public ProductionStatsDayRowChangeEvent(ProductionStatsDayRow 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 DailyProdStatsRow Row { + public ProductionStatsDayRow Row { get { return this.eventRow; } @@ -45195,7 +45135,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N [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 DailyProdStatsTableAdapter : global::System.ComponentModel.Component { + public partial class ProductionStatsDayTableAdapter : global::System.ComponentModel.Component { private global::System.Data.SqlClient.SqlDataAdapter _adapter; @@ -45209,7 +45149,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public DailyProdStatsTableAdapter() { + public ProductionStatsDayTableAdapter() { this.ClearBeforeFill = true; } @@ -45306,10 +45246,10 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N 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 = "DailyProdStats"; + tableMapping.DataSetTable = "ProductionStatsDay"; tableMapping.ColumnMappings.Add("PlaceCod", "PlaceCod"); - tableMapping.ColumnMappings.Add("DataOraRif", "DataOraRif"); tableMapping.ColumnMappings.Add("DataRif", "DataRif"); + tableMapping.ColumnMappings.Add("DataOraRif", "DataOraRif"); tableMapping.ColumnMappings.Add("ItmProd", "ItmProd"); tableMapping.ColumnMappings.Add("ItmScrap", "ItmScrap"); tableMapping.ColumnMappings.Add("MinRun", "MinRun"); @@ -45327,48 +45267,27 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N [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[1]; + 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 = "prt.stp_prt_ProductionHour"; - this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DayGroup", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].CommandText = "SELECT *\r\nFROM ProductionStatsDay"; + 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_ProdStatDay_getFilt"; + 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("@dtStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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.DailyProdStatsDataTable dataTable, global::System.Nullable dtStart, global::System.Nullable dtEnd, string PlaceCod, global::System.Nullable DayGroup) { + public virtual int Fill(DS_App.ProductionStatsDayDataTable dataTable) { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((dtStart.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(dtStart.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; - } - if ((dtEnd.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dtEnd.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; - } - if ((PlaceCod == null)) { - this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; - } - else { - this.Adapter.SelectCommand.Parameters[3].Value = ((string)(PlaceCod)); - } - if ((DayGroup.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(DayGroup.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; - } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -45380,8 +45299,19 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N [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.DailyProdStatsDataTable GetData(global::System.Nullable dtStart, global::System.Nullable dtEnd, string PlaceCod, global::System.Nullable DayGroup) { + public virtual DS_App.ProductionStatsDayDataTable GetData() { this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.ProductionStatsDayDataTable dataTable = new DS_App.ProductionStatsDayDataTable(); + 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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_App.ProductionStatsDayDataTable getFilt(global::System.Nullable dtStart, global::System.Nullable dtEnd, string PlaceCod) { + this.Adapter.SelectCommand = this.CommandCollection[1]; if ((dtStart.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(dtStart.Value)); } @@ -45400,13 +45330,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(PlaceCod)); } - if ((DayGroup.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(DayGroup.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; - } - DS_App.DailyProdStatsDataTable dataTable = new DS_App.DailyProdStatsDataTable(); + DS_App.ProductionStatsDayDataTable dataTable = new DS_App.ProductionStatsDayDataTable(); this.Adapter.Fill(dataTable); return dataTable; } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 42776d6..1a66669 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3876,33 +3876,42 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + - + - - prt.stp_prt_ProductionHour - - - - - - - + + SELECT * +FROM ProductionStatsDay + - + - + + + + + dbo.stp_ProdStatDay_getFilt + + + + + + + + + + @@ -3912,7 +3921,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -3970,7 +3979,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -3995,7 +4004,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4050,7 +4059,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4123,7 +4132,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4192,7 +4201,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4225,7 +4234,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4297,7 +4306,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4316,7 +4325,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4347,7 +4356,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4355,7 +4364,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4372,7 +4381,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4381,7 +4390,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4412,7 +4421,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4420,7 +4429,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4436,7 +4445,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4444,7 +4453,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4472,7 +4481,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4508,7 +4517,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4524,7 +4533,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4534,7 +4543,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4551,7 +4560,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4564,7 +4573,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4613,7 +4622,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4642,7 +4651,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4684,7 +4693,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4795,7 +4804,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4858,7 +4867,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4903,7 +4912,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -4929,7 +4938,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5022,7 +5031,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5085,7 +5094,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5144,7 +5153,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5193,7 +5202,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5232,7 +5241,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5285,7 +5294,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5302,7 +5311,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5315,7 +5324,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5337,7 +5346,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5365,7 +5374,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5402,7 +5411,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5436,7 +5445,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5478,7 +5487,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5491,7 +5500,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5513,7 +5522,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - + @@ -5523,12 +5532,12 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - - - - - + + + + + @@ -5708,26 +5717,26 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 20727fe..94bdb7d 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -50,7 +50,7 @@ - + diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index 2db15f2..b4111fb 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -17,7 +17,7 @@ namespace AppData public DS_AppTableAdapters.CartOnKitTableAdapter taCOK; public DS_AppTableAdapters.CountersTableAdapter taCount; public DS_AppTableAdapters.CartsTableAdapter taCR; - public DS_AppTableAdapters.DailyProdStatsTableAdapter taDayStats; + public DS_AppTableAdapters.ProductionStatsDayTableAdapter taDayStats; public DS_AppTableAdapters.ErrorsLogTableAdapter taEL; public DS_ReportTableAdapters.ElencoPostazioniTableAdapter taElPos; public DS_AppTableAdapters.FileValidationTableAdapter taFV; @@ -168,7 +168,7 @@ namespace AppData taCOK = new DS_AppTableAdapters.CartOnKitTableAdapter(); taCount = new DS_AppTableAdapters.CountersTableAdapter(); taCR = new DS_AppTableAdapters.CartsTableAdapter(); - taDayStats = new DS_AppTableAdapters.DailyProdStatsTableAdapter(); + taDayStats = new DS_AppTableAdapters.ProductionStatsDayTableAdapter(); taEL = new DS_AppTableAdapters.ErrorsLogTableAdapter(); taFV = new DS_AppTableAdapters.FileValidationTableAdapter(); taIL = new DS_AppTableAdapters.ItemListTableAdapter(); diff --git a/AppData/Objects.cs b/AppData/Objects.cs index be8972e..6fdc949 100644 --- a/AppData/Objects.cs +++ b/AppData/Objects.cs @@ -10,6 +10,7 @@ namespace AppData { #region Public Properties + public string label { get; set; } = ""; public DateTime x { get; set; } public decimal y { get; set; } diff --git a/NKC_WF/Controllers/DayStatsController.cs b/NKC_WF/Controllers/DayStatsController.cs index f88b6d4..45c2f9f 100644 --- a/NKC_WF/Controllers/DayStatsController.cs +++ b/NKC_WF/Controllers/DayStatsController.cs @@ -35,7 +35,7 @@ namespace NKC_WF.Controllers DateTime endDate = DateTime.Today.AddDays(1); DateTime startDate = endDate.AddDays(-10); List answ = new List(); - var tabDati = DLMan.taDayStats.GetData(startDate, endDate, id, true); + var tabDati = DLMan.taDayStats.getFilt(startDate, endDate, id); // ciclo decimal value = 0; foreach (var item in tabDati.OrderBy(x => x.DataOraRif)) @@ -63,7 +63,7 @@ namespace NKC_WF.Controllers Stopwatch stopWatchLap = new Stopwatch(); stopWatchLap.Start(); List answ = new List(); - var tabDati = DLMan.taDayStats.GetData(StartDate, EndDate, id, true); + var tabDati = DLMan.taDayStats.getFilt(StartDate, EndDate, id); stopWatchLap.Stop(); Log.Instance.Info($"DayStats DB retrieve | machine: {id} | start: {StartDate} | end: {EndDate} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms"); stopWatchLap.Restart(); @@ -96,7 +96,7 @@ namespace NKC_WF.Controllers value = item.MinRun / denom * 100; break; } - answ.Add(new chartJsTSerie() { x = item.DataOraRif, y = value }); + answ.Add(new chartJsTSerie() { x = item.DataOraRif, y = value, label = item.PlaceCod }); } stopWatchLap.Stop(); Log.Instance.Info($"DayStats data conversion | machine: {id} | start: {StartDate} | end: {EndDate} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms"); diff --git a/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx b/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx index 9f4aa3a..fe68ebc 100644 --- a/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx +++ b/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx @@ -40,7 +40,7 @@
- + @@ -49,7 +49,7 @@ <%: traduci("NoRecord") %> - + @@ -62,12 +62,11 @@ - + -
diff --git a/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx b/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx index de06480..89c333c 100644 --- a/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx +++ b/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx @@ -6,6 +6,14 @@

Batch Stats Plot

+
+
+ <%----%> +
+
+
+
+
@@ -28,6 +36,11 @@ }); //console.log('labels data', labels); + var dataNE01 = dataTS.filter(record => record.label == "NE01"); + var dataNE02 = dataTS.filter(record => record.label == "NE02"); + //console.log('dataNE01 data', dataNE01); + //console.log('dataNE02 data', dataNE02); + var myOptions = { responsive: true, maintainAspectRatio: false, @@ -51,16 +64,30 @@ data: { labels: labelsTS, - datasets: [{ - label: '<%=hfLegend.Value %>', - borderColor: 'rgb(7, 173, 236)', - lineTension: 0, - //steppedLine: false, - data: dataTS - }] + datasets: [ + { + label: 'NE01: <%=hfLegend.Value %>', + borderColor: 'rgb(7, 173, 236)', + lineTension: 0, + //steppedLine: false, + data: dataNE01 + }, + { + label: 'NE02: <%=hfLegend.Value %>', + borderColor: 'rgb(7, 173, 26)', + lineTension: 0, + //steppedLine: false, + data: dataNE02 + } + ] }, options: myOptions }); + + // nascondo panel loading + var currDiv = document.getElementById("divLoading"); + currDiv.style.display = "none"; + console.log("style: " + currDiv.style.display); } // errore in reload! function OnErrorCall_(repo) { @@ -82,6 +109,9 @@ // funzione di drawing ad OGNI pageload! function pageLoad() { + // mostro panel loading + var currDiv = document.getElementById("divLoading"); + currDiv.style.display = "block"; // chiamo recupero dati + plot della TS plotTS(); //console.log('pageLoad!'); diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index f4cce2c..67e88b4 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -8,6 +8,21 @@ namespace NKC_WF { #region Protected Properties + protected string MachineSel + { + get + { + return PlaceCod; + } + set + { + PlaceCod = value; + cmp_MU_bins.MachineSel = value; + cmp_MU_carts.MachineSel = value; + hlPartMIA.NavigateUrl = $"PartMIA?mach={value}"; + } + } + protected int numWaitSvg { get @@ -108,7 +123,8 @@ namespace NKC_WF { try { - answ = DLMan.taIL.getMissingByBatch(BatchId).Count > 0; + bool hasMIA = DLMan.taIL.getMissingByBatch(BatchId).Count > 0; + answ = hasMIA && MachineSel!="#"; } catch { } @@ -121,21 +137,6 @@ namespace NKC_WF #region Private Methods - protected string MachineSel - { - get - { - return PlaceCod; - } - set - { - PlaceCod = value; - cmp_MU_bins.MachineSel = value; - cmp_MU_carts.MachineSel = value; - } - } - - /// /// Aggiorna componente principale e child components /// @@ -166,9 +167,9 @@ namespace NKC_WF upnlDrawings.Update(); upnlTitle.Update(); } + } // definisco se mostrare PartMIA hlPartMIA.Visible = showPartMIA; - } } /// diff --git a/NKC_WF/site/PartMIA.aspx b/NKC_WF/site/PartMIA.aspx index baaeb09..85e4152 100644 --- a/NKC_WF/site/PartMIA.aspx +++ b/NKC_WF/site/PartMIA.aspx @@ -8,7 +8,7 @@ <%@ Register Src="~/WebUserControls/cmp_MachSem.ascx" TagPrefix="uc1" TagName="cmp_MachSem" %> -
+
@@ -41,4 +41,4 @@
- + \ No newline at end of file diff --git a/NKC_WF/site/PartMIA.aspx.cs b/NKC_WF/site/PartMIA.aspx.cs index a047b79..3aef37c 100644 --- a/NKC_WF/site/PartMIA.aspx.cs +++ b/NKC_WF/site/PartMIA.aspx.cs @@ -109,6 +109,16 @@ namespace NKC_WF.site } } + public string MachineSel + { + get + { + string answ = ""; + answ = memLayer.ML.QSS("mach"); + return answ; + } + } + #endregion Public Properties #region Private Methods @@ -126,6 +136,10 @@ namespace NKC_WF.site ///
private void doUpdate() { + if (!string.IsNullOrEmpty(MachineSel)) + { + PlaceCod = MachineSel; + } if (PLID > 0) { cmp_partMIA.Visible = false; diff --git a/NKC_WF/site/PlannerReports.aspx b/NKC_WF/site/PlannerReports.aspx index 8a5ae60..c0b6768 100644 --- a/NKC_WF/site/PlannerReports.aspx +++ b/NKC_WF/site/PlannerReports.aspx @@ -6,7 +6,7 @@ <%@ Register Src="~/WebUserControls/cmp_DailyStatsList.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsList" %> -
+
@@ -25,21 +25,10 @@
- <%# traduci("PleaseSelectReportType") %> + <%# traduci("PleaseSelectReportType") %>
- <%-- - - - -
- -
- - - - --%>