diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 7f24a1e..120e119 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -533,7 +533,7 @@ namespace AppData currOrder = new Order() { OrderId = rigaOrd.OrdID, - OrderCod = rigaOrd.OrdCodOrig, + OrderCod = rigaOrd.FamilyCode, OrderExtCode = rigaOrd.OrderExtCode, DestPlant = rigaOrd.DestPlant, KitList = listKit @@ -1111,7 +1111,7 @@ namespace AppData { ProdBunk answ = null; string rawData = memLayer.ML.getRSV(redFirstBunkKey); - if (rawData != "") + if (!string.IsNullOrEmpty(rawData)) { // provo a deserializzare try diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 5306f2d..bfd059e 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -14920,6 +14920,7 @@ namespace AppData.DS_AppTableAdapters { this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WrkEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UnlStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UnlEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15223,7 +15224,7 @@ namespace AppData.DS_AppTableAdapters { [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 updateDate(global::System.Nullable Original_SheetID, global::System.Nullable PrntStart, global::System.Nullable PrntEnd, global::System.Nullable WrkStart, global::System.Nullable WrkEnd, global::System.Nullable UnlStart, global::System.Nullable UnlEnd) { + public virtual int updateDate(global::System.Nullable Original_SheetID, global::System.Nullable PrntStart, global::System.Nullable PrntEnd, global::System.Nullable WrkStart, global::System.Nullable WrkEnd, global::System.Nullable UnlStart, global::System.Nullable UnlEnd, global::System.Nullable ShStatus) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; if ((Original_SheetID.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_SheetID.Value)); @@ -15267,6 +15268,12 @@ namespace AppData.DS_AppTableAdapters { else { command.Parameters[7].Value = global::System.DBNull.Value; } + if ((ShStatus.HasValue == true)) { + command.Parameters[8].Value = ((int)(ShStatus.Value)); + } + else { + command.Parameters[8].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)) { diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 91d6e0b..a3601f1 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -488,6 +488,7 @@ FROM v_SheetList + @@ -2174,7 +2175,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2222,7 +2223,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2244,7 +2245,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2299,7 +2300,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2372,7 +2373,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2380,7 +2381,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2449,7 +2450,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2482,7 +2483,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2512,7 +2513,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2531,7 +2532,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2555,7 +2556,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2563,7 +2564,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2580,7 +2581,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2589,7 +2590,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2620,7 +2621,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2628,7 +2629,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2644,7 +2645,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2652,7 +2653,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2680,7 +2681,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2716,7 +2717,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2732,7 +2733,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2742,7 +2743,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2759,7 +2760,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - + @@ -2864,18 +2865,18 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 4bc35f2..2453ac3 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,18 +4,18 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + diff --git a/AppData/DS_Report.Designer.cs b/AppData/DS_Report.Designer.cs index 8a6e758..e0385bf 100644 --- a/AppData/DS_Report.Designer.cs +++ b/AppData/DS_Report.Designer.cs @@ -2258,7 +2258,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast [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[7]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLastT" + @@ -2272,36 +2272,53 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtLastTryMax", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_PJQ_getFirtsByUdc"; + this._commandCollection[2].CommandText = "dbo.stp_PJQ_getByQueue"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@keyParam", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@queue", global::System.Data.SqlDbType.VarChar, 50, 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_PJQ_getNext"; + this._commandCollection[3].CommandText = "dbo.stp_PJQ_getByQueueAll"; 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("@queue", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_PJQ_insert"; + this._commandCollection[4].CommandText = "dbo.stp_PJQ_getFirtsByUdc"; 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("@TipoReport", global::System.Data.SqlDbType.VarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@keyParam", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@prtName", global::System.Data.SqlDbType.VarChar, 500, global::System.Data.ParameterDirection.Input, 0, 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_PJQ_updateLastTry"; + this._commandCollection[5].CommandText = "dbo.stp_PJQ_getNext"; 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("@keyParam", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_PJQ_updateStato"; + this._commandCollection[6].CommandText = "dbo.stp_PJQ_getWaiting"; 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("@IdxPrintJob", 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("@stato", 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_PJQ_insert"; + 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("@TipoReport", global::System.Data.SqlDbType.VarChar, 250, 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("@keyParam", global::System.Data.SqlDbType.VarChar, 50, 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("@prtName", global::System.Data.SqlDbType.VarChar, 500, 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_PJQ_updateLastTry"; + 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("@keyParam", global::System.Data.SqlDbType.VarChar, 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_PJQ_updateStato"; + 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("@IdxPrintJob", 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("@stato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2332,8 +2349,42 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast [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_Report.PrintJobQueueDataTable getFirstByParam(string keyParam) { + public virtual DS_Report.PrintJobQueueDataTable getByQueue(string queue) { this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((queue == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(queue)); + } + DS_Report.PrintJobQueueDataTable dataTable = new DS_Report.PrintJobQueueDataTable(); + 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_Report.PrintJobQueueDataTable getByQueueAll(string queue) { + this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((queue == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(queue)); + } + DS_Report.PrintJobQueueDataTable dataTable = new DS_Report.PrintJobQueueDataTable(); + 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_Report.PrintJobQueueDataTable getFirstByParam(string keyParam) { + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((keyParam == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -2350,7 +2401,18 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Report.PrintJobQueueDataTable getNext() { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[5]; + DS_Report.PrintJobQueueDataTable dataTable = new DS_Report.PrintJobQueueDataTable(); + 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_Report.PrintJobQueueDataTable getWaiting() { + this.Adapter.SelectCommand = this.CommandCollection[6]; DS_Report.PrintJobQueueDataTable dataTable = new DS_Report.PrintJobQueueDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -2643,7 +2705,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int insertQuery(string TipoReport, string keyParam, string prtName) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((TipoReport == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -2683,7 +2745,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateLastTry(string keyParam) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((keyParam == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -2711,7 +2773,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateStato(global::System.Nullable IdxPrintJob, global::System.Nullable stato) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((IdxPrintJob.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxPrintJob.Value)); } diff --git a/AppData/DS_Report.xsd b/AppData/DS_Report.xsd index 0acc929..691165c 100644 --- a/AppData/DS_Report.xsd +++ b/AppData/DS_Report.xsd @@ -126,6 +126,28 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast + + + + dbo.stp_PJQ_getByQueue + + + + + + + + + + + dbo.stp_PJQ_getByQueueAll + + + + + + + @@ -147,6 +169,16 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast + + + + dbo.stp_PJQ_getWaiting + + + + + + @@ -262,7 +294,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -290,7 +322,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -322,7 +354,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + diff --git a/AppData/mongocrypt.dll b/AppData/mongocrypt.dll new file mode 100644 index 0000000..3cc3634 Binary files /dev/null and b/AppData/mongocrypt.dll differ diff --git a/Jenkinsfile b/Jenkinsfile index 0953f86..3b3ff65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=257']) { + withEnv(['NEXT_BUILD_NUMBER=260']) { // 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_SDK/Enums.cs b/NKC_SDK/Enums.cs index fcc1408..99ed6ad 100644 --- a/NKC_SDK/Enums.cs +++ b/NKC_SDK/Enums.cs @@ -163,7 +163,11 @@ /// /// Presente / letto su PROD e pronto su scissor lift /// - Present + Present, + /// + /// Da rilavorare + /// + ToBeRedone } /// /// Destinazioni per ITEM post CNC WORK diff --git a/NKC_WF/Controllers/BunkController.cs b/NKC_WF/Controllers/BunkController.cs index b1aeb15..922a853 100644 --- a/NKC_WF/Controllers/BunkController.cs +++ b/NKC_WF/Controllers/BunkController.cs @@ -89,7 +89,7 @@ namespace NKC_WF.Controllers { foreach (var item in currBunk.SheetList) { - DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd); + DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status); // verifico SE SIA AVVENUTO CON SUCCESSO lo step di lavorazione... if (item.Machining.Success) { @@ -133,7 +133,7 @@ namespace NKC_WF.Controllers { foreach (var item in currBunk.SheetList) { - DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd); + DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status); // SE machining completato --> status a LAVORATO! if (item.Machining.DtEnd != null) { diff --git a/NKC_WF/Controllers/PrintController.cs b/NKC_WF/Controllers/PrintController.cs deleted file mode 100644 index 25c0305..0000000 --- a/NKC_WF/Controllers/PrintController.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Web.Http; -using Newtonsoft.Json; -using SteamWare; -using System.IO; -using System.Web; - -namespace NKC_WF.Controllers -{ - public class PrintController : ApiController - { - // GET: api/Print - public IEnumerable Get() - { - return new string[] { "value1", "value2" }; - } - - // GET: api/Print/5 - public string Get(string id) - { - return $"requested id is {id}"; - } - -#if false - // POST: api/Print - public void Post([FromBody]string value) - { - } - - // PUT: api/Print/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE: api/Print/5 - public void Delete(int id) - { - } -#endif - - } -} diff --git a/NKC_WF/Controllers/PrintQueueConfController.cs b/NKC_WF/Controllers/PrintQueueConfController.cs index 9c6aa56..1927a39 100644 --- a/NKC_WF/Controllers/PrintQueueConfController.cs +++ b/NKC_WF/Controllers/PrintQueueConfController.cs @@ -2,6 +2,7 @@ using SteamWare; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Net; using System.Net.Http; @@ -10,11 +11,6 @@ using System.Web.Http; namespace NKC_WF.Controllers { - - public class ResponseModel - { - public List queueList { set; get; } = new List(); - } public class PrintQueueConfController : ApiController { /// @@ -24,52 +20,54 @@ namespace NKC_WF.Controllers /// lista oggetto Json in formato SteamwareSDK.queueConf public List Get() { - ResponseModel fullAnsw = new ResponseModel(); List answ = new List(); - // !!!FIXME!!! per ora hard coded, da usare conf file... - queueConf currConf; - string outForm = "EMF"; - string pagWidth = "8.5in"; - string pagHeigth = "11in"; - string margin = "0.5in"; - devInfoParam currDevInfoParam = new devInfoParam(outForm, pagHeigth, pagWidth, margin, margin, margin, margin); - currConf = new queueConf() + string dirPath = HttpContext.Current.Server.MapPath("~/Reports/"); + string nomeFile = "queueConf.json"; + bool fileExist = fileMover.obj.fileExist(dirPath, nomeFile); + if (fileExist) { - name = "queueBin", - template = "BinLabel.rdlc", - printerName = "Microsoft Print to PDF", - deviceInfoParam = currDevInfoParam, - rdsName = "stp_prt_BinLabel" - }; - answ.Add(currConf); - currConf = new queueConf() + string rawData = File.ReadAllText($"{dirPath}\\{nomeFile}"); + if(!string.IsNullOrEmpty(rawData)) + { + try + { + answ = JsonConvert.DeserializeObject>(rawData); + } + catch(Exception exc) + { + Log.Instance.Error(exc, "Eccezione in decodifica file conf printQueue"); + } + } + } + // se vuoto... creo! + if (answ.Count==0) { - name = "queueBunk", - template = "StackLabel.rdlc", - printerName = "Microsoft Print to PDF", - deviceInfoParam = currDevInfoParam, - rdsName = "stp_prt_StackLabel" - }; - answ.Add(currConf); - currConf = new queueConf() - { - name = "queueCart", - template = "CartLabel.rdlc", - printerName = "Microsoft Print to PDF", - deviceInfoParam = currDevInfoParam, - rdsName = "stp_prt_CartLabel" - }; - answ.Add(currConf); - fullAnsw.queueList = answ; - //return fullAnsw; + queueConf currConf; + string outForm = "EMF"; + string pagWidth = "8.5in"; + string pagHeigth = "11in"; + string margin = "0.5in"; + devInfoParam currDevInfoParam = new devInfoParam(outForm, pagHeigth, pagWidth, margin, margin, margin, margin); + currConf = new queueConf() + { + name = "default", + template = "missing.rdlc", + printerName = "Microsoft Print to PDF", + deviceInfoParam = currDevInfoParam, + rdsName = "stp_prt_missing" + }; + answ.Add(currConf); + } return answ; } +#if false // GET: api/PrintQueue/5 public string Get(int id) { return "value"; - } + } +#endif } } diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs new file mode 100644 index 0000000..9ff0c1b --- /dev/null +++ b/NKC_WF/Controllers/PrintQueueController.cs @@ -0,0 +1,211 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using Newtonsoft.Json; +using SteamWare; +using System.IO; +using System.Web; +using AppData; +using System.Data; +using NKC_SDK; + +namespace NKC_WF.Controllers +{ + public class PrintQueueController : ApiController + { + #region classi gestione PJQ + + /// + /// chaive redis x cache conteggio coda PJQ + /// + public static string redQueueCount = "NKC:SERV:PJQ"; + /// + /// Conteggio elementi in attesa stsampa da DB + /// + protected int countWaitingDb + { + get + { + int answ = 0; + // resetto conteggio in redis... + DS_Report.PrintJobQueueDataTable nextJob = DataLayer.man.taPJQ.getWaiting(); + if (nextJob != null) + { + answ = nextJob.Count; + } + return answ; + } + } + /// + /// carica i dati richiesti dal report dalla StoredProcedure (filtrando quindi...) + /// + /// + /// cod UDC + /// tabella dati + private DataTable caricaDati(reportRichiesto tipoReport, string keyParam) + { + int intIdx = 0; + DataTable tab = new DataTable(); + switch (tipoReport) + { + case reportRichiesto.cartLabel: + // int.TryParse(keyParam, out intIdx); + // tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); + break; + case reportRichiesto.paintLabelPre: + // int.TryParse(keyParam, out intIdx); + // tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); + break; + case reportRichiesto.paintLabelPost: + // int.TryParse(keyParam, out intIdx); + // tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); + break; + case reportRichiesto.partLabel: + int.TryParse(keyParam, out intIdx); + tab = (DataTable)DataLayer.man.taIL.getByKey(intIdx); + break; + case reportRichiesto.stackLabel: + int.TryParse(keyParam, out intIdx); + tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); + break; + default: + break; + } + return tab; + } + + + protected reportRichiesto reportByTipo(string tipo) + { + reportRichiesto report = reportRichiesto.stackLabel; + switch (tipo) + { + case "docPaint": + report = reportRichiesto.paintLabelPre; + break; + case "docPaintPost": + report = reportRichiesto.paintLabelPost; + break; + case "docCart": + report = reportRichiesto.cartLabel; + break; + case "docPart": + report = reportRichiesto.partLabel; + break; + case "docStack": + report = reportRichiesto.stackLabel; + break; + default: + break; + } + return report; + } + + #endregion + + #region REST api call + + /// + /// Restituisce numero jobs aperti (stato = 0...), se 0 = NESSUNO + /// GET: api/PrintQueue + /// + /// + public int Get() + { + // restituisco... + int answ = 0; + string redVal = memLayer.ML.getRSV(redQueueCount); + // cerco in redis se ci sia chiave.. + if (!string.IsNullOrEmpty(redVal)) + { + // recupero + int.TryParse(redVal, out answ); + } + else + { + // recupero da dbe e salvo + answ = countWaitingDb; + memLayer.ML.setRSV(redQueueCount, answ.ToString(), 30); + } + return answ; + } + + /// + /// Elenco dei jobs aperti per la coda indicata + /// GET: api/PrintQueue/queue_01 + /// + /// + /// + public List Get(string id) + { + List answ = new List(); + // recupero da DB... + DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getByQueue(id); + if (tabPJQ.Count > 0) + { + reportData currReport = new reportData(); + DataTable currTab; + // ciclo! + foreach (var pjReq in tabPJQ) + { + currTab = caricaDati(reportByTipo(pjReq.TipoReport), pjReq.KeyParam); + // in base alla coda --> recupero i dati + currReport = new reportData() + { + ticketNum = pjReq.IdxPrintJob.ToString(), + rdsTable = currTab + }; + answ.Add(currReport); + } + } + // compongo risposta... + return answ; + } + + /// + /// Processa una chiamata POST per l'invio in blocco del risultato dell'elaborazione + /// POST: api/PrintQueue + /// + /// + [HttpPost] + public string Post() + { + string answ = "UNKN"; + // questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo... + string content = ""; + System.Web.HttpContext.Current.Request.InputStream.Position = 0; + using (var reader = new StreamReader(System.Web.HttpContext.Current.Request.InputStream, System.Text.Encoding.UTF8, true, 4096, true)) + { + content = reader.ReadToEnd(); + } + //Rest + System.Web.HttpContext.Current.Request.InputStream.Position = 0; + // procedo a deserializzare in blocco l'oggetto... + try + { + // deserializzo. + printTask printAnsw = JsonConvert.DeserializeObject(content); + // verifico se mi abbia dato esito 1 --> aggiorno DB! + if (printAnsw != null) + { + int idxPJQ = 0; + int.TryParse(printAnsw.ticketNum, out idxPJQ); + DataLayer.man.taPJQ.updateStato(idxPJQ, printAnsw.newStatus); + // resetto conteggio in redis... + memLayer.ML.setRSV(redQueueCount, countWaitingDb.ToString(), 30); + answ = "OK"; + } + } + catch + { } + // restituisco esito! + return answ; + } + + #endregion + + } +} diff --git a/NKC_WF/Controllers/ReportController.cs b/NKC_WF/Controllers/ReportController.cs index 8651a30..fec9da5 100644 --- a/NKC_WF/Controllers/ReportController.cs +++ b/NKC_WF/Controllers/ReportController.cs @@ -33,13 +33,17 @@ namespace NKC_WF.Controllers string fileContent = ""; foreach (var item in fileList) { - fileContent = File.ReadAllText($"{dirPath}\\{item.Nome}"); - currFile = new smallFile() + // SOLO rdlc... + if (item.Nome.EndsWith("rdlc")) { - fileName = item.Nome, - content = fileContent.Replace("\r\n", Environment.NewLine) - }; - answ.fileList.Add(currFile); + fileContent = File.ReadAllText($"{dirPath}\\{item.Nome}"); + currFile = new smallFile() + { + fileName = item.Nome, + content = fileContent.Replace("\r\n", Environment.NewLine) + }; + answ.fileList.Add(currFile); + } } } catch (Exception exc) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index eaa5237..4ff7c11 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -125,8 +125,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2002.718\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2002.719\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -476,6 +476,7 @@ + @@ -512,7 +513,7 @@ VersGen.cs - + diff --git a/NKC_WF/Reports/queueConf.json b/NKC_WF/Reports/queueConf.json new file mode 100644 index 0000000..4f2b17c --- /dev/null +++ b/NKC_WF/Reports/queueConf.json @@ -0,0 +1,66 @@ +[ + { + "name": "queueBin", + "template": "BinLabel.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + }, + "rdsName": "stp_prt_BinLabel" + }, + { + "name": "queueBunk", + "template": "StackLabel.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + }, + "rdsName": "stp_prt_StackLabel" + }, + { + "name": "queueCart", + "template": "CartLabel.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + }, + "rdsName": "stp_prt_CartLabel" + }, + { + "name": "queuePart", + "template": "PartLabel.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + }, + "rdsName": "stp_prt_PartLabel" + } +] \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 5542f3a..e968941 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -146,7 +146,7 @@ namespace NKC_WF.WebUserControls double minRatio = workRatio.Min(); double maxRatio = workRatio.Max(); sbDebug.AppendLine($"NEST: EnvNum: {nestAnsw.EnvNum} | Worktime: {nestAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {nestAnsw.ProcessingRuntime / 60:N2} min"); - lblMatDet.Text = $"avg: {avgRatio:P1} ({minRatio:P1} → {maxRatio:P1}) | {materialsList.Count} matetials"; + lblMatDet.Text = $"avg: {avgRatio:P1} ({minRatio:P1} → {maxRatio:P1}) | {materialsList.Count} materials"; lblProdDet.Text = $"Bunks: {nestAnsw.BunkList.Count} | Sheets: {totSheet} | Carts: {nestAnsw.CartList.Count} | Bins: {nestAnsw.BinList.Count}"; // se ho duplicati indico: if (partListNestDupl.Count > 0) diff --git a/NKC_WF/mongocrypt.dll b/NKC_WF/mongocrypt.dll new file mode 100644 index 0000000..3cc3634 Binary files /dev/null and b/NKC_WF/mongocrypt.dll differ diff --git a/NKC_WF/packages.config b/NKC_WF/packages.config index d95fbe4..f2fd5b3 100644 --- a/NKC_WF/packages.config +++ b/NKC_WF/packages.config @@ -56,7 +56,7 @@ - + diff --git a/PROD/Form1.Designer.vb b/PROD/Form1.Designer.vb deleted file mode 100644 index 9af8cb2..0000000 --- a/PROD/Form1.Designer.vb +++ /dev/null @@ -1,50 +0,0 @@ - _ -Partial Class Form1 - Inherits System.Windows.Forms.Form - - 'Form esegue l'override del metodo Dispose per pulire l'elenco dei componenti. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Richiesto da Progettazione Windows Form - Private components As System.ComponentModel.IContainer - - 'NOTA: la procedura che segue è richiesta da Progettazione Windows Form - 'Può essere modificata in Progettazione Windows Form. - 'Non modificarla mediante l'editor del codice. - _ - Private Sub InitializeComponent() - Me.Button1 = New System.Windows.Forms.Button() - Me.SuspendLayout() - ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(41, 98) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 0 - Me.Button1.Text = "Button1" - Me.Button1.UseVisualStyleBackColor = True - ' - 'Form1 - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.Button1) - Me.Name = "Form1" - Me.Text = "Form1" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents Button1 As Button -End Class diff --git a/PROD/Form1.resx b/PROD/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/PROD/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/PROD/Form1.vb b/PROD/Form1.vb deleted file mode 100644 index 3fec515..0000000 --- a/PROD/Form1.vb +++ /dev/null @@ -1,18 +0,0 @@ -Imports NKC_SDK - -Public Class Form1 - - - ' caricamento del NEXT STACK da redis (come oggetto) - ' PROD http : http://seriate.steamware.net:8083/NKC/ - ' DEV: https : http://localhost:44388/ - Dim baseUrl As String = "http://seriate.steamware.net:8083/NKC/" - Dim currNKC As NKC = New NKC(baseUrl) - Dim currentBunk As ProdBunk = Nothing - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - ' recupero BUNK! - currentBunk = currNKC.getFirstBunk - - End Sub -End Class diff --git a/PROD/My Project/Application.Designer.vb b/PROD/My Project/Application.Designer.vb deleted file mode 100644 index cc3c497..0000000 --- a/PROD/My Project/Application.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. - ' - Partial Friend Class MyApplication - - _ - Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false - Me.EnableVisualStyles = true - Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses - End Sub - - _ - Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.PROD.Form1 - End Sub - End Class -End Namespace diff --git a/PROD/My Project/Application.myapp b/PROD/My Project/Application.myapp deleted file mode 100644 index 1243847..0000000 --- a/PROD/My Project/Application.myapp +++ /dev/null @@ -1,11 +0,0 @@ - - - true - Form1 - false - 0 - true - 0 - 0 - true - diff --git a/PROD/My Project/AssemblyInfo.vb b/PROD/My Project/AssemblyInfo.vb deleted file mode 100644 index 9dfd183..0000000 --- a/PROD/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Le informazioni generali relative a un assembly sono controllate dal seguente -' set di attributi. Modificare i valori di questi attributi per modificare le informazioni -' associate a un assembly. - -' Controllare i valori degli attributi degli assembly - - - - - - - - - - -'Se il progetto viene esposto a COM, il GUID seguente verrà utilizzato come ID della libreria dei tipi - - -' Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori: -' -' Versione principale -' Versione secondaria -' Numero di build -' Revisione -' -' È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build -' usando l'asterisco '*' come illustrato di seguito: -' - - - diff --git a/PROD/My Project/Resources.Designer.vb b/PROD/My Project/Resources.Designer.vb deleted file mode 100644 index 49883da..0000000 --- a/PROD/My Project/Resources.Designer.vb +++ /dev/null @@ -1,62 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Returns the cached ResourceManager instance used by this class. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("PROD.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/PROD/My Project/Resources.resx b/PROD/My Project/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/PROD/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/PROD/My Project/Settings.Designer.vb b/PROD/My Project/Settings.Designer.vb deleted file mode 100644 index 7a68ab8..0000000 --- a/PROD/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.PROD.My.MySettings - Get - Return Global.PROD.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/PROD/My Project/Settings.settings b/PROD/My Project/Settings.settings deleted file mode 100644 index 85b890b..0000000 --- a/PROD/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/PROD/PROD.vbproj b/PROD/PROD.vbproj deleted file mode 100644 index f132494..0000000 --- a/PROD/PROD.vbproj +++ /dev/null @@ -1,125 +0,0 @@ - - - - - Debug - AnyCPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF} - WinExe - PROD.My.MyApplication - PROD - PROD - 512 - WindowsForms - v4.0 - true - - - AnyCPU - true - full - true - true - bin\Debug\ - PROD.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - PROD.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - Form1.vb - Form - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - Form1.vb - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - {5a0b6e45-169b-44d4-9e24-13718b8eb7cc} - NKC_SDK - - - - \ No newline at end of file diff --git a/RedisExample.sln b/RedisExample.sln index 28d0ea1..2b82933 100644 --- a/RedisExample.sln +++ b/RedisExample.sln @@ -7,8 +7,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RedisExample", "RedisExampl EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NKC_SDK", "NKC_SDK\NKC_SDK.csproj", "{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PROD", "PROD\PROD.vbproj", "{F620BB3A-E68B-42C1-8FF6-15917C7629AF}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,12 +26,6 @@ Global {5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug-LELE|Any CPU.Build.0 = Debug|Any CPU {5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Release|Any CPU.Build.0 = Release|Any CPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF}.Debug-LELE|Any CPU.ActiveCfg = Debug|Any CPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF}.Debug-LELE|Any CPU.Build.0 = Debug|Any CPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F620BB3A-E68B-42C1-8FF6-15917C7629AF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RedisExample/App.config b/RedisExample/App.config index ca911f8..2a6563a 100644 --- a/RedisExample/App.config +++ b/RedisExample/App.config @@ -12,7 +12,7 @@ - +