From cb64b9e9316c7e84e0be212d4ed5d9d63ab5b6df Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 15 Jan 2020 18:16:54 +0100 Subject: [PATCH 1/5] inizioa ggiunta cancellazione --- AppData/DS_App.Designer.cs | 103 ++++++++++++++++++++++++++----------- AppData/DS_App.xsd | 86 ++++++++++++++++++------------- 2 files changed, 121 insertions(+), 68 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 39299f0..67ab1ed 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -12413,7 +12413,7 @@ 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[12]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[13]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM v_BatchList"; @@ -12433,61 +12433,68 @@ namespace AppData.DS_AppTableAdapters { this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BasePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_Batch_getByKey"; + this._commandCollection[3].CommandText = "dbo.stp_Batch_deleteTree"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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[3].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[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_Batch_getByMaxPosition"; + this._commandCollection[4].CommandText = "dbo.stp_Batch_getByKey"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Position", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].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[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_Batch_getByStatus"; + this._commandCollection[5].CommandText = "dbo.stp_Batch_getByMaxPosition"; 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("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].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] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_Batch_getLastByTakt"; + this._commandCollection[6].CommandText = "dbo.stp_Batch_getByStatus"; 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("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].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] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_Batch_getNextAvailable"; + this._commandCollection[7].CommandText = "dbo.stp_Batch_getLastByTakt"; 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("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_redoPartValid"; + this._commandCollection[8].CommandText = "dbo.stp_Batch_getNextAvailable"; 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("@BasePath", 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("@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] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.stp_Batch_resetNesting"; + this._commandCollection[9].CommandText = "dbo.stp_Batch_redoPartValid"; 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("@BatchID", 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("@BasePath", 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("@Takt", 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_resetPartUnValid"; + this._commandCollection[10].CommandText = "dbo.stp_Batch_resetNesting"; 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("@BasePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].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[11] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[11].Connection = this.Connection; - this._commandCollection[11].CommandText = "dbo.stp_Batch_updateStatus"; + this._commandCollection[11].CommandText = "dbo.stp_Batch_resetPartUnValid"; 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("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].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[11].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[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BasePath", global::System.Data.SqlDbType.NVarChar, 500, 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_updateStatus"; + 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[12].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[12].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[12].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()] @@ -12519,7 +12526,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[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((BatchID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -12536,7 +12543,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[4]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((Position.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Position.Value)); } @@ -12553,7 +12560,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) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + this.Adapter.SelectCommand = this.CommandCollection[6]; if ((Status.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value)); } @@ -12570,7 +12577,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[6]; + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((Takt == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -12587,7 +12594,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 getNextAvailable() { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[8]; DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -12655,11 +12662,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 deleteTree(global::System.Nullable Original_BatchID, global::System.Nullable ForceDelete) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((Original_BatchID.HasValue == true)) { + command.Parameters[1].Value = ((int)(Original_BatchID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((ForceDelete.HasValue == true)) { + command.Parameters[2].Value = ((int)(ForceDelete.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 redoPartValid(string BasePath, string Takt) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((BasePath == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -12693,7 +12734,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[9]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); } @@ -12721,7 +12762,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(string BasePath) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; if ((BasePath == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -12749,7 +12790,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 updateStatus(global::System.Nullable BatchID, global::System.Nullable Status, string EnvNum, global::System.Nullable TotalTime) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 8bae37b..b7dd96f 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -62,6 +62,18 @@ + + + + dbo.stp_Batch_deleteTree + + + + + + + + @@ -116,7 +128,7 @@ - + dbo.stp_Batch_redoPartValid @@ -128,7 +140,7 @@ - + dbo.stp_Batch_resetNesting @@ -139,7 +151,7 @@ - + dbo.stp_Batch_resetPartUnValid @@ -150,7 +162,7 @@ - + dbo.stp_Batch_updateStatus @@ -1995,7 +2007,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2043,7 +2055,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2065,7 +2077,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2120,7 +2132,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2193,7 +2205,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2201,7 +2213,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2270,7 +2282,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2303,7 +2315,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2326,7 +2338,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2342,7 +2354,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2366,7 +2378,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2374,7 +2386,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2391,7 +2403,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2400,7 +2412,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2431,7 +2443,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2439,7 +2451,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2455,7 +2467,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2463,7 +2475,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2491,7 +2503,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2527,7 +2539,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2543,7 +2555,7 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - + @@ -2641,18 +2653,18 @@ SELECT ItemExtCode, BatchID, EvalDate, Status FROM ItemValidation WHERE (ItemExt - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file From 3dd4f177397744e6f0921636db084a62d8414d98 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 15 Jan 2020 18:17:05 +0100 Subject: [PATCH 2/5] images testing --- NKC_WF/Images/test.svg | 38 ++++++++++++++++++++++++-------------- NKC_WF/Images/test_1.svg | 15 +++++++++++++++ NKC_WF/Images/test_ok.svg | 25 ------------------------- 3 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 NKC_WF/Images/test_1.svg delete mode 100644 NKC_WF/Images/test_ok.svg diff --git a/NKC_WF/Images/test.svg b/NKC_WF/Images/test.svg index 6fb70de..1f44c04 100644 --- a/NKC_WF/Images/test.svg +++ b/NKC_WF/Images/test.svg @@ -1,15 +1,25 @@ - - - - - - - - - - - - - - + + + + IT000001 + + + + + + IT000002 + + + IT000003 + + + + + + + + + + + \ No newline at end of file diff --git a/NKC_WF/Images/test_1.svg b/NKC_WF/Images/test_1.svg new file mode 100644 index 0000000..6fb70de --- /dev/null +++ b/NKC_WF/Images/test_1.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/NKC_WF/Images/test_ok.svg b/NKC_WF/Images/test_ok.svg deleted file mode 100644 index 1f44c04..0000000 --- a/NKC_WF/Images/test_ok.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - IT000001 - - - - - - IT000002 - - - IT000003 - - - - - - - - - - - \ No newline at end of file From df1075ed8853472bd82dbe65cbadfc820785e994 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 15 Jan 2020 18:17:16 +0100 Subject: [PATCH 3/5] Fix eventi search da udpate text --- NKC_WF/WebUserControls/cmp_menuTop.ascx | 2 +- NKC_WF/WebUserControls/cmp_menuTop.ascx.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx b/NKC_WF/WebUserControls/cmp_menuTop.ascx index 472f502..bd2ae86 100644 --- a/NKC_WF/WebUserControls/cmp_menuTop.ascx +++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx @@ -48,7 +48,7 @@
- + Search
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs index 94ea88f..3dea261 100644 --- a/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx.cs @@ -16,6 +16,7 @@ namespace NKC_WF.WebUserControls if (!Page.IsPostBack) { searchVal = ""; + doSearch(); updateTreeMenu(); } } From 6fd5c7bb6e07ea23174401e20e7e15d8873785a4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 15 Jan 2020 18:17:24 +0100 Subject: [PATCH 4/5] Inserita caoncellazione --- NKC_WF/WebUserControls/cmp_batchList.ascx | 109 +++++++++++-------- NKC_WF/WebUserControls/cmp_batchList.ascx.cs | 14 ++- 2 files changed, 75 insertions(+), 48 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index b500d66..5d1032a 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -32,49 +32,70 @@   + + +
+ + + + + + + No Record + + + + +
+ +
+
+ +
+ + +
+
+
+ + + + <%# BStatus(Eval("Status")) %> + + + + + <%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %> + <%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %> + + + + + + + + + + + +
+ +
+
+
+
+
+ + + + + + + + + + + +
-
- - - - - - - No Record - - - - - - - - - - - - - - - <%# BStatus(Eval("Status")) %> - - - - - <%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %> - <%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %> - - - - - - - - - - - - - -
- diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 4d38dd4..0781183 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -9,6 +9,10 @@ namespace NKC_WF.WebUserControls { public partial class cmp_batchList : BaseUserControl { + /// + /// filtro base per ODS + /// + protected string baseFilterExpr = "(Takt LIKE '%{0}%' OR Errors LIKE '%{0}%' ) "; /// /// modalità funzionamento controllo /// @@ -36,11 +40,11 @@ namespace NKC_WF.WebUserControls { if (listMode == BatchListMode.Standard) { - ods.FilterExpression = " STATUS < 8 "; + ods.FilterExpression = $" {baseFilterExpr} AND STATUS < 8 "; } else { - ods.FilterExpression = " STATUS > 7"; + ods.FilterExpression = $" {baseFilterExpr} AND STATUS > 7"; } } /// @@ -52,7 +56,7 @@ namespace NKC_WF.WebUserControls int valore = -100; if (listMode == BatchListMode.Standard) { - ods.FilterExpression = " STATUS < 8 "; + ods.FilterExpression = $" {baseFilterExpr} AND STATUS < 8 "; foreach (var item in ddlStatus.Items) { try @@ -70,7 +74,7 @@ namespace NKC_WF.WebUserControls } else { - ods.FilterExpression = " STATUS > 7"; + ods.FilterExpression = $" {baseFilterExpr} AND STATUS > 7"; foreach (var item in ddlStatus.Items) { try @@ -201,6 +205,8 @@ namespace NKC_WF.WebUserControls { // eseguo richiesta reset DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"), lbt.CommandArgument); + // eventualmente mando primo batch da validare... + bool newValidSent = ComLib.sendFirstValidationBatch(); // refresh! resetSelezione(); } From 2de4347d04bc27dd5ac36d703ad4716f70766943 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 15 Jan 2020 18:17:37 +0100 Subject: [PATCH 5/5] refresh testing debug --- NKC_WF/NKC_WF.csproj | 4 ++-- NKC_WF/Web.config | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 61500a1..6b4a835 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -235,7 +235,7 @@ - + @@ -271,7 +271,7 @@ - + diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 7aa02bc..2e173a8 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -1,4 +1,4 @@ - + - - + + - - + value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/> + + @@ -424,4 +423,4 @@ - + \ No newline at end of file