diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index a723619..900888f 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -972,6 +972,10 @@ namespace AppData { private global::System.Data.DataColumn columnBatchID; + private global::System.Data.DataColumn columnPosition; + + private global::System.Data.DataColumn columnStackDtmx; + private global::System.Data.DataColumn columnNumSheets; private global::System.Data.DataColumn columnNumSheetsPrepared; @@ -982,10 +986,6 @@ namespace AppData { private global::System.Data.DataColumn columnNumItems; - private global::System.Data.DataColumn columnPosition; - - private global::System.Data.DataColumn columnStackDtmx; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public StackListDataTable() { @@ -1043,6 +1043,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn PositionColumn { + get { + return this.columnPosition; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn StackDtmxColumn { + get { + return this.columnStackDtmx; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn NumSheetsColumn { @@ -1083,22 +1099,6 @@ namespace AppData { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn PositionColumn { - get { - return this.columnPosition; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn StackDtmxColumn { - get { - return this.columnStackDtmx; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1136,19 +1136,19 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public StackListRow AddStackListRow(int StackID, int StackIndex, int BatchID, int NumSheets, int NumSheetsPrepared, int NumSheetsPrinted, int NumSheetsWorked, int NumItems, int Position, string StackDtmx) { + public StackListRow AddStackListRow(int StackID, int StackIndex, int BatchID, int Position, string StackDtmx, int NumSheets, int NumSheetsPrepared, int NumSheetsPrinted, int NumSheetsWorked, int NumItems) { StackListRow rowStackListRow = ((StackListRow)(this.NewRow())); object[] columnValuesArray = new object[] { StackID, StackIndex, BatchID, + Position, + StackDtmx, NumSheets, NumSheetsPrepared, NumSheetsPrinted, NumSheetsWorked, - NumItems, - Position, - StackDtmx}; + NumItems}; rowStackListRow.ItemArray = columnValuesArray; this.Rows.Add(rowStackListRow); return rowStackListRow; @@ -1181,13 +1181,13 @@ namespace AppData { this.columnStackID = base.Columns["StackID"]; this.columnStackIndex = base.Columns["StackIndex"]; this.columnBatchID = base.Columns["BatchID"]; + this.columnPosition = base.Columns["Position"]; + this.columnStackDtmx = base.Columns["StackDtmx"]; this.columnNumSheets = base.Columns["NumSheets"]; this.columnNumSheetsPrepared = base.Columns["NumSheetsPrepared"]; this.columnNumSheetsPrinted = base.Columns["NumSheetsPrinted"]; this.columnNumSheetsWorked = base.Columns["NumSheetsWorked"]; this.columnNumItems = base.Columns["NumItems"]; - this.columnPosition = base.Columns["Position"]; - this.columnStackDtmx = base.Columns["StackDtmx"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1199,6 +1199,10 @@ namespace AppData { base.Columns.Add(this.columnStackIndex); this.columnBatchID = new global::System.Data.DataColumn("BatchID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnBatchID); + this.columnPosition = new global::System.Data.DataColumn("Position", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnPosition); + this.columnStackDtmx = new global::System.Data.DataColumn("StackDtmx", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnStackDtmx); this.columnNumSheets = new global::System.Data.DataColumn("NumSheets", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumSheets); this.columnNumSheetsPrepared = new global::System.Data.DataColumn("NumSheetsPrepared", typeof(int), null, global::System.Data.MappingType.Element); @@ -1209,24 +1213,20 @@ namespace AppData { base.Columns.Add(this.columnNumSheetsWorked); this.columnNumItems = new global::System.Data.DataColumn("NumItems", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumItems); - this.columnPosition = new global::System.Data.DataColumn("Position", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnPosition); - this.columnStackDtmx = new global::System.Data.DataColumn("StackDtmx", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnStackDtmx); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnStackID}, true)); this.columnStackID.AllowDBNull = false; this.columnStackID.Unique = true; this.columnStackIndex.AllowDBNull = false; this.columnBatchID.AllowDBNull = false; + this.columnPosition.AllowDBNull = false; + this.columnStackDtmx.ReadOnly = true; + this.columnStackDtmx.MaxLength = 10; this.columnNumSheets.ReadOnly = true; this.columnNumSheetsPrepared.ReadOnly = true; this.columnNumSheetsPrinted.ReadOnly = true; this.columnNumSheetsWorked.ReadOnly = true; this.columnNumItems.ReadOnly = true; - this.columnPosition.AllowDBNull = false; - this.columnStackDtmx.ReadOnly = true; - this.columnStackDtmx.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1364,6 +1364,8 @@ namespace AppData { private global::System.Data.DataColumn columnStackID; + private global::System.Data.DataColumn columnShStatus; + private global::System.Data.DataColumn columnSheetIndex; private global::System.Data.DataColumn columnIsNext; @@ -1376,13 +1378,17 @@ namespace AppData { private global::System.Data.DataColumn columnPrepared; + private global::System.Data.DataColumn columnPrntStart; + + private global::System.Data.DataColumn columnPrntEnd; + private global::System.Data.DataColumn columnWrkStart; private global::System.Data.DataColumn columnWrkEnd; - private global::System.Data.DataColumn columnPrntStart; + private global::System.Data.DataColumn columnUnlStart; - private global::System.Data.DataColumn columnPrntEnd; + private global::System.Data.DataColumn columnUnlEnd; private global::System.Data.DataColumn columnRemnantID; @@ -1451,6 +1457,14 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ShStatusColumn { + get { + return this.columnShStatus; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn SheetIndexColumn { @@ -1499,6 +1513,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn PrntStartColumn { + get { + return this.columnPrntStart; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn PrntEndColumn { + get { + return this.columnPrntEnd; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn WrkStartColumn { @@ -1517,17 +1547,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 PrntStartColumn { + public global::System.Data.DataColumn UnlStartColumn { get { - return this.columnPrntStart; + return this.columnUnlStart; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn PrntEndColumn { + public global::System.Data.DataColumn UnlEndColumn { get { - return this.columnPrntEnd; + return this.columnUnlEnd; } } @@ -1643,16 +1673,19 @@ namespace AppData { public SheetListRow AddSheetListRow( int SheetID, int StackID, + int ShStatus, int SheetIndex, int IsNext, int MatID, decimal WrkTimeEst, decimal WrkTimeReal, System.DateTime Prepared, - System.DateTime WrkStart, - System.DateTime WrkEnd, System.DateTime PrntStart, System.DateTime PrntEnd, + System.DateTime WrkStart, + System.DateTime WrkEnd, + System.DateTime UnlStart, + System.DateTime UnlEnd, int RemnantID, string PrintFilePath, string CncFilePath, @@ -1666,16 +1699,19 @@ namespace AppData { object[] columnValuesArray = new object[] { SheetID, StackID, + ShStatus, SheetIndex, IsNext, MatID, WrkTimeEst, WrkTimeReal, Prepared, - WrkStart, - WrkEnd, PrntStart, PrntEnd, + WrkStart, + WrkEnd, + UnlStart, + UnlEnd, RemnantID, PrintFilePath, CncFilePath, @@ -1716,16 +1752,19 @@ namespace AppData { internal void InitVars() { this.columnSheetID = base.Columns["SheetID"]; this.columnStackID = base.Columns["StackID"]; + this.columnShStatus = base.Columns["ShStatus"]; this.columnSheetIndex = base.Columns["SheetIndex"]; this.columnIsNext = base.Columns["IsNext"]; this.columnMatID = base.Columns["MatID"]; this.columnWrkTimeEst = base.Columns["WrkTimeEst"]; this.columnWrkTimeReal = base.Columns["WrkTimeReal"]; this.columnPrepared = base.Columns["Prepared"]; - this.columnWrkStart = base.Columns["WrkStart"]; - this.columnWrkEnd = base.Columns["WrkEnd"]; this.columnPrntStart = base.Columns["PrntStart"]; this.columnPrntEnd = base.Columns["PrntEnd"]; + this.columnWrkStart = base.Columns["WrkStart"]; + this.columnWrkEnd = base.Columns["WrkEnd"]; + this.columnUnlStart = base.Columns["UnlStart"]; + this.columnUnlEnd = base.Columns["UnlEnd"]; this.columnRemnantID = base.Columns["RemnantID"]; this.columnPrintFilePath = base.Columns["PrintFilePath"]; this.columnCncFilePath = base.Columns["CncFilePath"]; @@ -1744,6 +1783,8 @@ namespace AppData { base.Columns.Add(this.columnSheetID); this.columnStackID = new global::System.Data.DataColumn("StackID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnStackID); + this.columnShStatus = new global::System.Data.DataColumn("ShStatus", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnShStatus); this.columnSheetIndex = new global::System.Data.DataColumn("SheetIndex", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnSheetIndex); this.columnIsNext = new global::System.Data.DataColumn("IsNext", typeof(int), null, global::System.Data.MappingType.Element); @@ -1756,14 +1797,18 @@ namespace AppData { base.Columns.Add(this.columnWrkTimeReal); this.columnPrepared = new global::System.Data.DataColumn("Prepared", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPrepared); - this.columnWrkStart = new global::System.Data.DataColumn("WrkStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnWrkStart); - this.columnWrkEnd = new global::System.Data.DataColumn("WrkEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnWrkEnd); this.columnPrntStart = new global::System.Data.DataColumn("PrntStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPrntStart); this.columnPrntEnd = new global::System.Data.DataColumn("PrntEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPrntEnd); + this.columnWrkStart = new global::System.Data.DataColumn("WrkStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnWrkStart); + this.columnWrkEnd = new global::System.Data.DataColumn("WrkEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnWrkEnd); + this.columnUnlStart = new global::System.Data.DataColumn("UnlStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnUnlStart); + this.columnUnlEnd = new global::System.Data.DataColumn("UnlEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnUnlEnd); this.columnRemnantID = new global::System.Data.DataColumn("RemnantID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnRemnantID); this.columnPrintFilePath = new global::System.Data.DataColumn("PrintFilePath", typeof(string), null, global::System.Data.MappingType.Element); @@ -1787,6 +1832,7 @@ namespace AppData { this.columnSheetID.AllowDBNull = false; this.columnSheetID.Unique = true; this.columnStackID.AllowDBNull = false; + this.columnShStatus.ReadOnly = true; this.columnSheetIndex.AllowDBNull = false; this.columnIsNext.ReadOnly = true; this.columnMatID.AllowDBNull = false; @@ -3812,6 +3858,33 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int Position { + get { + return ((int)(this[this.tableStackList.PositionColumn])); + } + set { + this[this.tableStackList.PositionColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string StackDtmx { + get { + try { + return ((string)(this[this.tableStackList.StackDtmxColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'StackDtmx\' nella tabella \'StackList\' è DBNull.", e); + } + } + set { + this[this.tableStackList.StackDtmxColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int NumSheets { @@ -3894,29 +3967,14 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int Position { - get { - return ((int)(this[this.tableStackList.PositionColumn])); - } - set { - this[this.tableStackList.PositionColumn] = value; - } + public bool IsStackDtmxNull() { + return this.IsNull(this.tableStackList.StackDtmxColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string StackDtmx { - get { - try { - return ((string)(this[this.tableStackList.StackDtmxColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'StackDtmx\' nella tabella \'StackList\' è DBNull.", e); - } - } - set { - this[this.tableStackList.StackDtmxColumn] = value; - } + public void SetStackDtmxNull() { + this[this.tableStackList.StackDtmxColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3978,18 +4036,6 @@ namespace AppData { public void SetNumItemsNull() { this[this.tableStackList.NumItemsColumn] = global::System.Convert.DBNull; } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsStackDtmxNull() { - return this.IsNull(this.tableStackList.StackDtmxColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetStackDtmxNull() { - this[this.tableStackList.StackDtmxColumn] = global::System.Convert.DBNull; - } } /// @@ -4028,6 +4074,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int ShStatus { + get { + try { + return ((int)(this[this.tableSheetList.ShStatusColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'ShStatus\' nella tabella \'SheetList\' è DBNull.", e); + } + } + set { + this[this.tableSheetList.ShStatusColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int SheetIndex { @@ -4104,6 +4166,38 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime PrntStart { + get { + try { + return ((global::System.DateTime)(this[this.tableSheetList.PrntStartColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'PrntStart\' nella tabella \'SheetList\' è DBNull.", e); + } + } + set { + this[this.tableSheetList.PrntStartColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime PrntEnd { + get { + try { + return ((global::System.DateTime)(this[this.tableSheetList.PrntEndColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'PrntEnd\' nella tabella \'SheetList\' è DBNull.", e); + } + } + set { + this[this.tableSheetList.PrntEndColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public System.DateTime WrkStart { @@ -4138,33 +4232,33 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public System.DateTime PrntStart { + public System.DateTime UnlStart { get { try { - return ((global::System.DateTime)(this[this.tableSheetList.PrntStartColumn])); + return ((global::System.DateTime)(this[this.tableSheetList.UnlStartColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'PrntStart\' nella tabella \'SheetList\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("Il valore della colonna \'UnlStart\' nella tabella \'SheetList\' è DBNull.", e); } } set { - this[this.tableSheetList.PrntStartColumn] = value; + this[this.tableSheetList.UnlStartColumn] = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public System.DateTime PrntEnd { + public System.DateTime UnlEnd { get { try { - return ((global::System.DateTime)(this[this.tableSheetList.PrntEndColumn])); + return ((global::System.DateTime)(this[this.tableSheetList.UnlEndColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'PrntEnd\' nella tabella \'SheetList\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("Il valore della colonna \'UnlEnd\' nella tabella \'SheetList\' è DBNull.", e); } } set { - this[this.tableSheetList.PrntEndColumn] = value; + this[this.tableSheetList.UnlEndColumn] = value; } } @@ -4272,6 +4366,18 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsShStatusNull() { + return this.IsNull(this.tableSheetList.ShStatusColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetShStatusNull() { + this[this.tableSheetList.ShStatusColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsIsNextNull() { @@ -4296,6 +4402,30 @@ namespace AppData { this[this.tableSheetList.PreparedColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsPrntStartNull() { + return this.IsNull(this.tableSheetList.PrntStartColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetPrntStartNull() { + this[this.tableSheetList.PrntStartColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsPrntEndNull() { + return this.IsNull(this.tableSheetList.PrntEndColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetPrntEndNull() { + this[this.tableSheetList.PrntEndColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsWrkStartNull() { @@ -4322,26 +4452,26 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsPrntStartNull() { - return this.IsNull(this.tableSheetList.PrntStartColumn); + public bool IsUnlStartNull() { + return this.IsNull(this.tableSheetList.UnlStartColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetPrntStartNull() { - this[this.tableSheetList.PrntStartColumn] = global::System.Convert.DBNull; + public void SetUnlStartNull() { + this[this.tableSheetList.UnlStartColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsPrntEndNull() { - return this.IsNull(this.tableSheetList.PrntEndColumn); + public bool IsUnlEndNull() { + return this.IsNull(this.tableSheetList.UnlEndColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetPrntEndNull() { - this[this.tableSheetList.PrntEndColumn] = global::System.Convert.DBNull; + public void SetUnlEndNull() { + this[this.tableSheetList.UnlEndColumn] = global::System.Convert.DBNull; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5677,13 +5807,13 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("StackID", "StackID"); tableMapping.ColumnMappings.Add("StackIndex", "StackIndex"); tableMapping.ColumnMappings.Add("BatchID", "BatchID"); + tableMapping.ColumnMappings.Add("Position", "Position"); + tableMapping.ColumnMappings.Add("StackDtmx", "StackDtmx"); tableMapping.ColumnMappings.Add("NumSheets", "NumSheets"); tableMapping.ColumnMappings.Add("NumSheetsPrepared", "NumSheetsPrepared"); tableMapping.ColumnMappings.Add("NumSheetsPrinted", "NumSheetsPrinted"); tableMapping.ColumnMappings.Add("NumSheetsWorked", "NumSheetsWorked"); tableMapping.ColumnMappings.Add("NumItems", "NumItems"); - tableMapping.ColumnMappings.Add("Position", "Position"); - tableMapping.ColumnMappings.Add("StackDtmx", "StackDtmx"); this._adapter.TableMappings.Add(tableMapping); } @@ -5921,16 +6051,19 @@ namespace AppData.DS_AppTableAdapters { tableMapping.DataSetTable = "SheetList"; tableMapping.ColumnMappings.Add("SheetID", "SheetID"); tableMapping.ColumnMappings.Add("StackID", "StackID"); + tableMapping.ColumnMappings.Add("ShStatus", "ShStatus"); tableMapping.ColumnMappings.Add("SheetIndex", "SheetIndex"); tableMapping.ColumnMappings.Add("IsNext", "IsNext"); tableMapping.ColumnMappings.Add("MatID", "MatID"); tableMapping.ColumnMappings.Add("WrkTimeEst", "WrkTimeEst"); tableMapping.ColumnMappings.Add("WrkTimeReal", "WrkTimeReal"); tableMapping.ColumnMappings.Add("Prepared", "Prepared"); - tableMapping.ColumnMappings.Add("WrkStart", "WrkStart"); - tableMapping.ColumnMappings.Add("WrkEnd", "WrkEnd"); tableMapping.ColumnMappings.Add("PrntStart", "PrntStart"); tableMapping.ColumnMappings.Add("PrntEnd", "PrntEnd"); + tableMapping.ColumnMappings.Add("WrkStart", "WrkStart"); + tableMapping.ColumnMappings.Add("WrkEnd", "WrkEnd"); + tableMapping.ColumnMappings.Add("UnlStart", "UnlStart"); + tableMapping.ColumnMappings.Add("UnlEnd", "UnlEnd"); tableMapping.ColumnMappings.Add("RemnantID", "RemnantID"); tableMapping.ColumnMappings.Add("PrintFilePath", "PrintFilePath"); tableMapping.ColumnMappings.Add("CncFilePath", "CncFilePath"); @@ -5953,35 +6086,43 @@ namespace AppData.DS_AppTableAdapters { [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[5]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\n FROM v_SheetList"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_SheetList"; 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_Sheets_getByStack"; + this._commandCollection[1].CommandText = "dbo.stp_Sheets_getByMLStatus"; 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("@StackID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShStatusStart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShStatusEnd", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_Sheets_getNextByStack"; + this._commandCollection[2].CommandText = "dbo.stp_Sheets_getByStack"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StackID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_Sheets_resetPrepared"; + this._commandCollection[3].CommandText = "dbo.stp_Sheets_getNextByStack"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StackID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_Sheets_setPrepared"; + this._commandCollection[4].CommandText = "dbo.stp_Sheets_resetPrepared"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[5].Connection = this.Connection; + this._commandCollection[5].CommandText = "dbo.stp_Sheets_setPrepared"; + this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6012,8 +6153,37 @@ namespace AppData.DS_AppTableAdapters { [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.SheetListDataTable getByStack(global::System.Nullable StackID) { + public virtual DS_App.SheetListDataTable getByMLStatus(global::System.Nullable BatchID, global::System.Nullable ShStatusStart, global::System.Nullable ShStatusEnd) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((BatchID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((ShStatusStart.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(ShStatusStart.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((ShStatusEnd.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(ShStatusEnd.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + DS_App.SheetListDataTable dataTable = new DS_App.SheetListDataTable(); + 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.SheetListDataTable getByStack(global::System.Nullable StackID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((StackID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(StackID.Value)); } @@ -6030,7 +6200,7 @@ namespace AppData.DS_AppTableAdapters { [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.SheetListDataTable getNextByStack(global::System.Nullable StackID) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((StackID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(StackID.Value)); } @@ -6046,7 +6216,7 @@ namespace AppData.DS_AppTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int resetPrepared(global::System.Nullable SheetID) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((SheetID.HasValue == true)) { command.Parameters[1].Value = ((int)(SheetID.Value)); } @@ -6074,7 +6244,7 @@ namespace AppData.DS_AppTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int setPrepared(global::System.Nullable SheetID) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((SheetID.HasValue == true)) { command.Parameters[1].Value = ((int)(SheetID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index b1ad0f2..d6dc174 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -121,13 +121,13 @@ FROM v_StackList + + - - @@ -171,7 +171,7 @@ FROM v_StackList SELECT * - FROM v_SheetList +FROM v_SheetList @@ -180,16 +180,19 @@ FROM v_StackList + - - + + + + @@ -201,6 +204,19 @@ FROM v_StackList + + + + dbo.stp_Sheets_getByMLStatus + + + + + + + + + @@ -665,11 +681,6 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - - - - - @@ -678,6 +689,11 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat + + + + + @@ -686,16 +702,19 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat + - - + + + + diff --git a/NKC_WF/MachineLoad.aspx b/NKC_WF/MachineLoad.aspx index 80cb162..763dae0 100644 --- a/NKC_WF/MachineLoad.aspx +++ b/NKC_WF/MachineLoad.aspx @@ -2,7 +2,7 @@ <%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> <%@ Register Src="~/WebUserControls/cmp_stackLoading.ascx" TagPrefix="uc1" TagName="cmp_stackLoading" %> - +<%@ Register Src="~/WebUserControls/cmp_ML_ShDet.ascx" TagPrefix="uc1" TagName="cmp_ML_ShDet" %> @@ -10,20 +10,20 @@

<%: traduci("MachineLoad") %>

-
- +
+
- STACK DATA +
- CURRENT LOAD DATA +
- MACHINE DATA +
- UNLOAD DATA +
diff --git a/NKC_WF/MachineLoad.aspx.cs b/NKC_WF/MachineLoad.aspx.cs index 3a3e35a..bdc99ad 100644 --- a/NKC_WF/MachineLoad.aspx.cs +++ b/NKC_WF/MachineLoad.aspx.cs @@ -1,5 +1,4 @@ -using AppData; -using System; +using System; namespace NKC_WF { @@ -7,8 +6,15 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { - + cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh; + } + + private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e) + { + cmp_ML_ShDet.BatchId = cmp_stackLoading.BatchIdCurr; + cmp_ML_ShDet1.BatchId = cmp_stackLoading.BatchIdCurr; + cmp_ML_ShDet2.BatchId = cmp_stackLoading.BatchIdCurr; + cmp_ML_ShDet3.BatchId = cmp_stackLoading.BatchIdCurr; } - } } \ No newline at end of file diff --git a/NKC_WF/MachineLoad.aspx.designer.cs b/NKC_WF/MachineLoad.aspx.designer.cs index a0909ab..660d75f 100644 --- a/NKC_WF/MachineLoad.aspx.designer.cs +++ b/NKC_WF/MachineLoad.aspx.designer.cs @@ -20,5 +20,41 @@ namespace NKC_WF { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_stackLoading cmp_stackLoading; + + /// + /// Controllo cmp_ML_ShDet. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet; + + /// + /// Controllo cmp_ML_ShDet1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet1; + + /// + /// Controllo cmp_ML_ShDet2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet2; + + /// + /// Controllo cmp_ML_ShDet3. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_ML_ShDet cmp_ML_ShDet3; } } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e2b0cbe..caa254d 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -176,6 +176,7 @@ + @@ -437,6 +438,13 @@ cmp_menuTop.ascx + + cmp_ML_ShDet.ascx + ASPXCodeBehind + + + cmp_ML_ShDet.ascx + cmp_numRow.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx new file mode 100644 index 0000000..3ba717b --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx @@ -0,0 +1,94 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ML_ShDet.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_ML_ShDet" %> + + + + diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.cs b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.cs new file mode 100644 index 0000000..fdc614c --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.cs @@ -0,0 +1,114 @@ +using System; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_ML_ShDet : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + + public int StatusReqStart + { + get + { + int answ = 0; + int.TryParse(hfStatus.Value, out answ); + return answ; + } + set + { + hfStatus.Value = value.ToString(); + // update generale + doUpdate(); + } + } + public int StatusReqEnd + { + get + { + int answ = 0; + int.TryParse(hfStatusEnd.Value, out answ); + return answ; + } + set + { + hfStatusEnd.Value = value.ToString(); + // update generale + doUpdate(); + } + } + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + doUpdate(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } + + private void fixCss() + { + string colore = "dark"; + divBlock.Attributes.Remove("class"); + switch (StatusReqStart) + { + case -1: + colore = "primary"; + break; + case 1: + colore = "warning"; + break; + case 3: + colore = "info"; + break; + case 5: + colore = "dark"; + break; + default: + colore = "secondary"; + break; + } + string classe = $"alert alert-{colore} border border-{colore} border-thick row"; + divBlock.Attributes.Add("class", classe); + } + + public void doUpdate() + { + // imposto css + fixCss(); + // imposto titolo + fixTitle(); + // sistemo filtraggio frmView + } + + private void fixTitle() + { + switch (StatusReqStart) + { + case -1: + lblTitle.Text = traduci("LoadData"); + break; + case 1: + lblTitle.Text = traduci("PrintData"); + break; + case 3: + lblTitle.Text = traduci("MachineData"); + break; + case 5: + lblTitle.Text = traduci("UnloadData"); + break; + default: + lblTitle.Text = traduci("NA"); + break; + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.designer.cs new file mode 100644 index 0000000..3f33793 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls { + + + public partial class cmp_ML_ShDet { + + /// + /// Controllo divBlock. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBlock; + + /// + /// Controllo lblTitle. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblTitle; + + /// + /// Controllo hfStatus. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfStatus; + + /// + /// Controllo hfStatusEnd. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfStatusEnd; + + /// + /// Controllo hfBatchID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + + /// + /// Controllo frmView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.FormView frmView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx b/NKC_WF/WebUserControls/cmp_stackLoading.ascx index 19ef217..9525fb4 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx @@ -8,6 +8,7 @@
+ <%: traduci("StackLoaded") %>
diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 0d0cd76..eb02842 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -12,6 +12,7 @@ namespace NKC_WF.WebUserControls // svuoto input barcode... cmp_barcode.inputAcquired = ""; lastCmd = ""; + doUpdate(); } cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; } @@ -129,10 +130,17 @@ namespace NKC_WF.WebUserControls doUpdate(); } + protected void checkVisibility() + { + lblLoaded.Visible = StackId != 0; + frmView.Visible = !lblLoaded.Visible; + } + public void doUpdate() { //repCtrl.DataBind(); //checkPrint(); + checkVisibility(); } @@ -140,6 +148,7 @@ namespace NKC_WF.WebUserControls protected void frmView_DataBound(object sender, EventArgs e) { cmp_stackNextloading.BatchId = BatchIdCurr; + raiseEvent(); } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs index 15281b8..d4803e5 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs @@ -30,6 +30,15 @@ namespace NKC_WF.WebUserControls { /// protected global::System.Web.UI.WebControls.HiddenField hfStackId; + /// + /// Controllo lblLoaded. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblLoaded; + /// /// Controllo frmView. /// diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx index d4ca06f..fdb82d5 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx @@ -1,25 +1,20 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_stackNextloading.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_stackNextloading" %> - + - Code: - -
- StackIndex: - -
- - NumSheets: - -
- NumSheetsPrinted: - -
- NumSheetsWorked: - - - +
+
+ Stack: / +
+
+ Required: + +
+
+ Prt / Wrk: / +
+