diff --git a/C2P/Web.config b/C2P/Web.config index 3abc389..be16e44 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -34,8 +34,8 @@ - - + + diff --git a/C2P/WebUserControls/mod_createNewStdCost.ascx.cs b/C2P/WebUserControls/mod_createNewStdCost.ascx.cs index c560cf9..52f834b 100644 --- a/C2P/WebUserControls/mod_createNewStdCost.ascx.cs +++ b/C2P/WebUserControls/mod_createNewStdCost.ascx.cs @@ -73,7 +73,7 @@ namespace C2P.WebUserControls // processing... if (queueLenght() > 0) { - DtProxy.man.taSC2C.generateNewQLC(RawMatCost, batchQty, "C", string.Format("Created by {0} on {1:dd/MM/yy HH:mm}", user_std.UtSn.userNameAD, DateTime.Now), rec2procQLC); + DtProxy.man.taSC2C.generateNewQLC(rec2procQLC, string.Format("Created by {0} on {1:dd/MM/yy HH:mm}", user_std.UtSn.userNameAD, DateTime.Now), "C"); } else { @@ -191,8 +191,9 @@ namespace C2P.WebUserControls if (batchQty > 0 && RawMatCost > 0) { // elimino eventuale listino vecchio - int currDate = Convert.ToInt32(DateTime.Now.ToString("yyMMdd")); - DtProxy.man.taSCL.deleteByDate(currDate); + DtProxy.man.taSCL.deleteByDate(DateTime.Now); + // creo elenco articoli da generare... + DtProxy.man.taSC2C.insertForDate(RawMatCost, batchQty); // avvio creazione record (in small batch...) lblAcqOut.Text = ""; processQLC(); diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index eebbb27..4fe36e7 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 90ae318..96054d5 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 4e2ef13..b64a077 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs index 7fa4dec..ead8838 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -22228,10 +22228,10 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_QLC_deleteByDate"; + this._commandCollection[1].CommandText = "dbo.stp_SC2C_deleteForDate"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Date2Delete", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Date", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, 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_QLR_getByDate"; @@ -22284,10 +22284,10 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int deleteByDate(global::System.Nullable Date2Delete) { + public virtual int deleteByDate(global::System.Nullable Date) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; - if ((Date2Delete.HasValue == true)) { - command.Parameters[1].Value = ((int)(Date2Delete.Value)); + if ((Date.HasValue == true)) { + command.Parameters[1].Value = ((System.DateTime)(Date.Value)); } else { command.Parameters[1].Value = global::System.DBNull.Value; diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 93d8cc8..f513acf 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -1824,13 +1824,13 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + - dbo.stp_QLC_deleteByDate + dbo.stp_SC2C_deleteForDate - + @@ -1856,7 +1856,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1940,7 +1940,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1976,7 +1976,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2001,7 +2001,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2081,7 +2081,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2118,7 +2118,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2188,7 +2188,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2443,7 +2443,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2681,7 +2681,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2702,7 +2702,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2837,11 +2837,11 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - - - - - + + + + + \ No newline at end of file diff --git a/C2P_Data/DS_Utility.xsd b/C2P_Data/DS_Utility.xsd index 6adaeb3..aaba8a1 100644 --- a/C2P_Data/DS_Utility.xsd +++ b/C2P_Data/DS_Utility.xsd @@ -471,13 +471,23 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke dbo.stp_QLC_insNew + + + + + + + + + + + + + dbo.stp_SC2C_insertForDate - - - @@ -492,7 +502,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -512,7 +522,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -532,7 +542,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -552,7 +562,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -572,7 +582,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -592,7 +602,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -622,7 +632,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -643,7 +653,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -663,7 +673,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -683,7 +693,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -703,7 +713,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -715,14 +725,14 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + - + @@ -734,7 +744,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + @@ -748,7 +758,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + diff --git a/C2P_Data/DS_Utility.xss b/C2P_Data/DS_Utility.xss index 8505c58..708ea85 100644 --- a/C2P_Data/DS_Utility.xss +++ b/C2P_Data/DS_Utility.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/C2P_Data/DS_Utility1.Designer.cs b/C2P_Data/DS_Utility1.Designer.cs index 8d61393..a81b801 100644 --- a/C2P_Data/DS_Utility1.Designer.cs +++ b/C2P_Data/DS_Utility1.Designer.cs @@ -9694,7 +9694,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_SC2C_countRemaining"; @@ -9710,11 +9710,16 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke this._commandCollection[2].CommandText = "dbo.stp_QLC_insNew"; 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("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, 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("@Note", global::System.Data.SqlDbType.NVarChar, 2500, 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("@row2proc", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, 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("@QuoteType", global::System.Data.SqlDbType.Char, 1, 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_SC2C_insertForDate"; + 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("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", 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()] @@ -9755,8 +9760,48 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int generateNewQLC(global::System.Nullable RawMatCost, global::System.Nullable BatchQty, string QuoteType, string Note, global::System.Nullable row2proc) { + public virtual int generateNewQLC(global::System.Nullable row2proc, string Note, string QuoteType) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((row2proc.HasValue == true)) { + command.Parameters[1].Value = ((int)(row2proc.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((Note == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Note)); + } + if ((QuoteType == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(QuoteType)); + } + 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", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int insertForDate(global::System.Nullable RawMatCost, global::System.Nullable BatchQty) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((RawMatCost.HasValue == true)) { command.Parameters[1].Value = ((decimal)(RawMatCost.Value)); } @@ -9769,24 +9814,6 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((QuoteType == null)) { - command.Parameters[3].Value = global::System.DBNull.Value; - } - else { - command.Parameters[3].Value = ((string)(QuoteType)); - } - if ((Note == null)) { - command.Parameters[4].Value = global::System.DBNull.Value; - } - else { - command.Parameters[4].Value = ((string)(Note)); - } - if ((row2proc.HasValue == true)) { - command.Parameters[5].Value = ((int)(row2proc.Value)); - } - else { - command.Parameters[5].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/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 90ae318..96054d5 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 62afbf0..aae48b4 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 4e2ef13..b64a077 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ