Merge branch 'release/ReportFix'

2021-10-06 12:11:50 +02:00
parent 617574a3bd e7355bea00
commit ae6ff18385
12 changed files with 305 additions and 338 deletions
@@ -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);
        
        /// <summary>
        ///Represents the strongly named DataTable class.
@@ -19558,14 +19558,14 @@ namespace AppData {
        ///</summary>
        [global::System.Serializable()]
        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class DailyProdStatsDataTable : global::System.Data.TypedTableBase<DailyProdStatsRow> {
+        public partial class ProductionStatsDayDataTable : global::System.Data.TypedTableBase<ProductionStatsDayRow> {
            
            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 {
        /// <summary>
        ///Represents strongly named DataRow class.
        ///</summary>
-        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;
-            }
        }
        
        /// <summary>
@@ -29834,22 +29774,22 @@ namespace AppData {
        ///Row event argument class
        ///</summary>
        [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<global::System.DateTime> dtStart, global::System.Nullable<global::System.DateTime> dtEnd, string PlaceCod, global::System.Nullable<bool> 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<global::System.DateTime> dtStart, global::System.Nullable<global::System.DateTime> dtEnd, string PlaceCod, global::System.Nullable<bool> 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<global::System.DateTime> dtStart, global::System.Nullable<global::System.DateTime> 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;
        }
@@ -3876,33 +3876,42 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
              </DbSource>
            </Sources>
          </TableAdapter>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="DailyProdStatsTableAdapter" GeneratorDataComponentClassName="DailyProdStatsTableAdapter" Name="DailyProdStats" UserDataComponentName="DailyProdStatsTableAdapter">
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ProductionStatsDayTableAdapter" GeneratorDataComponentClassName="ProductionStatsDayTableAdapter" Name="ProductionStatsDay" UserDataComponentName="ProductionStatsDayTableAdapter">
            <MainSource>
-              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.prt.stp_prt_ProductionHour" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.ProductionStatsDay" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                <SelectCommand>
-                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>prt.stp_prt_ProductionHour</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtStart" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtEnd" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@PlaceCod" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@DayGroup" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT *
+FROM ProductionStatsDay</CommandText>
+                    <Parameters />
                  </DbCommand>
                </SelectCommand>
              </DbSource>
            </MainSource>
            <Mappings>
              <Mapping SourceColumn="PlaceCod" DataSetColumn="PlaceCod" />
-              <Mapping SourceColumn="DataOraRif" DataSetColumn="DataOraRif" />
              <Mapping SourceColumn="DataRif" DataSetColumn="DataRif" />
+              <Mapping SourceColumn="DataOraRif" DataSetColumn="DataOraRif" />
              <Mapping SourceColumn="ItmProd" DataSetColumn="ItmProd" />
              <Mapping SourceColumn="ItmScrap" DataSetColumn="ItmScrap" />
              <Mapping SourceColumn="MinRun" DataSetColumn="MinRun" />
              <Mapping SourceColumn="MinDisp" DataSetColumn="MinDisp" />
            </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_ProdStatDay_getFilt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFilt" GetMethodModifier="Public" GetMethodName="getFilt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFilt" UserSourceName="getFilt">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_ProdStatDay_getFilt</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtStart" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtEnd" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@PlaceCod" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
          </TableAdapter>
        </Tables>
        <Sources />
@@ -3912,7 +3921,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
  <xs:element name="DS_App" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_App" msprop:Generator_UserDSName="DS_App">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="BatchList" msprop:Generator_TableClassName="BatchListDataTable" msprop:Generator_TableVarName="tableBatchList" msprop:Generator_TablePropName="BatchList" msprop:Generator_RowDeletingName="BatchListRowDeleting" msprop:Generator_RowChangingName="BatchListRowChanging" msprop:Generator_RowEvHandlerName="BatchListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchListRowDeleted" msprop:Generator_UserTableName="BatchList" msprop:Generator_RowChangedName="BatchListRowChanged" msprop:Generator_RowEvArgName="BatchListRowChangeEvent" msprop:Generator_RowClassName="BatchListRow">
+        <xs:element name="BatchList" msprop:Generator_TableClassName="BatchListDataTable" msprop:Generator_TableVarName="tableBatchList" msprop:Generator_RowChangedName="BatchListRowChanged" msprop:Generator_TablePropName="BatchList" msprop:Generator_RowDeletingName="BatchListRowDeleting" msprop:Generator_RowChangingName="BatchListRowChanging" msprop:Generator_RowEvHandlerName="BatchListRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchListRowDeleted" msprop:Generator_RowClassName="BatchListRow" msprop:Generator_UserTableName="BatchList" msprop:Generator_RowEvArgName="BatchListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BatchID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -3970,7 +3979,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="StackList" msprop:Generator_TableClassName="StackListDataTable" msprop:Generator_TableVarName="tableStackList" msprop:Generator_TablePropName="StackList" msprop:Generator_RowDeletingName="StackListRowDeleting" msprop:Generator_RowChangingName="StackListRowChanging" msprop:Generator_RowEvHandlerName="StackListRowChangeEventHandler" msprop:Generator_RowDeletedName="StackListRowDeleted" msprop:Generator_UserTableName="StackList" msprop:Generator_RowChangedName="StackListRowChanged" msprop:Generator_RowEvArgName="StackListRowChangeEvent" msprop:Generator_RowClassName="StackListRow">
+        <xs:element name="StackList" msprop:Generator_TableClassName="StackListDataTable" msprop:Generator_TableVarName="tableStackList" msprop:Generator_RowChangedName="StackListRowChanged" msprop:Generator_TablePropName="StackList" msprop:Generator_RowDeletingName="StackListRowDeleting" msprop:Generator_RowChangingName="StackListRowChanging" msprop:Generator_RowEvHandlerName="StackListRowChangeEventHandler" msprop:Generator_RowDeletedName="StackListRowDeleted" msprop:Generator_RowClassName="StackListRow" msprop:Generator_UserTableName="StackList" msprop:Generator_RowEvArgName="StackListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="StackID" msprop:Generator_ColumnVarNameInTable="columnStackID" msprop:Generator_ColumnPropNameInRow="StackID" msprop:Generator_ColumnPropNameInTable="StackIDColumn" msprop:Generator_UserColumnName="StackID" type="xs:int" />
@@ -3995,7 +4004,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="SheetList" msprop:Generator_TableClassName="SheetListDataTable" msprop:Generator_TableVarName="tableSheetList" msprop:Generator_TablePropName="SheetList" msprop:Generator_RowDeletingName="SheetListRowDeleting" msprop:Generator_RowChangingName="SheetListRowChanging" msprop:Generator_RowEvHandlerName="SheetListRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetListRowDeleted" msprop:Generator_UserTableName="SheetList" msprop:Generator_RowChangedName="SheetListRowChanged" msprop:Generator_RowEvArgName="SheetListRowChangeEvent" msprop:Generator_RowClassName="SheetListRow">
+        <xs:element name="SheetList" msprop:Generator_TableClassName="SheetListDataTable" msprop:Generator_TableVarName="tableSheetList" msprop:Generator_RowChangedName="SheetListRowChanged" msprop:Generator_TablePropName="SheetList" msprop:Generator_RowDeletingName="SheetListRowDeleting" msprop:Generator_RowChangingName="SheetListRowChanging" msprop:Generator_RowEvHandlerName="SheetListRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetListRowDeleted" msprop:Generator_RowClassName="SheetListRow" msprop:Generator_UserTableName="SheetList" msprop:Generator_RowEvArgName="SheetListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -4050,7 +4059,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OrderList" msprop:Generator_TableClassName="OrderListDataTable" msprop:Generator_TableVarName="tableOrderList" msprop:Generator_TablePropName="OrderList" msprop:Generator_RowDeletingName="OrderListRowDeleting" msprop:Generator_RowChangingName="OrderListRowChanging" msprop:Generator_RowEvHandlerName="OrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListRowDeleted" msprop:Generator_UserTableName="OrderList" msprop:Generator_RowChangedName="OrderListRowChanged" msprop:Generator_RowEvArgName="OrderListRowChangeEvent" msprop:Generator_RowClassName="OrderListRow">
+        <xs:element name="OrderList" msprop:Generator_TableClassName="OrderListDataTable" msprop:Generator_TableVarName="tableOrderList" msprop:Generator_RowChangedName="OrderListRowChanged" msprop:Generator_TablePropName="OrderList" msprop:Generator_RowDeletingName="OrderListRowDeleting" msprop:Generator_RowChangingName="OrderListRowChanging" msprop:Generator_RowEvHandlerName="OrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListRowDeleted" msprop:Generator_RowClassName="OrderListRow" msprop:Generator_UserTableName="OrderList" msprop:Generator_RowEvArgName="OrderListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -4123,7 +4132,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ItemList" msprop:Generator_TableClassName="ItemListDataTable" msprop:Generator_TableVarName="tableItemList" msprop:Generator_TablePropName="ItemList" msprop:Generator_RowDeletingName="ItemListRowDeleting" msprop:Generator_RowChangingName="ItemListRowChanging" msprop:Generator_RowEvHandlerName="ItemListRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemListRowDeleted" msprop:Generator_UserTableName="ItemList" msprop:Generator_RowChangedName="ItemListRowChanged" msprop:Generator_RowEvArgName="ItemListRowChangeEvent" msprop:Generator_RowClassName="ItemListRow">
+        <xs:element name="ItemList" msprop:Generator_TableClassName="ItemListDataTable" msprop:Generator_TableVarName="tableItemList" msprop:Generator_RowChangedName="ItemListRowChanged" msprop:Generator_TablePropName="ItemList" msprop:Generator_RowDeletingName="ItemListRowDeleting" msprop:Generator_RowChangingName="ItemListRowChanging" msprop:Generator_RowEvHandlerName="ItemListRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemListRowDeleted" msprop:Generator_RowClassName="ItemListRow" msprop:Generator_UserTableName="ItemList" msprop:Generator_RowEvArgName="ItemListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ItemID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -4192,7 +4201,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Materials" msprop:Generator_TableClassName="MaterialsDataTable" msprop:Generator_TableVarName="tableMaterials" msprop:Generator_RowChangedName="MaterialsRowChanged" msprop:Generator_TablePropName="Materials" msprop:Generator_RowDeletingName="MaterialsRowDeleting" msprop:Generator_RowChangingName="MaterialsRowChanging" msprop:Generator_RowEvHandlerName="MaterialsRowChangeEventHandler" msprop:Generator_RowDeletedName="MaterialsRowDeleted" msprop:Generator_RowClassName="MaterialsRow" msprop:Generator_UserTableName="Materials" msprop:Generator_RowEvArgName="MaterialsRowChangeEvent">
+        <xs:element name="Materials" msprop:Generator_TableClassName="MaterialsDataTable" msprop:Generator_TableVarName="tableMaterials" msprop:Generator_TablePropName="Materials" msprop:Generator_RowDeletingName="MaterialsRowDeleting" msprop:Generator_RowChangingName="MaterialsRowChanging" msprop:Generator_RowEvHandlerName="MaterialsRowChangeEventHandler" msprop:Generator_RowDeletedName="MaterialsRowDeleted" msprop:Generator_UserTableName="Materials" msprop:Generator_RowChangedName="MaterialsRowChanged" msprop:Generator_RowEvArgName="MaterialsRowChangeEvent" msprop:Generator_RowClassName="MaterialsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="MatID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnMatID" msprop:Generator_ColumnPropNameInRow="MatID" msprop:Generator_ColumnPropNameInTable="MatIDColumn" msprop:Generator_UserColumnName="MatID" type="xs:int" />
@@ -4225,7 +4234,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Bins" msprop:Generator_TableClassName="BinsDataTable" msprop:Generator_TableVarName="tableBins" msprop:Generator_RowChangedName="BinsRowChanged" msprop:Generator_TablePropName="Bins" msprop:Generator_RowDeletingName="BinsRowDeleting" msprop:Generator_RowChangingName="BinsRowChanging" msprop:Generator_RowEvHandlerName="BinsRowChangeEventHandler" msprop:Generator_RowDeletedName="BinsRowDeleted" msprop:Generator_RowClassName="BinsRow" msprop:Generator_UserTableName="Bins" msprop:Generator_RowEvArgName="BinsRowChangeEvent">
+        <xs:element name="Bins" msprop:Generator_TableClassName="BinsDataTable" msprop:Generator_TableVarName="tableBins" msprop:Generator_TablePropName="Bins" msprop:Generator_RowDeletingName="BinsRowDeleting" msprop:Generator_RowChangingName="BinsRowChanging" msprop:Generator_RowEvHandlerName="BinsRowChangeEventHandler" msprop:Generator_RowDeletedName="BinsRowDeleted" msprop:Generator_UserTableName="Bins" msprop:Generator_RowChangedName="BinsRowChanged" msprop:Generator_RowEvArgName="BinsRowChangeEvent" msprop:Generator_RowClassName="BinsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BinID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -4297,7 +4306,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Carts" msprop:Generator_TableClassName="CartsDataTable" msprop:Generator_TableVarName="tableCarts" msprop:Generator_RowChangedName="CartsRowChanged" msprop:Generator_TablePropName="Carts" msprop:Generator_RowDeletingName="CartsRowDeleting" msprop:Generator_RowChangingName="CartsRowChanging" msprop:Generator_RowEvHandlerName="CartsRowChangeEventHandler" msprop:Generator_RowDeletedName="CartsRowDeleted" msprop:Generator_RowClassName="CartsRow" msprop:Generator_UserTableName="Carts" msprop:Generator_RowEvArgName="CartsRowChangeEvent">
+        <xs:element name="Carts" msprop:Generator_TableClassName="CartsDataTable" msprop:Generator_TableVarName="tableCarts" msprop:Generator_TablePropName="Carts" msprop:Generator_RowDeletingName="CartsRowDeleting" msprop:Generator_RowChangingName="CartsRowChanging" msprop:Generator_RowEvHandlerName="CartsRowChangeEventHandler" msprop:Generator_RowDeletedName="CartsRowDeleted" msprop:Generator_UserTableName="Carts" msprop:Generator_RowChangedName="CartsRowChanged" msprop:Generator_RowEvArgName="CartsRowChangeEvent" msprop:Generator_RowClassName="CartsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
@@ -4316,7 +4325,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OfflineOrderList" msprop:Generator_TableClassName="OfflineOrderListDataTable" msprop:Generator_TableVarName="tableOfflineOrderList" msprop:Generator_TablePropName="OfflineOrderList" msprop:Generator_RowDeletingName="OfflineOrderListRowDeleting" msprop:Generator_RowChangingName="OfflineOrderListRowChanging" msprop:Generator_RowEvHandlerName="OfflineOrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OfflineOrderListRowDeleted" msprop:Generator_UserTableName="OfflineOrderList" msprop:Generator_RowChangedName="OfflineOrderListRowChanged" msprop:Generator_RowEvArgName="OfflineOrderListRowChangeEvent" msprop:Generator_RowClassName="OfflineOrderListRow">
+        <xs:element name="OfflineOrderList" msprop:Generator_TableClassName="OfflineOrderListDataTable" msprop:Generator_TableVarName="tableOfflineOrderList" msprop:Generator_RowChangedName="OfflineOrderListRowChanged" msprop:Generator_TablePropName="OfflineOrderList" msprop:Generator_RowDeletingName="OfflineOrderListRowDeleting" msprop:Generator_RowChangingName="OfflineOrderListRowChanging" msprop:Generator_RowEvHandlerName="OfflineOrderListRowChangeEventHandler" msprop:Generator_RowDeletedName="OfflineOrderListRowDeleted" msprop:Generator_RowClassName="OfflineOrderListRow" msprop:Generator_UserTableName="OfflineOrderList" msprop:Generator_RowEvArgName="OfflineOrderListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OrdID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -4347,7 +4356,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OffOrd2Item" msprop:Generator_TableClassName="OffOrd2ItemDataTable" msprop:Generator_TableVarName="tableOffOrd2Item" msprop:Generator_TablePropName="OffOrd2Item" msprop:Generator_RowDeletingName="OffOrd2ItemRowDeleting" msprop:Generator_RowChangingName="OffOrd2ItemRowChanging" msprop:Generator_RowEvHandlerName="OffOrd2ItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OffOrd2ItemRowDeleted" msprop:Generator_UserTableName="OffOrd2Item" msprop:Generator_RowChangedName="OffOrd2ItemRowChanged" msprop:Generator_RowEvArgName="OffOrd2ItemRowChangeEvent" msprop:Generator_RowClassName="OffOrd2ItemRow">
+        <xs:element name="OffOrd2Item" msprop:Generator_TableClassName="OffOrd2ItemDataTable" msprop:Generator_TableVarName="tableOffOrd2Item" msprop:Generator_RowChangedName="OffOrd2ItemRowChanged" msprop:Generator_TablePropName="OffOrd2Item" msprop:Generator_RowDeletingName="OffOrd2ItemRowDeleting" msprop:Generator_RowChangingName="OffOrd2ItemRowChanging" msprop:Generator_RowEvHandlerName="OffOrd2ItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OffOrd2ItemRowDeleted" msprop:Generator_RowClassName="OffOrd2ItemRow" msprop:Generator_UserTableName="OffOrd2Item" msprop:Generator_RowEvArgName="OffOrd2ItemRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OrdID" msprop:Generator_ColumnVarNameInTable="columnOrdID" msprop:Generator_ColumnPropNameInRow="OrdID" msprop:Generator_ColumnPropNameInTable="OrdIDColumn" msprop:Generator_UserColumnName="OrdID" type="xs:int" />
@@ -4355,7 +4364,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="KitList" msprop:Generator_TableClassName="KitListDataTable" msprop:Generator_TableVarName="tableKitList" msprop:Generator_RowChangedName="KitListRowChanged" msprop:Generator_TablePropName="KitList" msprop:Generator_RowDeletingName="KitListRowDeleting" msprop:Generator_RowChangingName="KitListRowChanging" msprop:Generator_RowEvHandlerName="KitListRowChangeEventHandler" msprop:Generator_RowDeletedName="KitListRowDeleted" msprop:Generator_RowClassName="KitListRow" msprop:Generator_UserTableName="KitList" msprop:Generator_RowEvArgName="KitListRowChangeEvent">
+        <xs:element name="KitList" msprop:Generator_TableClassName="KitListDataTable" msprop:Generator_TableVarName="tableKitList" msprop:Generator_TablePropName="KitList" msprop:Generator_RowDeletingName="KitListRowDeleting" msprop:Generator_RowChangingName="KitListRowChanging" msprop:Generator_RowEvHandlerName="KitListRowChangeEventHandler" msprop:Generator_RowDeletedName="KitListRowDeleted" msprop:Generator_UserTableName="KitList" msprop:Generator_RowChangedName="KitListRowChanged" msprop:Generator_RowEvArgName="KitListRowChangeEvent" msprop:Generator_RowClassName="KitListRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="KitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnKitID" msprop:Generator_ColumnPropNameInRow="KitID" msprop:Generator_ColumnPropNameInTable="KitIDColumn" msprop:Generator_UserColumnName="KitID" type="xs:int" />
@@ -4372,7 +4381,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Nesting" msprop:Generator_TableClassName="NestingDataTable" msprop:Generator_TableVarName="tableNesting" msprop:Generator_TablePropName="Nesting" msprop:Generator_RowDeletingName="NestingRowDeleting" msprop:Generator_RowChangingName="NestingRowChanging" msprop:Generator_RowEvHandlerName="NestingRowChangeEventHandler" msprop:Generator_RowDeletedName="NestingRowDeleted" msprop:Generator_UserTableName="Nesting" msprop:Generator_RowChangedName="NestingRowChanged" msprop:Generator_RowEvArgName="NestingRowChangeEvent" msprop:Generator_RowClassName="NestingRow">
+        <xs:element name="Nesting" msprop:Generator_TableClassName="NestingDataTable" msprop:Generator_TableVarName="tableNesting" msprop:Generator_RowChangedName="NestingRowChanged" msprop:Generator_TablePropName="Nesting" msprop:Generator_RowDeletingName="NestingRowDeleting" msprop:Generator_RowChangingName="NestingRowChanging" msprop:Generator_RowEvHandlerName="NestingRowChangeEventHandler" msprop:Generator_RowDeletedName="NestingRowDeleted" msprop:Generator_RowClassName="NestingRow" msprop:Generator_UserTableName="Nesting" msprop:Generator_RowEvArgName="NestingRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -4381,7 +4390,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ImportLog" msprop:Generator_TableClassName="ImportLogDataTable" msprop:Generator_TableVarName="tableImportLog" msprop:Generator_TablePropName="ImportLog" msprop:Generator_RowDeletingName="ImportLogRowDeleting" msprop:Generator_RowChangingName="ImportLogRowChanging" msprop:Generator_RowEvHandlerName="ImportLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ImportLogRowDeleted" msprop:Generator_UserTableName="ImportLog" msprop:Generator_RowChangedName="ImportLogRowChanged" msprop:Generator_RowEvArgName="ImportLogRowChangeEvent" msprop:Generator_RowClassName="ImportLogRow">
+        <xs:element name="ImportLog" msprop:Generator_TableClassName="ImportLogDataTable" msprop:Generator_TableVarName="tableImportLog" msprop:Generator_RowChangedName="ImportLogRowChanged" msprop:Generator_TablePropName="ImportLog" msprop:Generator_RowDeletingName="ImportLogRowDeleting" msprop:Generator_RowChangingName="ImportLogRowChanging" msprop:Generator_RowEvHandlerName="ImportLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ImportLogRowDeleted" msprop:Generator_RowClassName="ImportLogRow" msprop:Generator_UserTableName="ImportLog" msprop:Generator_RowEvArgName="ImportLogRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="NumLog" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnNumLog" msprop:Generator_ColumnPropNameInRow="NumLog" msprop:Generator_ColumnPropNameInTable="NumLogColumn" msprop:Generator_UserColumnName="NumLog" type="xs:int" />
@@ -4412,7 +4421,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="BinList" msprop:Generator_TableClassName="BinListDataTable" msprop:Generator_TableVarName="tableBinList" msprop:Generator_TablePropName="BinList" msprop:Generator_RowDeletingName="BinListRowDeleting" msprop:Generator_RowChangingName="BinListRowChanging" msprop:Generator_RowEvHandlerName="BinListRowChangeEventHandler" msprop:Generator_RowDeletedName="BinListRowDeleted" msprop:Generator_UserTableName="BinList" msprop:Generator_RowChangedName="BinListRowChanged" msprop:Generator_RowEvArgName="BinListRowChangeEvent" msprop:Generator_RowClassName="BinListRow">
+        <xs:element name="BinList" msprop:Generator_TableClassName="BinListDataTable" msprop:Generator_TableVarName="tableBinList" msprop:Generator_RowChangedName="BinListRowChanged" msprop:Generator_TablePropName="BinList" msprop:Generator_RowDeletingName="BinListRowDeleting" msprop:Generator_RowChangingName="BinListRowChanging" msprop:Generator_RowEvHandlerName="BinListRowChangeEventHandler" msprop:Generator_RowDeletedName="BinListRowDeleted" msprop:Generator_RowClassName="BinListRow" msprop:Generator_UserTableName="BinList" msprop:Generator_RowEvArgName="BinListRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BinID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -4420,7 +4429,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="FinalKit" msprop:Generator_TableClassName="FinalKitDataTable" msprop:Generator_TableVarName="tableFinalKit" msprop:Generator_RowChangedName="FinalKitRowChanged" msprop:Generator_TablePropName="FinalKit" msprop:Generator_RowDeletingName="FinalKitRowDeleting" msprop:Generator_RowChangingName="FinalKitRowChanging" msprop:Generator_RowEvHandlerName="FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="FinalKitRowDeleted" msprop:Generator_RowClassName="FinalKitRow" msprop:Generator_UserTableName="FinalKit" msprop:Generator_RowEvArgName="FinalKitRowChangeEvent">
+        <xs:element name="FinalKit" msprop:Generator_TableClassName="FinalKitDataTable" msprop:Generator_TableVarName="tableFinalKit" msprop:Generator_TablePropName="FinalKit" msprop:Generator_RowDeletingName="FinalKitRowDeleting" msprop:Generator_RowChangingName="FinalKitRowChanging" msprop:Generator_RowEvHandlerName="FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="FinalKitRowDeleted" msprop:Generator_UserTableName="FinalKit" msprop:Generator_RowChangedName="FinalKitRowChanged" msprop:Generator_RowEvArgName="FinalKitRowChangeEvent" msprop:Generator_RowClassName="FinalKitRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="FinalKitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnFinalKitID" msprop:Generator_ColumnPropNameInRow="FinalKitID" msprop:Generator_ColumnPropNameInTable="FinalKitIDColumn" msprop:Generator_UserColumnName="FinalKitID" type="xs:int" />
@@ -4436,7 +4445,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Order2FinalKit" msprop:Generator_TableClassName="Order2FinalKitDataTable" msprop:Generator_TableVarName="tableOrder2FinalKit" msprop:Generator_RowChangedName="Order2FinalKitRowChanged" msprop:Generator_TablePropName="Order2FinalKit" msprop:Generator_RowDeletingName="Order2FinalKitRowDeleting" msprop:Generator_RowChangingName="Order2FinalKitRowChanging" msprop:Generator_RowEvHandlerName="Order2FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="Order2FinalKitRowDeleted" msprop:Generator_RowClassName="Order2FinalKitRow" msprop:Generator_UserTableName="Order2FinalKit" msprop:Generator_RowEvArgName="Order2FinalKitRowChangeEvent">
+        <xs:element name="Order2FinalKit" msprop:Generator_TableClassName="Order2FinalKitDataTable" msprop:Generator_TableVarName="tableOrder2FinalKit" msprop:Generator_TablePropName="Order2FinalKit" msprop:Generator_RowDeletingName="Order2FinalKitRowDeleting" msprop:Generator_RowChangingName="Order2FinalKitRowChanging" msprop:Generator_RowEvHandlerName="Order2FinalKitRowChangeEventHandler" msprop:Generator_RowDeletedName="Order2FinalKitRowDeleted" msprop:Generator_UserTableName="Order2FinalKit" msprop:Generator_RowChangedName="Order2FinalKitRowChanged" msprop:Generator_RowEvArgName="Order2FinalKitRowChangeEvent" msprop:Generator_RowClassName="Order2FinalKitRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="FinalKitID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnFinalKitID" msprop:Generator_ColumnPropNameInRow="FinalKitID" msprop:Generator_ColumnPropNameInTable="FinalKitIDColumn" msprop:Generator_UserColumnName="FinalKitID" type="xs:int" />
@@ -4444,7 +4453,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Counters" msprop:Generator_TableClassName="CountersDataTable" msprop:Generator_TableVarName="tableCounters" msprop:Generator_TablePropName="Counters" msprop:Generator_RowDeletingName="CountersRowDeleting" msprop:Generator_RowChangingName="CountersRowChanging" msprop:Generator_RowEvHandlerName="CountersRowChangeEventHandler" msprop:Generator_RowDeletedName="CountersRowDeleted" msprop:Generator_UserTableName="Counters" msprop:Generator_RowChangedName="CountersRowChanged" msprop:Generator_RowEvArgName="CountersRowChangeEvent" msprop:Generator_RowClassName="CountersRow">
+        <xs:element name="Counters" msprop:Generator_TableClassName="CountersDataTable" msprop:Generator_TableVarName="tableCounters" msprop:Generator_RowChangedName="CountersRowChanged" msprop:Generator_TablePropName="Counters" msprop:Generator_RowDeletingName="CountersRowDeleting" msprop:Generator_RowChangingName="CountersRowChanging" msprop:Generator_RowEvHandlerName="CountersRowChangeEventHandler" msprop:Generator_RowDeletedName="CountersRowDeleted" msprop:Generator_RowClassName="CountersRow" msprop:Generator_UserTableName="Counters" msprop:Generator_RowEvArgName="CountersRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CountType" msprop:Generator_ColumnVarNameInTable="columnCountType" msprop:Generator_ColumnPropNameInRow="CountType" msprop:Generator_ColumnPropNameInTable="CountTypeColumn" msprop:Generator_UserColumnName="CountType">
@@ -4472,7 +4481,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ErrorsLog" msprop:Generator_TableClassName="ErrorsLogDataTable" msprop:Generator_TableVarName="tableErrorsLog" msprop:Generator_RowChangedName="ErrorsLogRowChanged" msprop:Generator_TablePropName="ErrorsLog" msprop:Generator_RowDeletingName="ErrorsLogRowDeleting" msprop:Generator_RowChangingName="ErrorsLogRowChanging" msprop:Generator_RowEvHandlerName="ErrorsLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ErrorsLogRowDeleted" msprop:Generator_RowClassName="ErrorsLogRow" msprop:Generator_UserTableName="ErrorsLog" msprop:Generator_RowEvArgName="ErrorsLogRowChangeEvent">
+        <xs:element name="ErrorsLog" msprop:Generator_TableClassName="ErrorsLogDataTable" msprop:Generator_TableVarName="tableErrorsLog" msprop:Generator_TablePropName="ErrorsLog" msprop:Generator_RowDeletingName="ErrorsLogRowDeleting" msprop:Generator_RowChangingName="ErrorsLogRowChanging" msprop:Generator_RowEvHandlerName="ErrorsLogRowChangeEventHandler" msprop:Generator_RowDeletedName="ErrorsLogRowDeleted" msprop:Generator_UserTableName="ErrorsLog" msprop:Generator_RowChangedName="ErrorsLogRowChanged" msprop:Generator_RowEvArgName="ErrorsLogRowChangeEvent" msprop:Generator_RowClassName="ErrorsLogRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ErrID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnErrID" msprop:Generator_ColumnPropNameInRow="ErrID" msprop:Generator_ColumnPropNameInTable="ErrIDColumn" msprop:Generator_UserColumnName="ErrID" type="xs:int" />
@@ -4508,7 +4517,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ItemValidation" msprop:Generator_TableClassName="ItemValidationDataTable" msprop:Generator_TableVarName="tableItemValidation" msprop:Generator_RowChangedName="ItemValidationRowChanged" msprop:Generator_TablePropName="ItemValidation" msprop:Generator_RowDeletingName="ItemValidationRowDeleting" msprop:Generator_RowChangingName="ItemValidationRowChanging" msprop:Generator_RowEvHandlerName="ItemValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemValidationRowDeleted" msprop:Generator_RowClassName="ItemValidationRow" msprop:Generator_UserTableName="ItemValidation" msprop:Generator_RowEvArgName="ItemValidationRowChangeEvent">
+        <xs:element name="ItemValidation" msprop:Generator_TableClassName="ItemValidationDataTable" msprop:Generator_TableVarName="tableItemValidation" msprop:Generator_TablePropName="ItemValidation" msprop:Generator_RowDeletingName="ItemValidationRowDeleting" msprop:Generator_RowChangingName="ItemValidationRowChanging" msprop:Generator_RowEvHandlerName="ItemValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemValidationRowDeleted" msprop:Generator_UserTableName="ItemValidation" msprop:Generator_RowChangedName="ItemValidationRowChanged" msprop:Generator_RowEvArgName="ItemValidationRowChangeEvent" msprop:Generator_RowClassName="ItemValidationRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
@@ -4524,7 +4533,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PartValidPareto" msprop:Generator_TableClassName="PartValidParetoDataTable" msprop:Generator_TableVarName="tablePartValidPareto" msprop:Generator_TablePropName="PartValidPareto" msprop:Generator_RowDeletingName="PartValidParetoRowDeleting" msprop:Generator_RowChangingName="PartValidParetoRowChanging" msprop:Generator_RowEvHandlerName="PartValidParetoRowChangeEventHandler" msprop:Generator_RowDeletedName="PartValidParetoRowDeleted" msprop:Generator_UserTableName="PartValidPareto" msprop:Generator_RowChangedName="PartValidParetoRowChanged" msprop:Generator_RowEvArgName="PartValidParetoRowChangeEvent" msprop:Generator_RowClassName="PartValidParetoRow">
+        <xs:element name="PartValidPareto" msprop:Generator_TableClassName="PartValidParetoDataTable" msprop:Generator_TableVarName="tablePartValidPareto" msprop:Generator_RowChangedName="PartValidParetoRowChanged" msprop:Generator_TablePropName="PartValidPareto" msprop:Generator_RowDeletingName="PartValidParetoRowDeleting" msprop:Generator_RowChangingName="PartValidParetoRowChanging" msprop:Generator_RowEvHandlerName="PartValidParetoRowChangeEventHandler" msprop:Generator_RowDeletedName="PartValidParetoRowDeleted" msprop:Generator_RowClassName="PartValidParetoRow" msprop:Generator_UserTableName="PartValidPareto" msprop:Generator_RowEvArgName="PartValidParetoRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="TotParts" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTotParts" msprop:Generator_ColumnPropNameInRow="TotParts" msprop:Generator_ColumnPropNameInTable="TotPartsColumn" msprop:Generator_UserColumnName="TotParts" type="xs:int" minOccurs="0" />
@@ -4534,7 +4543,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="UnloadStats" msprop:Generator_TableClassName="UnloadStatsDataTable" msprop:Generator_TableVarName="tableUnloadStats" msprop:Generator_TablePropName="UnloadStats" msprop:Generator_RowDeletingName="UnloadStatsRowDeleting" msprop:Generator_RowChangingName="UnloadStatsRowChanging" msprop:Generator_RowEvHandlerName="UnloadStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="UnloadStatsRowDeleted" msprop:Generator_UserTableName="UnloadStats" msprop:Generator_RowChangedName="UnloadStatsRowChanged" msprop:Generator_RowEvArgName="UnloadStatsRowChangeEvent" msprop:Generator_RowClassName="UnloadStatsRow">
+        <xs:element name="UnloadStats" msprop:Generator_TableClassName="UnloadStatsDataTable" msprop:Generator_TableVarName="tableUnloadStats" msprop:Generator_RowChangedName="UnloadStatsRowChanged" msprop:Generator_TablePropName="UnloadStats" msprop:Generator_RowDeletingName="UnloadStatsRowDeleting" msprop:Generator_RowChangingName="UnloadStatsRowChanging" msprop:Generator_RowEvHandlerName="UnloadStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="UnloadStatsRowDeleted" msprop:Generator_RowClassName="UnloadStatsRow" msprop:Generator_UserTableName="UnloadStats" msprop:Generator_RowEvArgName="UnloadStatsRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="Stat" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnStat" msprop:Generator_ColumnPropNameInRow="Stat" msprop:Generator_ColumnPropNameInTable="StatColumn" msprop:Generator_UserColumnName="Stat" minOccurs="0">
@@ -4551,7 +4560,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Remnants" msprop:Generator_TableClassName="RemnantsDataTable" msprop:Generator_TableVarName="tableRemnants" msprop:Generator_RowChangedName="RemnantsRowChanged" msprop:Generator_TablePropName="Remnants" msprop:Generator_RowDeletingName="RemnantsRowDeleting" msprop:Generator_RowChangingName="RemnantsRowChanging" msprop:Generator_RowEvHandlerName="RemnantsRowChangeEventHandler" msprop:Generator_RowDeletedName="RemnantsRowDeleted" msprop:Generator_RowClassName="RemnantsRow" msprop:Generator_UserTableName="Remnants" msprop:Generator_RowEvArgName="RemnantsRowChangeEvent">
+        <xs:element name="Remnants" msprop:Generator_TableClassName="RemnantsDataTable" msprop:Generator_TableVarName="tableRemnants" msprop:Generator_TablePropName="Remnants" msprop:Generator_RowDeletingName="RemnantsRowDeleting" msprop:Generator_RowChangingName="RemnantsRowChanging" msprop:Generator_RowEvHandlerName="RemnantsRowChangeEventHandler" msprop:Generator_RowDeletedName="RemnantsRowDeleted" msprop:Generator_UserTableName="Remnants" msprop:Generator_RowChangedName="RemnantsRowChanged" msprop:Generator_RowEvArgName="RemnantsRowChangeEvent" msprop:Generator_RowClassName="RemnantsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="RemnantID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnRemnantID" msprop:Generator_ColumnPropNameInRow="RemnantID" msprop:Generator_ColumnPropNameInTable="RemnantIDColumn" msprop:Generator_UserColumnName="RemnantID" type="xs:int" />
@@ -4564,7 +4573,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="CartOnKit" msprop:Generator_TableClassName="CartOnKitDataTable" msprop:Generator_TableVarName="tableCartOnKit" msprop:Generator_RowChangedName="CartOnKitRowChanged" msprop:Generator_TablePropName="CartOnKit" msprop:Generator_RowDeletingName="CartOnKitRowDeleting" msprop:Generator_RowChangingName="CartOnKitRowChanging" msprop:Generator_RowEvHandlerName="CartOnKitRowChangeEventHandler" msprop:Generator_RowDeletedName="CartOnKitRowDeleted" msprop:Generator_RowClassName="CartOnKitRow" msprop:Generator_UserTableName="CartOnKit" msprop:Generator_RowEvArgName="CartOnKitRowChangeEvent">
+        <xs:element name="CartOnKit" msprop:Generator_TableClassName="CartOnKitDataTable" msprop:Generator_TableVarName="tableCartOnKit" msprop:Generator_TablePropName="CartOnKit" msprop:Generator_RowDeletingName="CartOnKitRowDeleting" msprop:Generator_RowChangingName="CartOnKitRowChanging" msprop:Generator_RowEvHandlerName="CartOnKitRowChangeEventHandler" msprop:Generator_RowDeletedName="CartOnKitRowDeleted" msprop:Generator_UserTableName="CartOnKit" msprop:Generator_RowChangedName="CartOnKitRowChanged" msprop:Generator_RowEvArgName="CartOnKitRowChangeEvent" msprop:Generator_RowClassName="CartOnKitRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CartID" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" />
@@ -4613,7 +4622,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_RowClassName="PackListRow" msprop:Generator_UserTableName="PackList" msprop:Generator_RowEvArgName="PackListRowChangeEvent">
+        <xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_UserTableName="PackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_RowEvArgName="PackListRowChangeEvent" msprop:Generator_RowClassName="PackListRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -4642,7 +4651,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OtherItem" msprop:Generator_TableClassName="OtherItemDataTable" msprop:Generator_TableVarName="tableOtherItem" msprop:Generator_RowChangedName="OtherItemRowChanged" msprop:Generator_TablePropName="OtherItem" msprop:Generator_RowDeletingName="OtherItemRowDeleting" msprop:Generator_RowChangingName="OtherItemRowChanging" msprop:Generator_RowEvHandlerName="OtherItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OtherItemRowDeleted" msprop:Generator_RowClassName="OtherItemRow" msprop:Generator_UserTableName="OtherItem" msprop:Generator_RowEvArgName="OtherItemRowChangeEvent">
+        <xs:element name="OtherItem" msprop:Generator_TableClassName="OtherItemDataTable" msprop:Generator_TableVarName="tableOtherItem" msprop:Generator_TablePropName="OtherItem" msprop:Generator_RowDeletingName="OtherItemRowDeleting" msprop:Generator_RowChangingName="OtherItemRowChanging" msprop:Generator_RowEvHandlerName="OtherItemRowChangeEventHandler" msprop:Generator_RowDeletedName="OtherItemRowDeleted" msprop:Generator_UserTableName="OtherItem" msprop:Generator_RowChangedName="OtherItemRowChanged" msprop:Generator_RowEvArgName="OtherItemRowChangeEvent" msprop:Generator_RowClassName="OtherItemRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OtherItemID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -4684,7 +4693,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="ItemSearchDetail" msprop:Generator_TableClassName="ItemSearchDetailDataTable" msprop:Generator_TableVarName="tableItemSearchDetail" msprop:Generator_TablePropName="ItemSearchDetail" msprop:Generator_RowDeletingName="ItemSearchDetailRowDeleting" msprop:Generator_RowChangingName="ItemSearchDetailRowChanging" msprop:Generator_RowEvHandlerName="ItemSearchDetailRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemSearchDetailRowDeleted" msprop:Generator_UserTableName="ItemSearchDetail" msprop:Generator_RowChangedName="ItemSearchDetailRowChanged" msprop:Generator_RowEvArgName="ItemSearchDetailRowChangeEvent" msprop:Generator_RowClassName="ItemSearchDetailRow">
+        <xs:element name="ItemSearchDetail" msprop:Generator_TableClassName="ItemSearchDetailDataTable" msprop:Generator_TableVarName="tableItemSearchDetail" msprop:Generator_RowChangedName="ItemSearchDetailRowChanged" msprop:Generator_TablePropName="ItemSearchDetail" msprop:Generator_RowDeletingName="ItemSearchDetailRowDeleting" msprop:Generator_RowChangingName="ItemSearchDetailRowChanging" msprop:Generator_RowEvHandlerName="ItemSearchDetailRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemSearchDetailRowDeleted" msprop:Generator_RowClassName="ItemSearchDetailRow" msprop:Generator_UserTableName="ItemSearchDetail" msprop:Generator_RowEvArgName="ItemSearchDetailRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ItemID" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -4795,7 +4804,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PackListDet" msprop:Generator_TableClassName="PackListDetDataTable" msprop:Generator_TableVarName="tablePackListDet" msprop:Generator_TablePropName="PackListDet" msprop:Generator_RowDeletingName="PackListDetRowDeleting" msprop:Generator_RowChangingName="PackListDetRowChanging" msprop:Generator_RowEvHandlerName="PackListDetRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListDetRowDeleted" msprop:Generator_UserTableName="PackListDet" msprop:Generator_RowChangedName="PackListDetRowChanged" msprop:Generator_RowEvArgName="PackListDetRowChangeEvent" msprop:Generator_RowClassName="PackListDetRow">
+        <xs:element name="PackListDet" msprop:Generator_TableClassName="PackListDetDataTable" msprop:Generator_TableVarName="tablePackListDet" msprop:Generator_RowChangedName="PackListDetRowChanged" msprop:Generator_TablePropName="PackListDet" msprop:Generator_RowDeletingName="PackListDetRowDeleting" msprop:Generator_RowChangingName="PackListDetRowChanging" msprop:Generator_RowEvHandlerName="PackListDetRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListDetRowDeleted" msprop:Generator_RowClassName="PackListDetRow" msprop:Generator_UserTableName="PackListDet" msprop:Generator_RowEvArgName="PackListDetRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -4858,7 +4867,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PackLog" msprop:Generator_TableClassName="PackLogDataTable" msprop:Generator_TableVarName="tablePackLog" msprop:Generator_TablePropName="PackLog" msprop:Generator_RowDeletingName="PackLogRowDeleting" msprop:Generator_RowChangingName="PackLogRowChanging" msprop:Generator_RowEvHandlerName="PackLogRowChangeEventHandler" msprop:Generator_RowDeletedName="PackLogRowDeleted" msprop:Generator_UserTableName="PackLog" msprop:Generator_RowChangedName="PackLogRowChanged" msprop:Generator_RowEvArgName="PackLogRowChangeEvent" msprop:Generator_RowClassName="PackLogRow">
+        <xs:element name="PackLog" msprop:Generator_TableClassName="PackLogDataTable" msprop:Generator_TableVarName="tablePackLog" msprop:Generator_RowChangedName="PackLogRowChanged" msprop:Generator_TablePropName="PackLog" msprop:Generator_RowDeletingName="PackLogRowDeleting" msprop:Generator_RowChangingName="PackLogRowChanging" msprop:Generator_RowEvHandlerName="PackLogRowChangeEventHandler" msprop:Generator_RowDeletedName="PackLogRowDeleted" msprop:Generator_RowClassName="PackLogRow" msprop:Generator_UserTableName="PackLog" msprop:Generator_RowEvArgName="PackLogRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PLogID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnPLogID" msprop:Generator_ColumnPropNameInRow="PLogID" msprop:Generator_ColumnPropNameInTable="PLogIDColumn" msprop:Generator_UserColumnName="PLogID" type="xs:int" />
@@ -4903,7 +4912,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="PackCheck" msprop:Generator_TableClassName="PackCheckDataTable" msprop:Generator_TableVarName="tablePackCheck" msprop:Generator_TablePropName="PackCheck" msprop:Generator_RowDeletingName="PackCheckRowDeleting" msprop:Generator_RowChangingName="PackCheckRowChanging" msprop:Generator_RowEvHandlerName="PackCheckRowChangeEventHandler" msprop:Generator_RowDeletedName="PackCheckRowDeleted" msprop:Generator_UserTableName="PackCheck" msprop:Generator_RowChangedName="PackCheckRowChanged" msprop:Generator_RowEvArgName="PackCheckRowChangeEvent" msprop:Generator_RowClassName="PackCheckRow">
+        <xs:element name="PackCheck" msprop:Generator_TableClassName="PackCheckDataTable" msprop:Generator_TableVarName="tablePackCheck" msprop:Generator_RowChangedName="PackCheckRowChanged" msprop:Generator_TablePropName="PackCheck" msprop:Generator_RowDeletingName="PackCheckRowDeleting" msprop:Generator_RowChangingName="PackCheckRowChanging" msprop:Generator_RowEvHandlerName="PackCheckRowChangeEventHandler" msprop:Generator_RowDeletedName="PackCheckRowDeleted" msprop:Generator_RowClassName="PackCheckRow" msprop:Generator_UserTableName="PackCheck" msprop:Generator_RowEvArgName="PackCheckRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="CartID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnCartID" msprop:Generator_ColumnPropNameInRow="CartID" msprop:Generator_ColumnPropNameInTable="CartIDColumn" msprop:Generator_UserColumnName="CartID" type="xs:int" minOccurs="0" />
@@ -4929,7 +4938,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OKIB" msprop:Generator_TableClassName="OKIBDataTable" msprop:Generator_TableVarName="tableOKIB" msprop:Generator_RowChangedName="OKIBRowChanged" msprop:Generator_TablePropName="OKIB" msprop:Generator_RowDeletingName="OKIBRowDeleting" msprop:Generator_RowChangingName="OKIBRowChanging" msprop:Generator_RowEvHandlerName="OKIBRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIBRowDeleted" msprop:Generator_RowClassName="OKIBRow" msprop:Generator_UserTableName="OKIB" msprop:Generator_RowEvArgName="OKIBRowChangeEvent">
+        <xs:element name="OKIB" msprop:Generator_TableClassName="OKIBDataTable" msprop:Generator_TableVarName="tableOKIB" msprop:Generator_TablePropName="OKIB" msprop:Generator_RowDeletingName="OKIBRowDeleting" msprop:Generator_RowChangingName="OKIBRowChanging" msprop:Generator_RowEvHandlerName="OKIBRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIBRowDeleted" msprop:Generator_UserTableName="OKIB" msprop:Generator_RowChangedName="OKIBRowChanged" msprop:Generator_RowEvArgName="OKIBRowChangeEvent" msprop:Generator_RowClassName="OKIBRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ItemID" msprop:Generator_ColumnVarNameInTable="columnItemID" msprop:Generator_ColumnPropNameInRow="ItemID" msprop:Generator_ColumnPropNameInTable="ItemIDColumn" msprop:Generator_UserColumnName="ItemID" type="xs:int" />
@@ -5022,7 +5031,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OKIB_Sum" msprop:Generator_TableClassName="OKIB_SumDataTable" msprop:Generator_TableVarName="tableOKIB_Sum" msprop:Generator_TablePropName="OKIB_Sum" msprop:Generator_RowDeletingName="OKIB_SumRowDeleting" msprop:Generator_RowChangingName="OKIB_SumRowChanging" msprop:Generator_RowEvHandlerName="OKIB_SumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIB_SumRowDeleted" msprop:Generator_UserTableName="OKIB_Sum" msprop:Generator_RowChangedName="OKIB_SumRowChanged" msprop:Generator_RowEvArgName="OKIB_SumRowChangeEvent" msprop:Generator_RowClassName="OKIB_SumRow">
+        <xs:element name="OKIB_Sum" msprop:Generator_TableClassName="OKIB_SumDataTable" msprop:Generator_TableVarName="tableOKIB_Sum" msprop:Generator_RowChangedName="OKIB_SumRowChanged" msprop:Generator_TablePropName="OKIB_Sum" msprop:Generator_RowDeletingName="OKIB_SumRowDeleting" msprop:Generator_RowChangingName="OKIB_SumRowChanging" msprop:Generator_RowEvHandlerName="OKIB_SumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKIB_SumRowDeleted" msprop:Generator_RowClassName="OKIB_SumRow" msprop:Generator_UserTableName="OKIB_Sum" msprop:Generator_RowEvArgName="OKIB_SumRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BinID" msprop:Generator_ColumnVarNameInTable="columnBinID" msprop:Generator_ColumnPropNameInRow="BinID" msprop:Generator_ColumnPropNameInTable="BinIDColumn" msprop:Generator_UserColumnName="BinID" type="xs:int" />
@@ -5085,7 +5094,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OKOI" msprop:Generator_TableClassName="OKOIDataTable" msprop:Generator_TableVarName="tableOKOI" msprop:Generator_TablePropName="OKOI" msprop:Generator_RowDeletingName="OKOIRowDeleting" msprop:Generator_RowChangingName="OKOIRowChanging" msprop:Generator_RowEvHandlerName="OKOIRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOIRowDeleted" msprop:Generator_UserTableName="OKOI" msprop:Generator_RowChangedName="OKOIRowChanged" msprop:Generator_RowEvArgName="OKOIRowChangeEvent" msprop:Generator_RowClassName="OKOIRow">
+        <xs:element name="OKOI" msprop:Generator_TableClassName="OKOIDataTable" msprop:Generator_TableVarName="tableOKOI" msprop:Generator_RowChangedName="OKOIRowChanged" msprop:Generator_TablePropName="OKOI" msprop:Generator_RowDeletingName="OKOIRowDeleting" msprop:Generator_RowChangingName="OKOIRowChanging" msprop:Generator_RowEvHandlerName="OKOIRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOIRowDeleted" msprop:Generator_RowClassName="OKOIRow" msprop:Generator_UserTableName="OKOI" msprop:Generator_RowEvArgName="OKOIRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OtherItemID" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -5144,7 +5153,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OKOI_sum" msprop:Generator_TableClassName="OKOI_sumDataTable" msprop:Generator_TableVarName="tableOKOI_sum" msprop:Generator_TablePropName="OKOI_sum" msprop:Generator_RowDeletingName="OKOI_sumRowDeleting" msprop:Generator_RowChangingName="OKOI_sumRowChanging" msprop:Generator_RowEvHandlerName="OKOI_sumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOI_sumRowDeleted" msprop:Generator_UserTableName="OKOI_sum" msprop:Generator_RowChangedName="OKOI_sumRowChanged" msprop:Generator_RowEvArgName="OKOI_sumRowChangeEvent" msprop:Generator_RowClassName="OKOI_sumRow">
+        <xs:element name="OKOI_sum" msprop:Generator_TableClassName="OKOI_sumDataTable" msprop:Generator_TableVarName="tableOKOI_sum" msprop:Generator_RowChangedName="OKOI_sumRowChanged" msprop:Generator_TablePropName="OKOI_sum" msprop:Generator_RowDeletingName="OKOI_sumRowDeleting" msprop:Generator_RowChangingName="OKOI_sumRowChanging" msprop:Generator_RowEvHandlerName="OKOI_sumRowChangeEventHandler" msprop:Generator_RowDeletedName="OKOI_sumRowDeleted" msprop:Generator_RowClassName="OKOI_sumRow" msprop:Generator_UserTableName="OKOI_sum" msprop:Generator_RowEvArgName="OKOI_sumRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OtherItemID" msprop:Generator_ColumnVarNameInTable="columnOtherItemID" msprop:Generator_ColumnPropNameInRow="OtherItemID" msprop:Generator_ColumnPropNameInTable="OtherItemIDColumn" msprop:Generator_UserColumnName="OtherItemID" type="xs:int" />
@@ -5193,7 +5202,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Pack2Cart" msprop:Generator_TableClassName="Pack2CartDataTable" msprop:Generator_TableVarName="tablePack2Cart" msprop:Generator_RowChangedName="Pack2CartRowChanged" msprop:Generator_TablePropName="Pack2Cart" msprop:Generator_RowDeletingName="Pack2CartRowDeleting" msprop:Generator_RowChangingName="Pack2CartRowChanging" msprop:Generator_RowEvHandlerName="Pack2CartRowChangeEventHandler" msprop:Generator_RowDeletedName="Pack2CartRowDeleted" msprop:Generator_RowClassName="Pack2CartRow" msprop:Generator_UserTableName="Pack2Cart" msprop:Generator_RowEvArgName="Pack2CartRowChangeEvent">
+        <xs:element name="Pack2Cart" msprop:Generator_TableClassName="Pack2CartDataTable" msprop:Generator_TableVarName="tablePack2Cart" msprop:Generator_TablePropName="Pack2Cart" msprop:Generator_RowDeletingName="Pack2CartRowDeleting" msprop:Generator_RowChangingName="Pack2CartRowChanging" msprop:Generator_RowEvHandlerName="Pack2CartRowChangeEventHandler" msprop:Generator_RowDeletedName="Pack2CartRowDeleted" msprop:Generator_UserTableName="Pack2Cart" msprop:Generator_RowChangedName="Pack2CartRowChanged" msprop:Generator_RowEvArgName="Pack2CartRowChangeEvent" msprop:Generator_RowClassName="Pack2CartRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -5232,7 +5241,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="CartIRK" msprop:Generator_TableClassName="CartIRKDataTable" msprop:Generator_TableVarName="tableCartIRK" msprop:Generator_TablePropName="CartIRK" msprop:Generator_RowDeletingName="CartIRKRowDeleting" msprop:Generator_RowChangingName="CartIRKRowChanging" msprop:Generator_RowEvHandlerName="CartIRKRowChangeEventHandler" msprop:Generator_RowDeletedName="CartIRKRowDeleted" msprop:Generator_UserTableName="CartIRK" msprop:Generator_RowChangedName="CartIRKRowChanged" msprop:Generator_RowEvArgName="CartIRKRowChangeEvent" msprop:Generator_RowClassName="CartIRKRow">
+        <xs:element name="CartIRK" msprop:Generator_TableClassName="CartIRKDataTable" msprop:Generator_TableVarName="tableCartIRK" msprop:Generator_RowChangedName="CartIRKRowChanged" msprop:Generator_TablePropName="CartIRK" msprop:Generator_RowDeletingName="CartIRKRowDeleting" msprop:Generator_RowChangingName="CartIRKRowChanging" msprop:Generator_RowEvHandlerName="CartIRKRowChangeEventHandler" msprop:Generator_RowDeletedName="CartIRKRowDeleted" msprop:Generator_RowClassName="CartIRKRow" msprop:Generator_UserTableName="CartIRK" msprop:Generator_RowEvArgName="CartIRKRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="OrderExtCode" msprop:Generator_ColumnVarNameInTable="columnOrderExtCode" msprop:Generator_ColumnPropNameInRow="OrderExtCode" msprop:Generator_ColumnPropNameInTable="OrderExtCodeColumn" msprop:Generator_UserColumnName="OrderExtCode" minOccurs="0">
@@ -5285,7 +5294,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="FileValidation" msprop:Generator_TableClassName="FileValidationDataTable" msprop:Generator_TableVarName="tableFileValidation" msprop:Generator_TablePropName="FileValidation" msprop:Generator_RowDeletingName="FileValidationRowDeleting" msprop:Generator_RowChangingName="FileValidationRowChanging" msprop:Generator_RowEvHandlerName="FileValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="FileValidationRowDeleted" msprop:Generator_UserTableName="FileValidation" msprop:Generator_RowChangedName="FileValidationRowChanged" msprop:Generator_RowEvArgName="FileValidationRowChangeEvent" msprop:Generator_RowClassName="FileValidationRow">
+        <xs:element name="FileValidation" msprop:Generator_TableClassName="FileValidationDataTable" msprop:Generator_TableVarName="tableFileValidation" msprop:Generator_RowChangedName="FileValidationRowChanged" msprop:Generator_TablePropName="FileValidation" msprop:Generator_RowDeletingName="FileValidationRowDeleting" msprop:Generator_RowChangingName="FileValidationRowChanging" msprop:Generator_RowEvHandlerName="FileValidationRowChangeEventHandler" msprop:Generator_RowDeletedName="FileValidationRowDeleted" msprop:Generator_RowClassName="FileValidationRow" msprop:Generator_UserTableName="FileValidation" msprop:Generator_RowEvArgName="FileValidationRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ItemExtCode" msprop:Generator_ColumnVarNameInTable="columnItemExtCode" msprop:Generator_ColumnPropNameInRow="ItemExtCode" msprop:Generator_ColumnPropNameInTable="ItemExtCodeColumn" msprop:Generator_UserColumnName="ItemExtCode">
@@ -5302,7 +5311,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="SheetsPreview" msprop:Generator_TableClassName="SheetsPreviewDataTable" msprop:Generator_TableVarName="tableSheetsPreview" msprop:Generator_RowChangedName="SheetsPreviewRowChanged" msprop:Generator_TablePropName="SheetsPreview" msprop:Generator_RowDeletingName="SheetsPreviewRowDeleting" msprop:Generator_RowChangingName="SheetsPreviewRowChanging" msprop:Generator_RowEvHandlerName="SheetsPreviewRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetsPreviewRowDeleted" msprop:Generator_RowClassName="SheetsPreviewRow" msprop:Generator_UserTableName="SheetsPreview" msprop:Generator_RowEvArgName="SheetsPreviewRowChangeEvent">
+        <xs:element name="SheetsPreview" msprop:Generator_TableClassName="SheetsPreviewDataTable" msprop:Generator_TableVarName="tableSheetsPreview" msprop:Generator_TablePropName="SheetsPreview" msprop:Generator_RowDeletingName="SheetsPreviewRowDeleting" msprop:Generator_RowChangingName="SheetsPreviewRowChanging" msprop:Generator_RowEvHandlerName="SheetsPreviewRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetsPreviewRowDeleted" msprop:Generator_UserTableName="SheetsPreview" msprop:Generator_RowChangedName="SheetsPreviewRowChanged" msprop:Generator_RowEvArgName="SheetsPreviewRowChangeEvent" msprop:Generator_RowClassName="SheetsPreviewRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="SheetID" msprop:Generator_ColumnVarNameInTable="columnSheetID" msprop:Generator_ColumnPropNameInRow="SheetID" msprop:Generator_ColumnPropNameInTable="SheetIDColumn" msprop:Generator_UserColumnName="SheetID" type="xs:int" />
@@ -5315,7 +5324,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="OrderListTree" msprop:Generator_TableClassName="OrderListTreeDataTable" msprop:Generator_TableVarName="tableOrderListTree" msprop:Generator_RowChangedName="OrderListTreeRowChanged" msprop:Generator_TablePropName="OrderListTree" msprop:Generator_RowDeletingName="OrderListTreeRowDeleting" msprop:Generator_RowChangingName="OrderListTreeRowChanging" msprop:Generator_RowEvHandlerName="OrderListTreeRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListTreeRowDeleted" msprop:Generator_RowClassName="OrderListTreeRow" msprop:Generator_UserTableName="OrderListTree" msprop:Generator_RowEvArgName="OrderListTreeRowChangeEvent">
+        <xs:element name="OrderListTree" msprop:Generator_TableClassName="OrderListTreeDataTable" msprop:Generator_TableVarName="tableOrderListTree" msprop:Generator_TablePropName="OrderListTree" msprop:Generator_RowDeletingName="OrderListTreeRowDeleting" msprop:Generator_RowChangingName="OrderListTreeRowChanging" msprop:Generator_RowEvHandlerName="OrderListTreeRowChangeEventHandler" msprop:Generator_RowDeletedName="OrderListTreeRowDeleted" msprop:Generator_UserTableName="OrderListTree" msprop:Generator_RowChangedName="OrderListTreeRowChanged" msprop:Generator_RowEvArgName="OrderListTreeRowChangeEvent" msprop:Generator_RowClassName="OrderListTreeRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -5337,7 +5346,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="Places" msprop:Generator_TableClassName="PlacesDataTable" msprop:Generator_TableVarName="tablePlaces" msprop:Generator_RowChangedName="PlacesRowChanged" msprop:Generator_TablePropName="Places" msprop:Generator_RowDeletingName="PlacesRowDeleting" msprop:Generator_RowChangingName="PlacesRowChanging" msprop:Generator_RowEvHandlerName="PlacesRowChangeEventHandler" msprop:Generator_RowDeletedName="PlacesRowDeleted" msprop:Generator_RowClassName="PlacesRow" msprop:Generator_UserTableName="Places" msprop:Generator_RowEvArgName="PlacesRowChangeEvent">
+        <xs:element name="Places" msprop:Generator_TableClassName="PlacesDataTable" msprop:Generator_TableVarName="tablePlaces" msprop:Generator_TablePropName="Places" msprop:Generator_RowDeletingName="PlacesRowDeleting" msprop:Generator_RowChangingName="PlacesRowChanging" msprop:Generator_RowEvHandlerName="PlacesRowChangeEventHandler" msprop:Generator_RowDeletedName="PlacesRowDeleted" msprop:Generator_UserTableName="Places" msprop:Generator_RowChangedName="PlacesRowChanged" msprop:Generator_RowEvArgName="PlacesRowChangeEvent" msprop:Generator_RowClassName="PlacesRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PlaceCod" msprop:Generator_ColumnVarNameInTable="columnPlaceCod" msprop:Generator_ColumnPropNameInRow="PlaceCod" msprop:Generator_ColumnPropNameInTable="PlaceCodColumn" msprop:Generator_UserColumnName="PlaceCod">
@@ -5365,7 +5374,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="StatusLog" msprop:Generator_TableClassName="StatusLogDataTable" msprop:Generator_TableVarName="tableStatusLog" msprop:Generator_RowChangedName="StatusLogRowChanged" msprop:Generator_TablePropName="StatusLog" msprop:Generator_RowDeletingName="StatusLogRowDeleting" msprop:Generator_RowChangingName="StatusLogRowChanging" msprop:Generator_RowEvHandlerName="StatusLogRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusLogRowDeleted" msprop:Generator_RowClassName="StatusLogRow" msprop:Generator_UserTableName="StatusLog" msprop:Generator_RowEvArgName="StatusLogRowChangeEvent">
+        <xs:element name="StatusLog" msprop:Generator_TableClassName="StatusLogDataTable" msprop:Generator_TableVarName="tableStatusLog" msprop:Generator_TablePropName="StatusLog" msprop:Generator_RowDeletingName="StatusLogRowDeleting" msprop:Generator_RowChangingName="StatusLogRowChanging" msprop:Generator_RowEvHandlerName="StatusLogRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusLogRowDeleted" msprop:Generator_UserTableName="StatusLog" msprop:Generator_RowChangedName="StatusLogRowChanged" msprop:Generator_RowEvArgName="StatusLogRowChangeEvent" msprop:Generator_RowClassName="StatusLogRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PlaceCod" msprop:Generator_ColumnVarNameInTable="columnPlaceCod" msprop:Generator_ColumnPropNameInRow="PlaceCod" msprop:Generator_ColumnPropNameInTable="PlaceCodColumn" msprop:Generator_UserColumnName="PlaceCod">
@@ -5402,7 +5411,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="StatusDecode" msprop:Generator_TableClassName="StatusDecodeDataTable" msprop:Generator_TableVarName="tableStatusDecode" msprop:Generator_TablePropName="StatusDecode" msprop:Generator_RowDeletingName="StatusDecodeRowDeleting" msprop:Generator_RowChangingName="StatusDecodeRowChanging" msprop:Generator_RowEvHandlerName="StatusDecodeRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusDecodeRowDeleted" msprop:Generator_UserTableName="StatusDecode" msprop:Generator_RowChangedName="StatusDecodeRowChanged" msprop:Generator_RowEvArgName="StatusDecodeRowChangeEvent" msprop:Generator_RowClassName="StatusDecodeRow">
+        <xs:element name="StatusDecode" msprop:Generator_TableClassName="StatusDecodeDataTable" msprop:Generator_TableVarName="tableStatusDecode" msprop:Generator_RowChangedName="StatusDecodeRowChanged" msprop:Generator_TablePropName="StatusDecode" msprop:Generator_RowDeletingName="StatusDecodeRowDeleting" msprop:Generator_RowChangingName="StatusDecodeRowChanging" msprop:Generator_RowEvHandlerName="StatusDecodeRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusDecodeRowDeleted" msprop:Generator_RowClassName="StatusDecodeRow" msprop:Generator_UserTableName="StatusDecode" msprop:Generator_RowEvArgName="StatusDecodeRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="Station" msprop:Generator_ColumnVarNameInTable="columnStation" msprop:Generator_ColumnPropNameInRow="Station" msprop:Generator_ColumnPropNameInTable="StationColumn" msprop:Generator_UserColumnName="Station">
@@ -5436,7 +5445,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="UpdMan" msprop:Generator_TableClassName="UpdManDataTable" msprop:Generator_TableVarName="tableUpdMan" msprop:Generator_TablePropName="UpdMan" msprop:Generator_RowDeletingName="UpdManRowDeleting" msprop:Generator_RowChangingName="UpdManRowChanging" msprop:Generator_RowEvHandlerName="UpdManRowChangeEventHandler" msprop:Generator_RowDeletedName="UpdManRowDeleted" msprop:Generator_UserTableName="UpdMan" msprop:Generator_RowChangedName="UpdManRowChanged" msprop:Generator_RowEvArgName="UpdManRowChangeEvent" msprop:Generator_RowClassName="UpdManRow">
+        <xs:element name="UpdMan" msprop:Generator_TableClassName="UpdManDataTable" msprop:Generator_TableVarName="tableUpdMan" msprop:Generator_RowChangedName="UpdManRowChanged" msprop:Generator_TablePropName="UpdMan" msprop:Generator_RowDeletingName="UpdManRowDeleting" msprop:Generator_RowChangingName="UpdManRowChanging" msprop:Generator_RowEvHandlerName="UpdManRowChangeEventHandler" msprop:Generator_RowDeletedName="UpdManRowDeleted" msprop:Generator_RowClassName="UpdManRow" msprop:Generator_UserTableName="UpdMan" msprop:Generator_RowEvArgName="UpdManRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="AppName" msprop:Generator_ColumnVarNameInTable="columnAppName" msprop:Generator_ColumnPropNameInRow="AppName" msprop:Generator_ColumnPropNameInTable="AppNameColumn" msprop:Generator_UserColumnName="AppName">
@@ -5478,7 +5487,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="SheetStats" msprop:Generator_TableClassName="SheetStatsDataTable" msprop:Generator_TableVarName="tableSheetStats" msprop:Generator_RowChangedName="SheetStatsRowChanged" msprop:Generator_TablePropName="SheetStats" msprop:Generator_RowDeletingName="SheetStatsRowDeleting" msprop:Generator_RowChangingName="SheetStatsRowChanging" msprop:Generator_RowEvHandlerName="SheetStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetStatsRowDeleted" msprop:Generator_RowClassName="SheetStatsRow" msprop:Generator_UserTableName="SheetStats" msprop:Generator_RowEvArgName="SheetStatsRowChangeEvent">
+        <xs:element name="SheetStats" msprop:Generator_TableClassName="SheetStatsDataTable" msprop:Generator_TableVarName="tableSheetStats" msprop:Generator_TablePropName="SheetStats" msprop:Generator_RowDeletingName="SheetStatsRowDeleting" msprop:Generator_RowChangingName="SheetStatsRowChanging" msprop:Generator_RowEvHandlerName="SheetStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="SheetStatsRowDeleted" msprop:Generator_UserTableName="SheetStats" msprop:Generator_RowChangedName="SheetStatsRowChanged" msprop:Generator_RowEvArgName="SheetStatsRowChangeEvent" msprop:Generator_RowClassName="SheetStatsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -5491,7 +5500,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="BatchStats" msprop:Generator_TableClassName="BatchStatsDataTable" msprop:Generator_TableVarName="tableBatchStats" msprop:Generator_RowChangedName="BatchStatsRowChanged" msprop:Generator_TablePropName="BatchStats" msprop:Generator_RowDeletingName="BatchStatsRowDeleting" msprop:Generator_RowChangingName="BatchStatsRowChanging" msprop:Generator_RowEvHandlerName="BatchStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchStatsRowDeleted" msprop:Generator_RowClassName="BatchStatsRow" msprop:Generator_UserTableName="BatchStats" msprop:Generator_RowEvArgName="BatchStatsRowChangeEvent">
+        <xs:element name="BatchStats" msprop:Generator_TableClassName="BatchStatsDataTable" msprop:Generator_TableVarName="tableBatchStats" msprop:Generator_TablePropName="BatchStats" msprop:Generator_RowDeletingName="BatchStatsRowDeleting" msprop:Generator_RowChangingName="BatchStatsRowChanging" msprop:Generator_RowEvHandlerName="BatchStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="BatchStatsRowDeleted" msprop:Generator_UserTableName="BatchStats" msprop:Generator_RowChangedName="BatchStatsRowChanged" msprop:Generator_RowEvArgName="BatchStatsRowChangeEvent" msprop:Generator_RowClassName="BatchStatsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="BatchID" msprop:Generator_ColumnVarNameInTable="columnBatchID" msprop:Generator_ColumnPropNameInRow="BatchID" msprop:Generator_ColumnPropNameInTable="BatchIDColumn" msprop:Generator_UserColumnName="BatchID" type="xs:int" />
@@ -5513,7 +5522,7 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="DailyProdStats" msprop:Generator_TableClassName="DailyProdStatsDataTable" msprop:Generator_TableVarName="tableDailyProdStats" msprop:Generator_TablePropName="DailyProdStats" msprop:Generator_RowDeletingName="DailyProdStatsRowDeleting" msprop:Generator_RowChangingName="DailyProdStatsRowChanging" msprop:Generator_RowEvHandlerName="DailyProdStatsRowChangeEventHandler" msprop:Generator_RowDeletedName="DailyProdStatsRowDeleted" msprop:Generator_UserTableName="DailyProdStats" msprop:Generator_RowChangedName="DailyProdStatsRowChanged" msprop:Generator_RowEvArgName="DailyProdStatsRowChangeEvent" msprop:Generator_RowClassName="DailyProdStatsRow">
+        <xs:element name="ProductionStatsDay" msprop:Generator_TableClassName="ProductionStatsDayDataTable" msprop:Generator_TableVarName="tableProductionStatsDay" msprop:Generator_TablePropName="ProductionStatsDay" msprop:Generator_RowDeletingName="ProductionStatsDayRowDeleting" msprop:Generator_RowChangingName="ProductionStatsDayRowChanging" msprop:Generator_RowEvHandlerName="ProductionStatsDayRowChangeEventHandler" msprop:Generator_RowDeletedName="ProductionStatsDayRowDeleted" msprop:Generator_UserTableName="ProductionStatsDay" msprop:Generator_RowChangedName="ProductionStatsDayRowChanged" msprop:Generator_RowEvArgName="ProductionStatsDayRowChangeEvent" msprop:Generator_RowClassName="ProductionStatsDayRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="PlaceCod" msprop:Generator_ColumnVarNameInTable="columnPlaceCod" msprop:Generator_ColumnPropNameInRow="PlaceCod" msprop:Generator_ColumnPropNameInTable="PlaceCodColumn" msprop:Generator_UserColumnName="PlaceCod">
@@ -5523,12 +5532,12 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="DataOraRif" msprop:Generator_ColumnVarNameInTable="columnDataOraRif" msprop:Generator_ColumnPropNameInRow="DataOraRif" msprop:Generator_ColumnPropNameInTable="DataOraRifColumn" msprop:Generator_UserColumnName="DataOraRif" type="xs:dateTime" />
              <xs:element name="DataRif" msprop:Generator_ColumnVarNameInTable="columnDataRif" msprop:Generator_ColumnPropNameInRow="DataRif" msprop:Generator_ColumnPropNameInTable="DataRifColumn" msprop:Generator_UserColumnName="DataRif" type="xs:dateTime" />
-              <xs:element name="ItmProd" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnItmProd" msprop:Generator_ColumnPropNameInRow="ItmProd" msprop:Generator_ColumnPropNameInTable="ItmProdColumn" msprop:Generator_UserColumnName="ItmProd" type="xs:int" minOccurs="0" />
-              <xs:element name="ItmScrap" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnItmScrap" msprop:Generator_ColumnPropNameInRow="ItmScrap" msprop:Generator_ColumnPropNameInTable="ItmScrapColumn" msprop:Generator_UserColumnName="ItmScrap" type="xs:int" minOccurs="0" />
-              <xs:element name="MinRun" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMinRun" msprop:Generator_ColumnPropNameInRow="MinRun" msprop:Generator_ColumnPropNameInTable="MinRunColumn" msprop:Generator_UserColumnName="MinRun" type="xs:long" minOccurs="0" />
-              <xs:element name="MinDisp" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMinDisp" msprop:Generator_ColumnPropNameInRow="MinDisp" msprop:Generator_ColumnPropNameInTable="MinDispColumn" msprop:Generator_UserColumnName="MinDisp" type="xs:int" minOccurs="0" />
+              <xs:element name="DataOraRif" msprop:Generator_ColumnVarNameInTable="columnDataOraRif" msprop:Generator_ColumnPropNameInRow="DataOraRif" msprop:Generator_ColumnPropNameInTable="DataOraRifColumn" msprop:Generator_UserColumnName="DataOraRif" type="xs:dateTime" />
+              <xs:element name="ItmProd" msprop:Generator_ColumnVarNameInTable="columnItmProd" msprop:Generator_ColumnPropNameInRow="ItmProd" msprop:Generator_ColumnPropNameInTable="ItmProdColumn" msprop:Generator_UserColumnName="ItmProd" type="xs:int" />
+              <xs:element name="ItmScrap" msprop:Generator_ColumnVarNameInTable="columnItmScrap" msprop:Generator_ColumnPropNameInRow="ItmScrap" msprop:Generator_ColumnPropNameInTable="ItmScrapColumn" msprop:Generator_UserColumnName="ItmScrap" type="xs:int" />
+              <xs:element name="MinRun" msprop:Generator_ColumnVarNameInTable="columnMinRun" msprop:Generator_ColumnPropNameInRow="MinRun" msprop:Generator_ColumnPropNameInTable="MinRunColumn" msprop:Generator_UserColumnName="MinRun" type="xs:int" />
+              <xs:element name="MinDisp" msprop:Generator_ColumnVarNameInTable="columnMinDisp" msprop:Generator_ColumnPropNameInRow="MinDisp" msprop:Generator_ColumnPropNameInTable="MinDispColumn" msprop:Generator_UserColumnName="MinDisp" type="xs:int" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
@@ -5708,26 +5717,26 @@ SELECT BatchID, Takt, AvgYeld, TotalArea, NumMat, NumSheets, NumModel, NumKit, N
      <xs:selector xpath=".//mstns:BatchStats" />
      <xs:field xpath="mstns:BatchID" />
    </xs:unique>
-    <xs:unique name="DailyProdStatsKey1">
-      <xs:selector xpath=".//mstns:DailyProdStats" />
+    <xs:unique name="ProductionStatsDayKey1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:ProductionStatsDay" />
      <xs:field xpath="mstns:PlaceCod" />
-      <xs:field xpath="mstns:DataOraRif" />
+      <xs:field xpath="mstns:DataRif" />
    </xs:unique>
  </xs:element>
  <xs:annotation>
    <xs:appinfo>
-      <msdata:Relationship name="FK_ItemList_Materials1" msdata:parent="Materials" msdata:child="ItemList" msdata:parentkey="MatID" msdata:childkey="MatID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_Materials1" msprop:Generator_ParentPropName="MaterialsRow" msprop:Generator_RelationVarName="relationFK_ItemList_Materials1" msprop:Generator_UserParentTable="Materials" />
-      <msdata:Relationship name="FK_OffOrd2Item_OfflineOrderList" msdata:parent="OfflineOrderList" msdata:child="OffOrd2Item" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_OfflineOrderList" msprop:Generator_ParentPropName="OfflineOrderListRow" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_OfflineOrderList" msprop:Generator_UserParentTable="OfflineOrderList" />
-      <msdata:Relationship name="FK_ItemList_KitList" msdata:parent="KitList" msdata:child="ItemList" msdata:parentkey="KitID" msdata:childkey="KitID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_KitList" msprop:Generator_ParentPropName="KitListRow" msprop:Generator_RelationVarName="relationFK_ItemList_KitList" msprop:Generator_UserParentTable="KitList" />
-      <msdata:Relationship name="FK_Nesting_ItemList" msdata:parent="ItemList" msdata:child="Nesting" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="Nesting" msprop:Generator_ChildPropName="GetNestingRows" msprop:Generator_UserRelationName="FK_Nesting_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_Nesting_ItemList" msprop:Generator_UserParentTable="ItemList" />
-      <msdata:Relationship name="FK_KitList_Carts" msdata:parent="Carts" msdata:child="KitList" msdata:parentkey="CartID" msdata:childkey="CartID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_Carts" msprop:Generator_ParentPropName="CartsRow" msprop:Generator_RelationVarName="relationFK_KitList_Carts" msprop:Generator_UserParentTable="Carts" />
-      <msdata:Relationship name="FK_KitList_OrderList" msdata:parent="OrderList" msdata:child="KitList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_KitList_OrderList" msprop:Generator_UserParentTable="OrderList" />
-      <msdata:Relationship name="FK_OffOrd2Item_ItemList" msdata:parent="ItemList" msdata:child="OffOrd2Item" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_ItemList" msprop:Generator_UserParentTable="ItemList" />
-      <msdata:Relationship name="FK_BinList_Bins" msdata:parent="Bins" msdata:child="BinList" msdata:parentkey="BinID" msdata:childkey="BinID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_Bins" msprop:Generator_ParentPropName="BinsRow" msprop:Generator_RelationVarName="relationFK_BinList_Bins" msprop:Generator_UserParentTable="Bins" />
-      <msdata:Relationship name="FK_BinList_ItemList" msdata:parent="ItemList" msdata:child="BinList" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_ItemList" msprop:Generator_ParentPropName="ItemListRow" msprop:Generator_RelationVarName="relationFK_BinList_ItemList" msprop:Generator_UserParentTable="ItemList" />
-      <msdata:Relationship name="FK_Order2FinalKit_FinalKit" msdata:parent="FinalKit" msdata:child="Order2FinalKit" msdata:parentkey="FinalKitID" msdata:childkey="FinalKitID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_FinalKit" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_FinalKit" msprop:Generator_UserParentTable="FinalKit" msprop:Generator_ParentPropName="FinalKitRow" />
-      <msdata:Relationship name="FK_Order2FinalKit_OrderList" msdata:parent="OrderList" msdata:child="Order2FinalKit" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_OrderList" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
-      <msdata:Relationship name="FK_StatusLog_Places" msdata:parent="Places" msdata:child="StatusLog" msdata:parentkey="PlaceCod" msdata:childkey="PlaceCod" msprop:Generator_UserChildTable="StatusLog" msprop:Generator_ChildPropName="GetStatusLogRows" msprop:Generator_UserRelationName="FK_StatusLog_Places" msprop:Generator_RelationVarName="relationFK_StatusLog_Places" msprop:Generator_UserParentTable="Places" msprop:Generator_ParentPropName="PlacesRow" />
+      <msdata:Relationship name="FK_ItemList_Materials1" msdata:parent="Materials" msdata:child="ItemList" msdata:parentkey="MatID" msdata:childkey="MatID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_Materials1" msprop:Generator_RelationVarName="relationFK_ItemList_Materials1" msprop:Generator_UserParentTable="Materials" msprop:Generator_ParentPropName="MaterialsRow" />
+      <msdata:Relationship name="FK_OffOrd2Item_OfflineOrderList" msdata:parent="OfflineOrderList" msdata:child="OffOrd2Item" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_OfflineOrderList" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_OfflineOrderList" msprop:Generator_UserParentTable="OfflineOrderList" msprop:Generator_ParentPropName="OfflineOrderListRow" />
+      <msdata:Relationship name="FK_ItemList_KitList" msdata:parent="KitList" msdata:child="ItemList" msdata:parentkey="KitID" msdata:childkey="KitID" msprop:Generator_UserChildTable="ItemList" msprop:Generator_ChildPropName="GetItemListRows" msprop:Generator_UserRelationName="FK_ItemList_KitList" msprop:Generator_RelationVarName="relationFK_ItemList_KitList" msprop:Generator_UserParentTable="KitList" msprop:Generator_ParentPropName="KitListRow" />
+      <msdata:Relationship name="FK_Nesting_ItemList" msdata:parent="ItemList" msdata:child="Nesting" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="Nesting" msprop:Generator_ChildPropName="GetNestingRows" msprop:Generator_UserRelationName="FK_Nesting_ItemList" msprop:Generator_RelationVarName="relationFK_Nesting_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
+      <msdata:Relationship name="FK_KitList_Carts" msdata:parent="Carts" msdata:child="KitList" msdata:parentkey="CartID" msdata:childkey="CartID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_Carts" msprop:Generator_RelationVarName="relationFK_KitList_Carts" msprop:Generator_UserParentTable="Carts" msprop:Generator_ParentPropName="CartsRow" />
+      <msdata:Relationship name="FK_KitList_OrderList" msdata:parent="OrderList" msdata:child="KitList" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="KitList" msprop:Generator_ChildPropName="GetKitListRows" msprop:Generator_UserRelationName="FK_KitList_OrderList" msprop:Generator_RelationVarName="relationFK_KitList_OrderList" msprop:Generator_UserParentTable="OrderList" msprop:Generator_ParentPropName="OrderListRow" />
+      <msdata:Relationship name="FK_OffOrd2Item_ItemList" msdata:parent="ItemList" msdata:child="OffOrd2Item" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="OffOrd2Item" msprop:Generator_ChildPropName="GetOffOrd2ItemRows" msprop:Generator_UserRelationName="FK_OffOrd2Item_ItemList" msprop:Generator_RelationVarName="relationFK_OffOrd2Item_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
+      <msdata:Relationship name="FK_BinList_Bins" msdata:parent="Bins" msdata:child="BinList" msdata:parentkey="BinID" msdata:childkey="BinID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_Bins" msprop:Generator_RelationVarName="relationFK_BinList_Bins" msprop:Generator_UserParentTable="Bins" msprop:Generator_ParentPropName="BinsRow" />
+      <msdata:Relationship name="FK_BinList_ItemList" msdata:parent="ItemList" msdata:child="BinList" msdata:parentkey="ItemID" msdata:childkey="ItemID" msprop:Generator_UserChildTable="BinList" msprop:Generator_ChildPropName="GetBinListRows" msprop:Generator_UserRelationName="FK_BinList_ItemList" msprop:Generator_RelationVarName="relationFK_BinList_ItemList" msprop:Generator_UserParentTable="ItemList" msprop:Generator_ParentPropName="ItemListRow" />
+      <msdata:Relationship name="FK_Order2FinalKit_FinalKit" msdata:parent="FinalKit" msdata:child="Order2FinalKit" msdata:parentkey="FinalKitID" msdata:childkey="FinalKitID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_FinalKit" msprop:Generator_ParentPropName="FinalKitRow" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_FinalKit" msprop:Generator_UserParentTable="FinalKit" />
+      <msdata:Relationship name="FK_Order2FinalKit_OrderList" msdata:parent="OrderList" msdata:child="Order2FinalKit" msdata:parentkey="OrdID" msdata:childkey="OrdID" msprop:Generator_UserChildTable="Order2FinalKit" msprop:Generator_ChildPropName="GetOrder2FinalKitRows" msprop:Generator_UserRelationName="FK_Order2FinalKit_OrderList" msprop:Generator_ParentPropName="OrderListRow" msprop:Generator_RelationVarName="relationFK_Order2FinalKit_OrderList" msprop:Generator_UserParentTable="OrderList" />
+      <msdata:Relationship name="FK_StatusLog_Places" msdata:parent="Places" msdata:child="StatusLog" msdata:parentkey="PlaceCod" msdata:childkey="PlaceCod" msprop:Generator_UserChildTable="StatusLog" msprop:Generator_ChildPropName="GetStatusLogRows" msprop:Generator_UserRelationName="FK_StatusLog_Places" msprop:Generator_ParentPropName="PlacesRow" msprop:Generator_RelationVarName="relationFK_StatusLog_Places" msprop:Generator_UserParentTable="Places" />
    </xs:appinfo>
  </xs:annotation>
 </xs:schema>
@@ -4,7 +4,7 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="36" ViewPortY="1432" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="209" ViewPortY="1609" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:BatchList" ZOrder="6" X="325" Y="437" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:StackList" ZOrder="7" X="618" Y="961" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -50,7 +50,7 @@
    <Shape ID="DesignTable:UpdMan" ZOrder="5" X="636" Y="2374" Height="191" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
    <Shape ID="DesignTable:SheetStats" ZOrder="3" X="20" Y="2307" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
    <Shape ID="DesignTable:BatchStats" ZOrder="2" X="369" Y="2276" Height="305" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:DailyProdStats" ZOrder="1" X="1086" Y="2438" Height="210" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:ProductionStatsDay" ZOrder="1" X="870" Y="2556" Height="229" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
  </Shapes>
  <Connectors>
    <Connector ID="DesignRelation:FK_ItemList_Materials1" ZOrder="57" LineWidth="11">
@@ -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();
@@ -10,6 +10,7 @@ namespace AppData
    {
        #region Public Properties

+        public string label { get; set; } = "";
        public DateTime x { get; set; }
        public decimal y { get; set; }

@@ -35,7 +35,7 @@ namespace NKC_WF.Controllers
            DateTime endDate = DateTime.Today.AddDays(1);
            DateTime startDate = endDate.AddDays(-10);
            List<chartJsTSerie> answ = new List<chartJsTSerie>();
-            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<chartJsTSerie> answ = new List<chartJsTSerie>();
-            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");
@@ -40,7 +40,7 @@
 </div>
 <div class="row">
    <div class="col-12 textCondens px-0">
-        <asp:GridView ID="grView" runat="server" AllowPaging="True" AutoGenerateColumns="False" DataKeyNames="PlaceCod,DataOraRif" DataSourceID="ods" CssClass="table table-sm table-striped text-right" OnPageIndexChanged="grView_PageIndexChanged">
+        <asp:GridView ID="grView" runat="server" AllowPaging="True" AutoGenerateColumns="False" DataKeyNames="PlaceCod,DataRif" DataSourceID="ods" CssClass="table table-sm table-striped text-right" OnPageIndexChanged="grView_PageIndexChanged">
            <HeaderStyle CssClass="default" />
            <PagerStyle CssClass="active GridPager" />
            <PagerSettings Mode="NumericFirstLast" />
@@ -49,7 +49,7 @@
                <%: traduci("NoRecord") %>
            </EmptyDataTemplate>
            <Columns>
-                <asp:BoundField DataField="DataOraRif" HeaderText="Date-Time" SortExpression="DataOraRif" />
+                <asp:BoundField DataField="DataRif" HeaderText="Date-Time" SortExpression="DataRif" />
                <asp:BoundField DataField="PlaceCod" HeaderText="Machine" SortExpression="PlaceCod" />
                <asp:BoundField DataField="ItmProd" HeaderText="# Parts Produced" SortExpression="ItmProd" />
                <asp:BoundField DataField="ItmScrap" HeaderText="# Parts Scrapped" SortExpression="ItmScrap" />
@@ -62,12 +62,11 @@
                </asp:TemplateField>
            </Columns>
        </asp:GridView>
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.DailyProdStatsTableAdapter">
+        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getFilt" TypeName="AppData.DS_AppTableAdapters.ProductionStatsDayTableAdapter">
            <SelectParameters>
                <asp:ControlParameter ControlID="txtDateStart" Name="dtStart" PropertyName="Text" Type="DateTime" />
                <asp:ControlParameter ControlID="txtDateEnd" Name="dtEnd" PropertyName="Text" Type="DateTime" />
                <asp:ControlParameter ControlID="ddlMachine" Name="PlaceCod" PropertyName="SelectedValue" DefaultValue="*" />
-                <asp:Parameter Name="DayGroup" DefaultValue="true" />
            </SelectParameters>
        </asp:ObjectDataSource>
    </div>
@@ -6,6 +6,14 @@
    <div class="col-12 px-2">
        <h4>Batch Stats Plot</h4>
    </div>
+    <div class="col-12 px-2">
+        <div id="divLoading" class="alert alert-primary text-center">
+            <%--<i class="fa fa-5x fa-circle-o-notch fa-spin" aria-hidden="true"></i>--%>
+            <div class="progress">
+                <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 40%"></div>
+            </div>
+        </div>
+    </div>
    <div class="col-12 px-2">
        <asp:HiddenField runat="server" ID="hfPlaceCod" Value="*" />
        <asp:HiddenField runat="server" ID="hfPlotType" Value="" />
@@ -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!');
@@ -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;
-            }
-        }
-
-
        /// <summary>
        /// Aggiorna componente principale e child components
        /// </summary>
@@ -166,9 +167,9 @@ namespace NKC_WF
                    upnlDrawings.Update();
                    upnlTitle.Update();
                }
+            }
                // definisco se mostrare PartMIA
                hlPartMIA.Visible = showPartMIA;
-            }
        }

        /// <summary>
@@ -8,7 +8,7 @@
 <%@ Register Src="~/WebUserControls/cmp_MachSem.ascx" TagPrefix="uc1" TagName="cmp_MachSem" %>

 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
-    <div class="mx-2">
+    <div class="my-2 mx-3">
        <asp:UpdatePanel runat="server" ID="upnlCarts" UpdateMode="Always">
            <ContentTemplate>
                <asp:Timer ID="timerMain" runat="server" Interval="4000" OnTick="timerMain_Tick"></asp:Timer>
@@ -41,4 +41,4 @@
            </ContentTemplate>
        </asp:UpdatePanel>
    </div>
-</asp:Content>
+</asp:Content>
@@ -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
        /// </summary>
        private void doUpdate()
        {
+            if (!string.IsNullOrEmpty(MachineSel))
+            {
+                PlaceCod = MachineSel;
+            }
            if (PLID > 0)
            {
                cmp_partMIA.Visible = false;
@@ -6,7 +6,7 @@
 <%@ Register Src="~/WebUserControls/cmp_DailyStatsList.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsList" %>

 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
-    <div class="my-4 mx-2">
+    <div class="my-2 mx-3">
        <div class="row">
            <div class="col-12">
                <div class="card">
@@ -25,21 +25,10 @@
                            <div class="col-3"></div>
                            <div class="col-9">
                                <div class="text-info text-center">
-                                    <asp:Label runat="server" ID="lblInstruction"><i class="fa fa-arrow-up" aria-hidden="true"></i> <%# traduci("PleaseSelectReportType") %> <i class="fa fa-arrow-up" aria-hidden="true"></i></asp:Label>
+                                    <asp:Label runat="server" ID="lblInstruction" CssClass="alert alert-primary"><i class="fa fa-arrow-up" aria-hidden="true"></i> <%# traduci("PleaseSelectReportType") %><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:Label>
                                </div>
                            </div>
                        </div>
-                        <%--<asp:UpdatePanel ID="upnlLoading" UpdateMode="Always" runat="server">
-                            <ContentTemplate>
-                                <asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="1">
-                                    <ProgressTemplate>
-                                        <div class="alert alert-primary text-center">
-                                            <i class="fa fa-5x fa-circle-o-notch fa-spin" aria-hidden="true"></i>
-                                        </div>
-                                    </ProgressTemplate>
-                                </asp:UpdateProgress>
-                            </ContentTemplate>
-                        </asp:UpdatePanel>--%>
                        <uc1:cmp_SheetsStats runat="server" ID="cmp_SheetsStats" />
                        <uc1:cmp_BatchStatsList runat="server" id="cmp_BatchStatsList" />
                        <uc1:cmp_DailyStatsList runat="server" id="cmp_DailyStatsList" />