From f3223e32ab0902afeb75b75e4bf8b7284a85e085 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 13 Jul 2020 15:46:52 +0200 Subject: [PATCH] Aggiunta gestione schedulazione ordini (da completare lato carico macchina) --- AppData/DS_App.Designer.cs | 236 +++++++++++++++--- AppData/DS_App.xsd | 127 +++++++--- AppData/DS_App.xss | 32 +-- NKC_WF/App_Start/BundleConfig.cs | 53 ++-- NKC_WF/NKC_WF.csproj | 16 ++ NKC_WF/Site.Master | 85 ++++--- NKC_WF/WebUserControls/cmp_orderRunning.ascx | 20 ++ .../WebUserControls/cmp_orderRunning.ascx.cs | 18 ++ .../cmp_orderRunning.ascx.designer.cs | 35 +++ NKC_WF/WebUserControls/cmp_orderSched.ascx | 29 +++ NKC_WF/WebUserControls/cmp_orderSched.ascx.cs | 94 +++++++ .../cmp_orderSched.ascx.designer.cs | 44 ++++ NKC_WF/site/KitRequestSched.aspx | 18 ++ NKC_WF/site/KitRequestSched.aspx.cs | 2 +- NKC_WF/site/KitRequestSched.aspx.designer.cs | 6 +- NKC_WF/site/OrderScheduler.aspx | 23 ++ NKC_WF/site/OrderScheduler.aspx.cs | 2 +- NKC_WF/site/OrderScheduler.aspx.designer.cs | 24 +- NKC_WF/site/StackManager.aspx | 3 +- 19 files changed, 692 insertions(+), 175 deletions(-) create mode 100644 NKC_WF/WebUserControls/cmp_orderRunning.ascx create mode 100644 NKC_WF/WebUserControls/cmp_orderRunning.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_orderRunning.ascx.designer.cs create mode 100644 NKC_WF/WebUserControls/cmp_orderSched.ascx create mode 100644 NKC_WF/WebUserControls/cmp_orderSched.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_orderSched.ascx.designer.cs diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 5145d4d..9a2feaf 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; @@ -11723,6 +11755,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 { @@ -17338,6 +17392,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 +17414,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[21]; 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 +17447,100 @@ 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_fixSched"; 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_getByKey"; 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[6].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[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_getByMaxPosition"; 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("@Position", 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_getByStatus"; 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("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].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[8].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[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_getCurrentByMachine"; 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("@CodPosition", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_getLastByTakt"; 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("@Takt", 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_getNextAvailable"; 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_getRunning"; 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_getSched"; 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_redoPartValid"; 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[14].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[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_resetAllNesting"; 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("@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] = 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_resetPartUnValid"; 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_zzz_resetProdCall"; + 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_Batch_resetTree"; + 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[18].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[19] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[19].Connection = this.Connection; + this._commandCollection[19].CommandText = "dbo.stp_Batch_updateSchedPrior"; + 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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[19].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[20] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[20].Connection = this.Connection; + this._commandCollection[20].CommandText = "dbo.stp_Batch_updateStatus"; + 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("@Status", 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("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[20].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 +17572,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[6]; if ((BatchID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -17511,7 +17589,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[7]; if ((Position.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Position.Value)); } @@ -17528,7 +17606,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[8]; if ((Status.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value)); } @@ -17557,7 +17635,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[9]; if ((CodPosition == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -17574,7 +17652,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[10]; if ((Takt == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -17591,7 +17669,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[11]; + 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[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 getSched() { + this.Adapter.SelectCommand = this.CommandCollection[13]; DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -17721,11 +17821,33 @@ 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 fixSched() { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + 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[14]; if ((Takt == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -17753,7 +17875,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[15]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -17781,7 +17903,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[16]; global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -17803,7 +17925,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[17]; global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -17825,7 +17947,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[18]; if ((Original_BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_BatchID.Value)); } @@ -17849,11 +17971,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[19]; + 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[20]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 8c803a4..122a7da 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,16 @@ + + + + dbo.stp_Batch_fixSched + + + + + + @@ -152,6 +165,26 @@ + + + + dbo.stp_Batch_getRunning + + + + + + + + + + dbo.stp_Batch_getSched + + + + + + @@ -205,6 +238,18 @@ + + + + dbo.stp_Batch_updateSchedPrior + + + + + + + + @@ -2380,7 +2425,7 @@ FROM v_CartKitDetail - + @@ -2412,6 +2457,8 @@ FROM v_CartKitDetail + + @@ -2428,7 +2475,7 @@ FROM v_CartKitDetail - + @@ -2450,7 +2497,7 @@ FROM v_CartKitDetail - + @@ -2505,7 +2552,7 @@ FROM v_CartKitDetail - + @@ -2578,7 +2625,7 @@ FROM v_CartKitDetail - + @@ -2586,7 +2633,7 @@ FROM v_CartKitDetail - + @@ -2655,7 +2702,7 @@ FROM v_CartKitDetail - + @@ -2688,7 +2735,7 @@ FROM v_CartKitDetail - + @@ -2729,7 +2776,7 @@ FROM v_CartKitDetail - + @@ -2748,7 +2795,7 @@ FROM v_CartKitDetail - + @@ -2772,7 +2819,7 @@ FROM v_CartKitDetail - + @@ -2780,7 +2827,7 @@ FROM v_CartKitDetail - + @@ -2797,7 +2844,7 @@ FROM v_CartKitDetail - + @@ -2806,7 +2853,7 @@ FROM v_CartKitDetail - + @@ -2837,7 +2884,7 @@ FROM v_CartKitDetail - + @@ -2845,7 +2892,7 @@ FROM v_CartKitDetail - + @@ -2861,7 +2908,7 @@ FROM v_CartKitDetail - + @@ -2869,7 +2916,7 @@ FROM v_CartKitDetail - + @@ -2897,7 +2944,7 @@ FROM v_CartKitDetail - + @@ -2933,7 +2980,7 @@ FROM v_CartKitDetail - + @@ -2949,7 +2996,7 @@ FROM v_CartKitDetail - + @@ -2959,7 +3006,7 @@ FROM v_CartKitDetail - + @@ -2976,7 +3023,7 @@ FROM v_CartKitDetail - + @@ -2989,7 +3036,7 @@ FROM v_CartKitDetail - + @@ -3039,7 +3086,7 @@ FROM v_CartKitDetail - + @@ -3065,7 +3112,7 @@ FROM v_CartKitDetail - + @@ -3107,7 +3154,7 @@ FROM v_CartKitDetail - + @@ -3324,18 +3371,18 @@ FROM v_CartKitDetail - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 7334bdc..d55b6f2 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -6,33 +6,33 @@ --> - + - + - - - + + + - + - - - - - - - - - - + + + + + + + + + + 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 90946af..8e8a1b1 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -407,6 +407,8 @@ + + @@ -1015,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/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/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx index b2e6d74..85bd384 100644 --- a/NKC_WF/site/KitRequestSched.aspx +++ b/NKC_WF/site/KitRequestSched.aspx @@ -1,3 +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 index c4e452b..02cceb7 100644 --- a/NKC_WF/site/KitRequestSched.aspx.cs +++ b/NKC_WF/site/KitRequestSched.aspx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace NKC_WF.site { - public partial class KitRequestSched : System.Web.UI.Page + public partial class KitRequestSched : BasePage { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/site/KitRequestSched.aspx.designer.cs b/NKC_WF/site/KitRequestSched.aspx.designer.cs index 1d91728..3f3ddc0 100644 --- a/NKC_WF/site/KitRequestSched.aspx.designer.cs +++ b/NKC_WF/site/KitRequestSched.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace NKC_WF.site diff --git a/NKC_WF/site/OrderScheduler.aspx b/NKC_WF/site/OrderScheduler.aspx index bdbe271..8bff8b2 100644 --- a/NKC_WF/site/OrderScheduler.aspx +++ b/NKC_WF/site/OrderScheduler.aspx @@ -1,3 +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 index f43e3dc..58c6670 100644 --- a/NKC_WF/site/OrderScheduler.aspx.cs +++ b/NKC_WF/site/OrderScheduler.aspx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace NKC_WF.site { - public partial class OrderScheduler : System.Web.UI.Page + public partial class OrderScheduler : BasePage { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/site/OrderScheduler.aspx.designer.cs b/NKC_WF/site/OrderScheduler.aspx.designer.cs index 6dc56cf..a2e7465 100644 --- a/NKC_WF/site/OrderScheduler.aspx.designer.cs +++ b/NKC_WF/site/OrderScheduler.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace NKC_WF.site @@ -13,5 +13,23 @@ 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") %>