diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 5145d4d..60c3540 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -1295,6 +1295,10 @@ namespace AppData { private global::System.Data.DataColumn columnEnvNum; + private global::System.Data.DataColumn columnSchedStatus; + + private global::System.Data.DataColumn columnSchedPrior; + private global::System.Data.DataColumn columnNumErrPre; private global::System.Data.DataColumn columnNumErr; @@ -1430,6 +1434,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 SchedStatusColumn { + get { + return this.columnSchedStatus; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn SchedPriorColumn { + get { + return this.columnSchedPrior; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn NumErrPreColumn { @@ -1534,6 +1554,8 @@ namespace AppData { System.DateTime ApprovDate, string ApprovUser, string EnvNum, + int SchedStatus, + int SchedPrior, int NumErrPre, int NumErr, int NumOrders, @@ -1554,6 +1576,8 @@ namespace AppData { ApprovDate, ApprovUser, EnvNum, + SchedStatus, + SchedPrior, NumErrPre, NumErr, NumOrders, @@ -1601,6 +1625,8 @@ namespace AppData { this.columnApprovDate = base.Columns["ApprovDate"]; this.columnApprovUser = base.Columns["ApprovUser"]; this.columnEnvNum = base.Columns["EnvNum"]; + this.columnSchedStatus = base.Columns["SchedStatus"]; + this.columnSchedPrior = base.Columns["SchedPrior"]; this.columnNumErrPre = base.Columns["NumErrPre"]; this.columnNumErr = base.Columns["NumErr"]; this.columnNumOrders = base.Columns["NumOrders"]; @@ -1635,6 +1661,10 @@ namespace AppData { base.Columns.Add(this.columnApprovUser); this.columnEnvNum = new global::System.Data.DataColumn("EnvNum", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnEnvNum); + this.columnSchedStatus = new global::System.Data.DataColumn("SchedStatus", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSchedStatus); + this.columnSchedPrior = new global::System.Data.DataColumn("SchedPrior", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSchedPrior); this.columnNumErrPre = new global::System.Data.DataColumn("NumErrPre", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumErrPre); this.columnNumErr = new global::System.Data.DataColumn("NumErr", typeof(int), null, global::System.Data.MappingType.Element); @@ -1667,6 +1697,8 @@ namespace AppData { this.columnApprovUser.MaxLength = 50; this.columnEnvNum.AllowDBNull = false; this.columnEnvNum.MaxLength = 50; + this.columnSchedStatus.AllowDBNull = false; + this.columnSchedPrior.AllowDBNull = false; this.columnNumErrPre.ReadOnly = true; this.columnNumErr.ReadOnly = true; this.columnNumOrders.ReadOnly = true; @@ -1824,8 +1856,14 @@ namespace AppData { private global::System.Data.DataColumn columnNumSheetsPrinted; + private global::System.Data.DataColumn columnNumSheetsWorking; + private global::System.Data.DataColumn columnNumSheetsWorked; + private global::System.Data.DataColumn columnNumSheetsUnloaded; + + private global::System.Data.DataColumn columnNumSheetsToRedo; + private global::System.Data.DataColumn columnNumItems; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1925,6 +1963,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 NumSheetsWorkingColumn { + get { + return this.columnNumSheetsWorking; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn NumSheetsWorkedColumn { @@ -1933,6 +1979,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 NumSheetsUnloadedColumn { + get { + return this.columnNumSheetsUnloaded; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn NumSheetsToRedoColumn { + get { + return this.columnNumSheetsToRedo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn NumItemsColumn { @@ -1978,7 +2040,7 @@ 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 Position, string StackDtmx, int NumSheets, int NumSheetsPrepared, int NumSheetsPrinted, int NumSheetsWorked, int NumItems) { + public StackListRow AddStackListRow(int StackID, int StackIndex, int BatchID, int Position, string StackDtmx, int NumSheets, int NumSheetsPrepared, int NumSheetsPrinted, int NumSheetsWorking, int NumSheetsWorked, int NumSheetsUnloaded, int NumSheetsToRedo, int NumItems) { StackListRow rowStackListRow = ((StackListRow)(this.NewRow())); object[] columnValuesArray = new object[] { StackID, @@ -1989,7 +2051,10 @@ namespace AppData { NumSheets, NumSheetsPrepared, NumSheetsPrinted, + NumSheetsWorking, NumSheetsWorked, + NumSheetsUnloaded, + NumSheetsToRedo, NumItems}; rowStackListRow.ItemArray = columnValuesArray; this.Rows.Add(rowStackListRow); @@ -2028,7 +2093,10 @@ namespace AppData { this.columnNumSheets = base.Columns["NumSheets"]; this.columnNumSheetsPrepared = base.Columns["NumSheetsPrepared"]; this.columnNumSheetsPrinted = base.Columns["NumSheetsPrinted"]; + this.columnNumSheetsWorking = base.Columns["NumSheetsWorking"]; this.columnNumSheetsWorked = base.Columns["NumSheetsWorked"]; + this.columnNumSheetsUnloaded = base.Columns["NumSheetsUnloaded"]; + this.columnNumSheetsToRedo = base.Columns["NumSheetsToRedo"]; this.columnNumItems = base.Columns["NumItems"]; } @@ -2051,8 +2119,14 @@ namespace AppData { base.Columns.Add(this.columnNumSheetsPrepared); this.columnNumSheetsPrinted = new global::System.Data.DataColumn("NumSheetsPrinted", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumSheetsPrinted); + this.columnNumSheetsWorking = new global::System.Data.DataColumn("NumSheetsWorking", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSheetsWorking); this.columnNumSheetsWorked = new global::System.Data.DataColumn("NumSheetsWorked", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumSheetsWorked); + this.columnNumSheetsUnloaded = new global::System.Data.DataColumn("NumSheetsUnloaded", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSheetsUnloaded); + this.columnNumSheetsToRedo = new global::System.Data.DataColumn("NumSheetsToRedo", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSheetsToRedo); this.columnNumItems = new global::System.Data.DataColumn("NumItems", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumItems); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { @@ -2067,7 +2141,10 @@ namespace AppData { this.columnNumSheets.ReadOnly = true; this.columnNumSheetsPrepared.ReadOnly = true; this.columnNumSheetsPrinted.ReadOnly = true; + this.columnNumSheetsWorking.ReadOnly = true; this.columnNumSheetsWorked.ReadOnly = true; + this.columnNumSheetsUnloaded.ReadOnly = true; + this.columnNumSheetsToRedo.ReadOnly = true; this.columnNumItems.ReadOnly = true; } @@ -11723,6 +11800,28 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int SchedStatus { + get { + return ((int)(this[this.tableBatchList.SchedStatusColumn])); + } + set { + this[this.tableBatchList.SchedStatusColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int SchedPrior { + get { + return ((int)(this[this.tableBatchList.SchedPriorColumn])); + } + set { + this[this.tableBatchList.SchedPriorColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int NumErrPre { @@ -12078,6 +12177,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumSheetsWorking { + get { + try { + return ((int)(this[this.tableStackList.NumSheetsWorkingColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumSheetsWorking\' nella tabella \'StackList\' è DBNull.", e); + } + } + set { + this[this.tableStackList.NumSheetsWorkingColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int NumSheetsWorked { @@ -12094,6 +12209,38 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumSheetsUnloaded { + get { + try { + return ((int)(this[this.tableStackList.NumSheetsUnloadedColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumSheetsUnloaded\' nella tabella \'StackList\' è DBNull.", e); + } + } + set { + this[this.tableStackList.NumSheetsUnloadedColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int NumSheetsToRedo { + get { + try { + return ((int)(this[this.tableStackList.NumSheetsToRedoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumSheetsToRedo\' nella tabella \'StackList\' è DBNull.", e); + } + } + set { + this[this.tableStackList.NumSheetsToRedoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int NumItems { @@ -12158,6 +12305,18 @@ namespace AppData { this[this.tableStackList.NumSheetsPrintedColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsNumSheetsWorkingNull() { + return this.IsNull(this.tableStackList.NumSheetsWorkingColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetNumSheetsWorkingNull() { + this[this.tableStackList.NumSheetsWorkingColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsNumSheetsWorkedNull() { @@ -12170,6 +12329,30 @@ namespace AppData { this[this.tableStackList.NumSheetsWorkedColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsNumSheetsUnloadedNull() { + return this.IsNull(this.tableStackList.NumSheetsUnloadedColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetNumSheetsUnloadedNull() { + this[this.tableStackList.NumSheetsUnloadedColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsNumSheetsToRedoNull() { + return this.IsNull(this.tableStackList.NumSheetsToRedoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetNumSheetsToRedoNull() { + this[this.tableStackList.NumSheetsToRedoColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsNumItemsNull() { @@ -17338,6 +17521,8 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("ApprovDate", "ApprovDate"); tableMapping.ColumnMappings.Add("ApprovUser", "ApprovUser"); tableMapping.ColumnMappings.Add("EnvNum", "EnvNum"); + tableMapping.ColumnMappings.Add("SchedStatus", "SchedStatus"); + tableMapping.ColumnMappings.Add("SchedPrior", "SchedPrior"); tableMapping.ColumnMappings.Add("NumErrPre", "NumErrPre"); tableMapping.ColumnMappings.Add("NumErr", "NumErr"); tableMapping.ColumnMappings.Add("NumOrders", "NumOrders"); @@ -17358,10 +17543,10 @@ 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[17]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[22]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM v_BatchList"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_BatchList"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -17391,78 +17576,106 @@ namespace AppData.DS_AppTableAdapters { this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ForceDelete", 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_Batch_getByKey"; + this._commandCollection[5].CommandText = "dbo.stp_Batch_fixRedoSheet"; 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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_Batch_getByMaxPosition"; + this._commandCollection[6].CommandText = "dbo.stp_Batch_fixSched"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Position", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_Batch_getByStatus"; + this._commandCollection[7].CommandText = "dbo.stp_Batch_getByKey"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].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[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_Batch_getCurrentByMachine"; + this._commandCollection[8].CommandText = "dbo.stp_Batch_getByMaxPosition"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Position", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.stp_Batch_getLastByTakt"; + this._commandCollection[9].CommandText = "dbo.stp_Batch_getByStatus"; this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; - this._commandCollection[10].CommandText = "dbo.stp_Batch_getNextAvailable"; + this._commandCollection[10].CommandText = "dbo.stp_Batch_getCurrentByMachine"; this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[11].Connection = this.Connection; - this._commandCollection[11].CommandText = "dbo.stp_Batch_redoPartValid"; + this._commandCollection[11].CommandText = "dbo.stp_Batch_getLastByTakt"; this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[12].Connection = this.Connection; - this._commandCollection[12].CommandText = "dbo.stp_Batch_resetAllNesting"; + this._commandCollection[12].CommandText = "dbo.stp_Batch_getNextAvailable"; this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[12].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[12].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[13] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[13].Connection = this.Connection; - this._commandCollection[13].CommandText = "dbo.stp_Batch_resetPartUnValid"; + this._commandCollection[13].CommandText = "dbo.stp_Batch_getRunning"; this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[13].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[14] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[14].Connection = this.Connection; - this._commandCollection[14].CommandText = "dbo.stp_zzz_resetProdCall"; + this._commandCollection[14].CommandText = "dbo.stp_Batch_getSched"; this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[14].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[15] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[15].Connection = this.Connection; - this._commandCollection[15].CommandText = "dbo.stp_Batch_resetTree"; + this._commandCollection[15].CommandText = "dbo.stp_Batch_redoPartValid"; this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[15].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[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[16] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[16].Connection = this.Connection; - this._commandCollection[16].CommandText = "dbo.stp_Batch_updateStatus"; + this._commandCollection[16].CommandText = "dbo.stp_Batch_resetAllNesting"; this._commandCollection[16].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[16].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[16].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[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[17] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[17].Connection = this.Connection; + this._commandCollection[17].CommandText = "dbo.stp_Batch_resetPartUnValid"; + this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[17].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[18] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[18].Connection = this.Connection; + this._commandCollection[18].CommandText = "dbo.stp_zzz_resetProdCall"; + this._commandCollection[18].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[18].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[19] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[19].Connection = this.Connection; + this._commandCollection[19].CommandText = "dbo.stp_Batch_resetTree"; + this._commandCollection[19].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[19].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[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[20] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[20].Connection = this.Connection; + this._commandCollection[20].CommandText = "dbo.stp_Batch_updateSchedPrior"; + this._commandCollection[20].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[20].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[20].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[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[21] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[21].Connection = this.Connection; + this._commandCollection[21].CommandText = "dbo.stp_Batch_updateStatus"; + this._commandCollection[21].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[21].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[21].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[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17494,7 +17707,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.BatchListDataTable getByKey(global::System.Nullable BatchID) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((BatchID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -17511,7 +17724,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.BatchListDataTable getByMaxPosition(global::System.Nullable Position) { - this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand = this.CommandCollection[8]; if ((Position.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Position.Value)); } @@ -17528,7 +17741,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.BatchListDataTable getByStatus(global::System.Nullable Status, string SearchVal, global::System.Nullable PartValid) { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[9]; if ((Status.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value)); } @@ -17557,7 +17770,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.BatchListDataTable getCurrentByMachine(string CodPosition) { - this.Adapter.SelectCommand = this.CommandCollection[8]; + this.Adapter.SelectCommand = this.CommandCollection[10]; if ((CodPosition == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -17574,7 +17787,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.BatchListDataTable getLastByTakt(string Takt) { - this.Adapter.SelectCommand = this.CommandCollection[9]; + this.Adapter.SelectCommand = this.CommandCollection[11]; if ((Takt == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -17591,7 +17804,29 @@ 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.BatchListDataTable getNextAvailable() { - this.Adapter.SelectCommand = this.CommandCollection[10]; + this.Adapter.SelectCommand = this.CommandCollection[12]; + DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable(); + 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.BatchListDataTable getRunning() { + this.Adapter.SelectCommand = this.CommandCollection[13]; + DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable(); + 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.BatchListDataTable getSched() { + this.Adapter.SelectCommand = this.CommandCollection[14]; DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -17721,11 +17956,61 @@ namespace AppData.DS_AppTableAdapters { return returnValue; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int fixRedoSheet(global::System.Nullable BatchID) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int fixSched() { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int redoPartValid(string Takt) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[15]; if ((Takt == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -17753,7 +18038,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 resetNesting(global::System.Nullable BatchID) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[16]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -17781,7 +18066,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 resetPartUnValid() { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[13]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[17]; global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -17803,7 +18088,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 resetProdCall() { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[14]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[18]; global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -17825,7 +18110,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 resetTree(global::System.Nullable Original_BatchID) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[15]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[19]; if ((Original_BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_BatchID.Value)); } @@ -17849,11 +18134,45 @@ namespace AppData.DS_AppTableAdapters { return returnValue; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int updateSchedPrior(global::System.Nullable BatchID, global::System.Nullable SchedPrio) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20]; + if ((BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((SchedPrio.HasValue == true)) { + command.Parameters[2].Value = ((int)(SchedPrio.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateStatus(global::System.Nullable BatchID, global::System.Nullable Status, string EnvNum, global::System.Nullable TotalTime) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[16]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -18025,7 +18344,10 @@ namespace AppData.DS_AppTableAdapters { tableMapping.ColumnMappings.Add("NumSheets", "NumSheets"); tableMapping.ColumnMappings.Add("NumSheetsPrepared", "NumSheetsPrepared"); tableMapping.ColumnMappings.Add("NumSheetsPrinted", "NumSheetsPrinted"); + tableMapping.ColumnMappings.Add("NumSheetsWorking", "NumSheetsWorking"); tableMapping.ColumnMappings.Add("NumSheetsWorked", "NumSheetsWorked"); + tableMapping.ColumnMappings.Add("NumSheetsUnloaded", "NumSheetsUnloaded"); + tableMapping.ColumnMappings.Add("NumSheetsToRedo", "NumSheetsToRedo"); tableMapping.ColumnMappings.Add("NumItems", "NumItems"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 8c803a4..e1363e1 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -12,7 +12,8 @@ - SELECT * FROM v_BatchList + SELECT * +FROM v_BatchList @@ -30,6 +31,8 @@ + + @@ -85,6 +88,27 @@ + + + + dbo.stp_Batch_fixRedoSheet + + + + + + + + + + + dbo.stp_Batch_fixSched + + + + + + @@ -152,7 +176,27 @@ - + + + + dbo.stp_Batch_getRunning + + + + + + + + + + dbo.stp_Batch_getSched + + + + + + + dbo.stp_Batch_redoPartValid @@ -163,7 +207,7 @@ - + dbo.stp_Batch_resetAllNesting @@ -174,7 +218,7 @@ - + dbo.stp_Batch_resetPartUnValid @@ -184,7 +228,7 @@ - + dbo.stp_zzz_resetProdCall @@ -194,7 +238,7 @@ - + dbo.stp_Batch_resetTree @@ -205,7 +249,19 @@ - + + + + dbo.stp_Batch_updateSchedPrior + + + + + + + + + dbo.stp_Batch_updateStatus @@ -242,7 +298,10 @@ FROM v_StackList + + + @@ -2412,6 +2471,8 @@ FROM v_CartKitDetail + + @@ -2445,7 +2506,10 @@ FROM v_CartKitDetail + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 7334bdc..babefcc 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -6,33 +6,33 @@ --> - - - + + + - + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -119,7 +119,7 @@ - + 1129 @@ -155,7 +155,7 @@ - + 131 @@ -167,7 +167,7 @@ - + 352 diff --git a/Jenkinsfile b/Jenkinsfile index 8256819..9be3301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=275']) { + withEnv(['NEXT_BUILD_NUMBER=276']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/App_Start/BundleConfig.cs b/NKC_WF/App_Start/BundleConfig.cs index ceb31d3..ae2f6ec 100644 --- a/NKC_WF/App_Start/BundleConfig.cs +++ b/NKC_WF/App_Start/BundleConfig.cs @@ -7,35 +7,36 @@ using System.Web.UI; namespace NKC_WF { - public class BundleConfig - { - // Per altre informazioni sulla creazione di bundle, vedere https://go.microsoft.com/fwlink/?LinkID=303951 - public static void RegisterBundles(BundleCollection bundles) + public class BundleConfig { - bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( - "~/Scripts/WebForms/WebForms.js", - "~/Scripts/WebForms/WebUIValidation.js", - "~/Scripts/WebForms/MenuStandards.js", - "~/Scripts/WebForms/Focus.js", - "~/Scripts/WebForms/GridView.js", - "~/Scripts/WebForms/DetailsView.js", - "~/Scripts/WebForms/TreeView.js", - "~/Scripts/WebForms/WebParts.js")); + // Per altre informazioni sulla creazione di bundle, vedere https://go.microsoft.com/fwlink/?LinkID=303951 + public static void RegisterBundles(BundleCollection bundles) + { + bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( + "~/Scripts/WebForms/WebForms.js", + "~/Scripts/WebForms/WebUIValidation.js", + "~/Scripts/WebForms/MenuStandards.js", + "~/Scripts/WebForms/Focus.js", + "~/Scripts/WebForms/GridView.js", + "~/Scripts/WebForms/DetailsView.js", + "~/Scripts/WebForms/TreeView.js", + "~/Scripts/WebForms/WebParts.js")); - // L'ordine è molto importante per il funzionamento di questi file poiché hanno dipendenze esplicite - bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include( - "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js")); + // L'ordine è molto importante per il funzionamento di questi file poiché hanno dipendenze esplicite + bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include( + "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js")); - // Utilizzare la versione di sviluppo di Modernizr per eseguire attività di sviluppo ed esercizi. Successivamente, quando si è - // pronti per passare alla produzione, usare lo strumento di compilazione disponibile all'indirizzo https://modernizr.com per selezionare solo i test necessari - bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( - "~/Scripts/modernizr-*")); + // Utilizzare la versione di sviluppo di Modernizr per eseguire attività di sviluppo ed esercizi. Successivamente, quando si è + // pronti per passare alla produzione, usare lo strumento di compilazione disponibile all'indirizzo https://modernizr.com per selezionare solo i test necessari + bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( + "~/Scripts/modernizr-*")); - // abilito bundle "forzato"! - BundleTable.EnableOptimizations = true; + + // abilito bundle "forzato"! + BundleTable.EnableOptimizations = true; + } } - } } \ No newline at end of file diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 030ac94..8e8a1b1 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -361,6 +361,7 @@ + @@ -370,6 +371,7 @@ + @@ -405,6 +407,8 @@ + + @@ -642,6 +646,13 @@ KitRequestImporter.aspx + + KitRequestSched.aspx + ASPXCodeBehind + + + KitRequestSched.aspx + Kitting.aspx ASPXCodeBehind @@ -705,6 +716,13 @@ OrderManager.aspx + + OrderScheduler.aspx + ASPXCodeBehind + + + OrderScheduler.aspx + Painting.aspx ASPXCodeBehind @@ -999,6 +1017,20 @@ cmp_OOLI_detail.ascx + + cmp_orderRunning.ascx + ASPXCodeBehind + + + cmp_orderRunning.ascx + + + cmp_orderSched.ascx + ASPXCodeBehind + + + cmp_orderSched.ascx + cmp_painting.ascx ASPXCodeBehind diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index 04be675..6adb7d0 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -9,55 +9,54 @@ - - - - - - - - - - NKC <%: Page.Title %> + + + + + + + + + + NKC <%: Page.Title %> - - <%: Scripts.Render("~/bundles/modernizr") %> - - - - + + <%: Scripts.Render("~/bundles/modernizr") %> + + + -
- - - <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> - <%--Framework Scripts--%> - - - - - - - - - - - - - <%--Site Scripts--%> - - + + + + <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> + <%--Framework Scripts--%> + + + + + + + + + + + + + <%--Site Scripts--%> + + - + -
- - - -
+
+ + + +
- + diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 6f5358c..edd882e 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -43,7 +43,6 @@ - diff --git a/NKC_WF/WebUserControls/cmp_orderRunning.ascx b/NKC_WF/WebUserControls/cmp_orderRunning.ascx new file mode 100644 index 0000000..a90cc15 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_orderRunning.ascx @@ -0,0 +1,20 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_orderRunning.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_orderRunning" %> + + + + + + + + + <%# traduci("NoRunnningOrders") %> + + + + + + + + + + diff --git a/NKC_WF/WebUserControls/cmp_orderRunning.ascx.cs b/NKC_WF/WebUserControls/cmp_orderRunning.ascx.cs new file mode 100644 index 0000000..cd5b68a --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_orderRunning.ascx.cs @@ -0,0 +1,18 @@ +using AppData; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_orderRunning : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + } + + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_orderRunning.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_orderRunning.ascx.designer.cs new file mode 100644 index 0000000..f3f15af --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_orderRunning.ascx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 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_orderRunning + { + + /// + /// Controllo grView. + /// + /// + /// 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.GridView grView; + + /// + /// Controllo odsOrders. + /// + /// + /// 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 odsOrders; + } +} diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx b/NKC_WF/WebUserControls/cmp_orderSched.ascx new file mode 100644 index 0000000..4815d09 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx @@ -0,0 +1,29 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_orderSched.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_orderSched" %> + + + + + + + + + No Record + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs b/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs new file mode 100644 index 0000000..83ab54e --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx.cs @@ -0,0 +1,94 @@ +using AppData; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_orderSched : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + fixSchedOrd(); + } + } + + protected int numRows + { + get + { + int answ = 0; + int.TryParse(hfNumRows.Value, out answ); + return answ; + } + set + { + hfNumRows.Value = value.ToString(); + } + } + + private void fixSchedOrd() + { + numRows = DataLayer.man.taBL.getSched().Count * 10; + DataLayer.man.taBL.fixSched(); + } + + + protected void lbtUp_Click(object sender, EventArgs e) + { + int BatchId = 0; + LinkButton lbtBtn = (LinkButton)sender; + if (lbtBtn != null) + { + int.TryParse(lbtBtn.CommandArgument, out BatchId); + moveBatch(BatchId, -15); + } + } + protected void lbtDown_Click(object sender, EventArgs e) + { + int BatchId = 0; + LinkButton lbtBtn = (LinkButton)sender; + if (lbtBtn != null) + { + int.TryParse(lbtBtn.CommandArgument, out BatchId); + moveBatch(BatchId, 15); + } + } + + private void moveBatch(int BatchId, int step) + { + // aggiorno + DataLayer.man.taBL.updateSchedPrior(BatchId, step); + // ricalcolo + fixSchedOrd(); + grView.DataBind(); + } + /// + /// Verifica visibilità da posizione + /// + /// first/last + /// num priorità attuale + /// + public bool checkVisible(string mode, object currPrior) + { + bool answ = true; + int numPrior = 0; + int.TryParse(currPrior.ToString(), out numPrior); + if (mode == "first") + { + answ = (numPrior != 10); + } + else + { + answ = (numPrior != numRows); + } + return answ; + } + + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs new file mode 100644 index 0000000..461ef53 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// 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_orderSched + { + + /// + /// Controllo grView. + /// + /// + /// 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.GridView grView; + + /// + /// Controllo odsOrders. + /// + /// + /// 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 odsOrders; + + /// + /// Controllo hfNumRows. + /// + /// + /// 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 hfNumRows; + } +} diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 8d6076a..11545d7 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -104,63 +104,61 @@ namespace NKC_WF.WebUserControls if (tabStack.Count == 0) { cmp_barcode.showOutput("badge badge-danger", $"BUNK NOT FOUND: {decoData.description}"); + doRaiseEv = true; } else { - // controllo sia quello RICHIESTO, eventualmente permetteremo TUTTI quelli del giorno in ogni ordine... - if (decoData.codeInt == cmp_stackNextloading.StackIdReq) + // verifico non sia già in lavorazione + if (currentBunkAlreadyWorking(decoData.codeInt)) { - cmp_barcode.showOutput("badge badge-success", $"BUNK OK, {decoData.rawData}"); - ComLib.taktMLCurrStack = decoData.code; - // processo DB e salvo che lo stack è stato caricato in MACHINE LOAD - int stackId = 0; - try - { - var tabStacks = DataLayer.man.taSTL.getByDtmx(decoData.rawData); - if (tabStack.Count == 1) - { - stackId = tabStack[0].StackID; - } - } - catch - { } - // SE HO uno stackId valido (>0)... - if (stackId > 0) - { - DataLayer.man.taSTL.updatePos(stackId, 5); - // controllo status del bunk nel suo insieme... - ComLib.updateBatchPositionByBunk(stackId); - doRaiseEv = true; - } + cmp_barcode.showOutput("badge badge-success", $"BUNK in processing, {decoData.rawData}"); + doRaiseEv = true; } else { - cmp_barcode.showOutput("badge badge-danger", $"WRONG BUNK, {decoData.rawData}"); + // controllo sia quello RICHIESTO + if (decoData.codeInt == cmp_stackNextloading.StackIdReq) + { + // verifico SE i BUNKS correnti siano tutti stati completati (NumSheet == NumWorking) + if (currentBunkPrinted) + { + cmp_barcode.showOutput("badge badge-success", $"BUNK OK, {decoData.rawData}"); + ComLib.taktMLCurrStack = decoData.code; + // processo DB e salvo che lo stack è stato caricato in MACHINE LOAD + int stackId = 0; + try + { + var tabStacks = DataLayer.man.taSTL.getByDtmx(decoData.rawData); + if (tabStack.Count == 1) + { + stackId = tabStack[0].StackID; + } + } + catch + { } + // SE HO uno stackId valido (>0)... + if (stackId > 0) + { + DataLayer.man.taSTL.updatePos(stackId, 5); + // controllo status del bunk nel suo insieme... + ComLib.updateBatchPositionByBunk(stackId); + doRaiseEv = true; + } + } + // altrimenti segnalo NON pronto x caricare prossimo + else + { + cmp_barcode.showOutput("badge badge-danger", $"PREV BUNK NOT COMPLETED, {decoData.rawData}"); + doRaiseEv = true; + } + } + else + { + cmp_barcode.showOutput("badge badge-danger", $"WRONG BUNK, {decoData.rawData}"); + doRaiseEv = true; + } } } - //DS_App.SheetListDataTable nextTbl = DataLayer.man.taSHL.getNextByStack(StackId); - //// se tab vuota --> HO FINITO!!!! - //if (nextTbl.Count == 0) - //{ - // cmp_barcode.showOutput("badge badge-warning", $"STACK IS COMPLETED, {decoData.description}"); - //} - //// se ho valori --> controllo se corretto... - //else - //{ - // string codReq = nextTbl[0].MatExtCode.ToString(); - // if (codReq == decoData.codeInt.ToString()) - // { - // cmp_barcode.showOutput("badge badge-success", $"SHEET RECORDED: {decoData.description}"); - // // chiamo stored x indicare preparato - // DataLayer.man.taSHL.setPrepared(nextTbl[0].SheetID); - // } - // else - // { - // cmp_barcode.showOutput("badge badge-danger", $"WRONG SHEET: {decoData.description}"); - // } - //} - - //cmp_barcode.showOutput("badge badge-warning", "Stack - ignored"); break; case codeType.Batch: cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}"); @@ -181,6 +179,47 @@ namespace NKC_WF.WebUserControls raiseEvent(); } } + protected bool currentBunkAlreadyWorking(int StackIdRequested) + { + bool answ = false; + // leggo i dati del bunk... + var currBunks = DataLayer.man.taSTL.getCurrByBatch(BatchIdCurr); + if (currBunks.Count > 0) + { + // verifico x ogni bunk corrente + foreach (var item in currBunks) + { + // verifico se numSheet = NumWorging + bool checkFound = item.StackID == StackIdRequested; + + // update answ + answ = answ || checkFound; + } + } + return answ; + } + protected bool currentBunkPrinted + { + get + { + bool answ = true; + // leggo i dati del bunk... + var currBunks = DataLayer.man.taSTL.getCurrByBatch(BatchIdCurr); + if (currBunks.Count > 0) + { + // verifico x ogni bunk corrente + foreach (var item in currBunks) + { + // verifico se numSheet = NumWorging + bool checkNum = item.NumSheets == item.NumSheetsWorking; + + // update answ + answ = answ && checkNum; + } + } + return answ; + } + } protected void checkVisibility() { diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx index ed1df7b..4d60c40 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx @@ -27,16 +27,27 @@ (/2) -
- sheets: | printed: - | worked: - +
+
+
+ sheets: +
+
+ printed: +
+
+ worked: +
+
+ To Redo: +
+
-
+
Items:
-
+
Items:
@@ -45,6 +56,7 @@ +<%: traduci("CollectRedo") %>
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs index 0b52b86..4a5a446 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.cs @@ -1,43 +1,67 @@ +using AppData; using System; +using System.Collections.Generic; namespace NKC_WF.WebUserControls { - public partial class cmp_stackNextloading : BaseUserControl - { - protected void Page_Load(object sender, EventArgs e) + public partial class cmp_stackNextloading : BaseUserControl { + protected void Page_Load(object sender, EventArgs e) + { + } - } + private void checkVisibility() + { + // mostra button x collezionare Redo SOLO SE ci sono fogli da rilavorare... + int numRedo = 0; + var stList = DataLayer.man.taSTL.getByBatch(BatchId); + foreach (var item in stList) + { + numRedo += item.NumSheetsToRedo; + } + lbtCollectRedo.Visible = numRedo > 0; + } - public int BatchId - { - set - { - hfBatchID.Value = value.ToString(); - doUpdate(); - } - get - { - int answ = 0; - int.TryParse(hfBatchID.Value, out answ); - return answ; - } - } + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + doUpdate(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } - public void doUpdate() - { - grViewCurrent.DataBind(); - frmViewNext.DataBind(); - } + public void doUpdate() + { + grViewCurrent.DataBind(); + frmViewNext.DataBind(); + checkVisibility(); + } - public int StackIdReq - { - get - { - int answ = 0; - int.TryParse(frmViewNext.SelectedValue.ToString(), out answ); - return answ; - } + public int StackIdReq + { + get + { + int answ = 0; + int.TryParse(frmViewNext.SelectedValue.ToString(), out answ); + return answ; + } + } + /// + /// Effettua steps x gestire Redo Sheets + /// + /// + /// + protected void lbtCollectRedo_Click(object sender, EventArgs e) + { + // chiamo stored x sistemare + DataLayer.man.taBL.fixRedoSheet(BatchId); + } } - } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs index 40f96a4..3c75949 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace NKC_WF.WebUserControls { - - - public partial class cmp_stackNextloading { - +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_stackNextloading + { + /// /// Controllo hfBatchID. /// @@ -20,7 +22,7 @@ namespace NKC_WF.WebUserControls { /// 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 grViewCurrent. /// @@ -29,7 +31,16 @@ namespace NKC_WF.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.GridView grViewCurrent; - + + /// + /// Controllo lbtCollectRedo. + /// + /// + /// 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.LinkButton lbtCollectRedo; + /// /// Controllo frmViewNext. /// @@ -38,7 +49,7 @@ namespace NKC_WF.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.FormView frmViewNext; - + /// /// Controllo odsCurr. /// @@ -47,7 +58,7 @@ namespace NKC_WF.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsCurr; - + /// /// Controllo odsNext. /// diff --git a/NKC_WF/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx new file mode 100644 index 0000000..85bd384 --- /dev/null +++ b/NKC_WF/site/KitRequestSched.aspx @@ -0,0 +1,21 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="KitRequestSched.aspx.cs" Inherits="NKC_WF.site.KitRequestSched" %> + + +
+
+
+

<%: traduci("KitRequestSched") %>

+
+
+ <%--
+
+ +
+
+ +
+
--%> +
+
+
+ diff --git a/NKC_WF/site/KitRequestSched.aspx.cs b/NKC_WF/site/KitRequestSched.aspx.cs new file mode 100644 index 0000000..02cceb7 --- /dev/null +++ b/NKC_WF/site/KitRequestSched.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class KitRequestSched : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/KitRequestSched.aspx.designer.cs b/NKC_WF/site/KitRequestSched.aspx.designer.cs new file mode 100644 index 0000000..3f3ddc0 --- /dev/null +++ b/NKC_WF/site/KitRequestSched.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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.site +{ + + + public partial class KitRequestSched + { + } +} diff --git a/NKC_WF/site/OrderScheduler.aspx b/NKC_WF/site/OrderScheduler.aspx new file mode 100644 index 0000000..8bff8b2 --- /dev/null +++ b/NKC_WF/site/OrderScheduler.aspx @@ -0,0 +1,26 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="OrderScheduler.aspx.cs" Inherits="NKC_WF.site.OrderScheduler" %> + +<%@ Register Src="~/WebUserControls/cmp_orderSched.ascx" TagPrefix="uc1" TagName="cmp_orderSched" %> +<%@ Register Src="~/WebUserControls/cmp_orderRunning.ascx" TagPrefix="uc1" TagName="cmp_orderRunning" %> + + + + +
+
+
+

<%: traduci("OrderScheduler") %>

+
+
+
+
+

<%: traduci("RunningOrders") %>

+ +

<%: traduci("ScheduledOrders") %>

+ +
+
+
+
+
+ diff --git a/NKC_WF/site/OrderScheduler.aspx.cs b/NKC_WF/site/OrderScheduler.aspx.cs new file mode 100644 index 0000000..58c6670 --- /dev/null +++ b/NKC_WF/site/OrderScheduler.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class OrderScheduler : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/OrderScheduler.aspx.designer.cs b/NKC_WF/site/OrderScheduler.aspx.designer.cs new file mode 100644 index 0000000..a2e7465 --- /dev/null +++ b/NKC_WF/site/OrderScheduler.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 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.site +{ + + + public partial class OrderScheduler + { + + /// + /// Controllo cmp_orderRunning. + /// + /// + /// 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_orderRunning cmp_orderRunning; + + /// + /// Controllo cmp_orderSched. + /// + /// + /// 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_orderSched cmp_orderSched; + } +} diff --git a/NKC_WF/site/StackManager.aspx b/NKC_WF/site/StackManager.aspx index 7e96255..f0f87cc 100644 --- a/NKC_WF/site/StackManager.aspx +++ b/NKC_WF/site/StackManager.aspx @@ -7,10 +7,9 @@ -
+
-

<%: traduci("StackManager") %>