From 2af230739d9fd6e2ae7eb195e5088242a42935a4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 8 Sep 2020 16:03:30 +0200 Subject: [PATCH] new rel --- AppData/ComLib.cs | 9 ++- AppData/DS_App.Designer.cs | 51 ++++++++---- AppData/DS_App.xsd | 98 +++++++++++------------ AppData/DS_App.xss | 48 +++++------ Jenkinsfile | 2 +- NKC_WF/Controllers/BatchProcController.cs | 2 +- 6 files changed, 114 insertions(+), 96 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 4f05a38..62ade78 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -883,18 +883,19 @@ namespace AppData foreach (var item in BinList) { // creo il BIN! - var newBin = DLMan.taBN.insertAndReturn(item.BinIndex); + object newBin = DLMan.taBN.insertAndReturn(item.BinIndex); + int BinID = 0; + bool valOk = int.TryParse(newBin.ToString(), out BinID); // se ho un BIN in risposta... - if (newBin.Count == 1) + if (valOk) { - var currBin = newBin[0]; // processo sheets if (item.PartList != null) { foreach (var part in item.PartList) { // creo lo sheet... - var newB2I = DLMan.taBNLS.insertAndReturn(currBin.BinID, part.PartId); + var newB2I = DLMan.taBNLS.insertAndReturn(BinID, part.PartId); } } } diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index d948462..21d5fd4 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -29980,23 +29980,6 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat 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.BinsDataTable insertAndReturn(global::System.Nullable BinIndex) { - this.Adapter.SelectCommand = this.CommandCollection[5]; - if ((BinIndex.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BinIndex.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; - } - DS_App.BinsDataTable dataTable = new DS_App.BinsDataTable(); - 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")] @@ -30049,6 +30032,40 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat 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")] + public virtual object insertAndReturn(global::System.Nullable BinIndex) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((BinIndex.HasValue == true)) { + command.Parameters[1].Value = ((int)(BinIndex.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(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return null; + } + else { + return ((object)(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")] diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 2162fdf..9ef621b 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1306,7 +1306,7 @@ SELECT MatID, MatExtCode, MatDesc, ApprovDate, ApprovUser, L_mm, W_mm, T_mm, Mat - + dbo.stp_BIN_insert @@ -3223,7 +3223,7 @@ FROM v_Pack2Cart - + @@ -3273,7 +3273,7 @@ FROM v_Pack2Cart - + @@ -3298,7 +3298,7 @@ FROM v_Pack2Cart - + @@ -3353,7 +3353,7 @@ FROM v_Pack2Cart - + @@ -3426,7 +3426,7 @@ FROM v_Pack2Cart - + @@ -3434,7 +3434,7 @@ FROM v_Pack2Cart - + @@ -3503,7 +3503,7 @@ FROM v_Pack2Cart - + @@ -3536,7 +3536,7 @@ FROM v_Pack2Cart - + @@ -3608,7 +3608,7 @@ FROM v_Pack2Cart - + @@ -3627,7 +3627,7 @@ FROM v_Pack2Cart - + @@ -3658,7 +3658,7 @@ FROM v_Pack2Cart - + @@ -3666,7 +3666,7 @@ FROM v_Pack2Cart - + @@ -3683,7 +3683,7 @@ FROM v_Pack2Cart - + @@ -3692,7 +3692,7 @@ FROM v_Pack2Cart - + @@ -3723,7 +3723,7 @@ FROM v_Pack2Cart - + @@ -3731,7 +3731,7 @@ FROM v_Pack2Cart - + @@ -3747,7 +3747,7 @@ FROM v_Pack2Cart - + @@ -3755,7 +3755,7 @@ FROM v_Pack2Cart - + @@ -3783,7 +3783,7 @@ FROM v_Pack2Cart - + @@ -3819,7 +3819,7 @@ FROM v_Pack2Cart - + @@ -3835,7 +3835,7 @@ FROM v_Pack2Cart - + @@ -3845,7 +3845,7 @@ FROM v_Pack2Cart - + @@ -3862,7 +3862,7 @@ FROM v_Pack2Cart - + @@ -3875,7 +3875,7 @@ FROM v_Pack2Cart - + @@ -3924,7 +3924,7 @@ FROM v_Pack2Cart - + @@ -3953,7 +3953,7 @@ FROM v_Pack2Cart - + @@ -3995,7 +3995,7 @@ FROM v_Pack2Cart - + @@ -4106,7 +4106,7 @@ FROM v_Pack2Cart - + @@ -4169,7 +4169,7 @@ FROM v_Pack2Cart - + @@ -4214,7 +4214,7 @@ FROM v_Pack2Cart - + @@ -4240,7 +4240,7 @@ FROM v_Pack2Cart - + @@ -4333,7 +4333,7 @@ FROM v_Pack2Cart - + @@ -4396,7 +4396,7 @@ FROM v_Pack2Cart - + @@ -4455,7 +4455,7 @@ FROM v_Pack2Cart - + @@ -4504,7 +4504,7 @@ FROM v_Pack2Cart - + @@ -4543,7 +4543,7 @@ FROM v_Pack2Cart - + @@ -4737,18 +4737,18 @@ FROM v_Pack2Cart - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 3278146..ce351f4 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,44 +4,44 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + - + - + - + - + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Jenkinsfile b/Jenkinsfile index 0ab88f6..da65076 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=363']) { + withEnv(['NEXT_BUILD_NUMBER=364']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 7cc95eb..640c2e6 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -329,7 +329,7 @@ namespace NKC_WF.Controllers answ = "WRONG DATA (expected baseNestAnsw object)"; } } - catch + catch(Exception exc) { answ = "NO"; }