diff --git a/C2P/C2P.csproj.user b/C2P/C2P.csproj.user index c19ac35..7102cee 100644 --- a/C2P/C2P.csproj.user +++ b/C2P/C2P.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - localhost + 218 diff --git a/C2P/OffersArchive.aspx b/C2P/OffersArchive.aspx index 04e2c3a..481b9b9 100644 --- a/C2P/OffersArchive.aspx +++ b/C2P/OffersArchive.aspx @@ -6,17 +6,19 @@ -
-
-
-

<%: traduci("OffersArchive") %>

-
-
- -
-
-
- +
+
+
+
+

<%: traduci("OffersArchive") %>

+
+
+ +
+
+
+ +
diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs index 9c29907..09da418 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs @@ -50,6 +50,20 @@ namespace C2P.WebUserControls lbDuplicate.CssClass = baseCss + "warning"; lbSimulate.CssClass = baseCss + "danger"; lbPrint.CssClass = baseCss + "info"; + + // cerco riga selezionata... + CheckBox chkBox; + for (int i = 0; i < grView.Rows.Count; i++) + { + grView.SelectedIndex = i; + chkBox=((CheckBox)grView.SelectedRow.FindControl("chkSelect")); + if (chkBox.Checked) + { + QuoteType = grView.SelectedDataKey["QuoteType"].ToString(); + CodQuote = grView.SelectedDataKey["CodQuote"].ToString(); + QuoteRev = grView.SelectedDataKey["QuoteRev"].ToString(); + } + } } else { @@ -83,15 +97,6 @@ namespace C2P.WebUserControls { return user_std.UtSn.Traduci(lemma.ToString()); } -#if false - private void ricalcolaQuote(string quoteType, long CodQuote, int Rev) - { - DateTime tick = DateTime.Now; - // aggiorno dati! - DtProxy.man.taQL.stp_QL_update(quoteType, CodQuote, Rev); - lblOut.Text = string.Format("Tempo ricalcolo: {0} ms", DateTime.Now.Subtract(tick).TotalMilliseconds); - } -#endif /// /// salvo e vado a dettaglio! /// @@ -264,17 +269,19 @@ namespace C2P.WebUserControls if (isChecked) { numSel++; +#if false + // salvo riga attuale... + GridViewRow riga = ((GridViewRow)chkbox.NamingContainer); + grView.SelectedIndex = riga.DataItemIndex; + QuoteType = grView.SelectedDataKey["QuoteType"].ToString(); + CodQuote = grView.SelectedDataKey["CodQuote"].ToString(); + QuoteRev = grView.SelectedDataKey["QuoteRev"].ToString(); +#endif } else { numSel--; } - // salvo riga attuale... - GridViewRow riga = ((GridViewRow)chkbox.NamingContainer); - grView.SelectedIndex = riga.DataItemIndex; - QuoteType = grView.SelectedDataKey["QuoteType"].ToString(); - CodQuote = grView.SelectedDataKey["CodQuote"].ToString(); - QuoteRev = grView.SelectedDataKey["QuoteRev"].ToString(); //grView.SelectedIndex = -1; // fix visibilità buttons setBtnVisib(); diff --git a/C2P/WebUserControls/mod_Q_Costs.ascx b/C2P/WebUserControls/mod_Q_Costs.ascx index aa786ab..4e1d2dd 100644 --- a/C2P/WebUserControls/mod_Q_Costs.ascx +++ b/C2P/WebUserControls/mod_Q_Costs.ascx @@ -10,107 +10,107 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/C2P/WebUserControls/mod_Q_ExtrPar.ascx b/C2P/WebUserControls/mod_Q_ExtrPar.ascx index cee9e59..dc28de2 100644 --- a/C2P/WebUserControls/mod_Q_ExtrPar.ascx +++ b/C2P/WebUserControls/mod_Q_ExtrPar.ascx @@ -9,58 +9,58 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/C2P/WebUserControls/mod_Q_Header.ascx b/C2P/WebUserControls/mod_Q_Header.ascx index 1b90bb6..76607a8 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx +++ b/C2P/WebUserControls/mod_Q_Header.ascx @@ -102,6 +102,7 @@  <%: traduci("Cancel") %>
+
diff --git a/C2P/WebUserControls/mod_Q_PackPar.ascx b/C2P/WebUserControls/mod_Q_PackPar.ascx index f37981c..9c413b0 100644 --- a/C2P/WebUserControls/mod_Q_PackPar.ascx +++ b/C2P/WebUserControls/mod_Q_PackPar.ascx @@ -13,41 +13,41 @@
- +
- +
- +
- +
- kg + kg
- kg + kg
- kg + kg
- +
- +
- +
- +
diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx b/C2P/WebUserControls/mod_Q_Quot.ascx index 84c1904..5404cf1 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx +++ b/C2P/WebUserControls/mod_Q_Quot.ascx @@ -1,2 +1,127 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Q_Quot.ascx.cs" Inherits="C2P.WebUserControls.mod_Q_Quot" %> -quotazione \ No newline at end of file +<%if (false) + { %> + + +<%} %> +<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %> + + + +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + +
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+  <%: traduci("Update") %> +
+
+  <%: traduci("Cancel") %> +
+
+
+
+
+ + + + + + + + + + + + + + diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx.cs b/C2P/WebUserControls/mod_Q_Quot.ascx.cs index 695a125..250b579 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Quot.ascx.cs @@ -7,11 +7,27 @@ using System.Web.UI.WebControls; namespace C2P.WebUserControls { - public partial class mod_Q_Quot : System.Web.UI.UserControl + public partial class mod_Q_Quot : SteamWare.UserControl { protected void Page_Load(object sender, EventArgs e) { } + + /// + /// fa toggle tra modo edit e read/item + /// + public void toggleMode() + { + if (frmView.CurrentMode == FormViewMode.ReadOnly) + { + frmView.ChangeMode(FormViewMode.Edit); + } + else + { + frmView.ChangeMode(FormViewMode.ReadOnly); + } + } + } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_Q_Quot.ascx.designer.cs b/C2P/WebUserControls/mod_Q_Quot.ascx.designer.cs index 3c90505..55b24c1 100644 --- a/C2P/WebUserControls/mod_Q_Quot.ascx.designer.cs +++ b/C2P/WebUserControls/mod_Q_Quot.ascx.designer.cs @@ -3,15 +3,49 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace C2P.WebUserControls -{ - - - public partial class mod_Q_Quot - { +namespace C2P.WebUserControls { + + + public partial class mod_Q_Quot { + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// frmView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmView; + + /// + /// odsQuotes control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsQuotes; } } diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index 6e02b74..d5801e7 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -31,7 +31,7 @@  <%: traduci("EXTRUS-PARAM") %>
-  <%: traduci("PACK-PARAM") %> +  <%: traduci("PACK-PARAM") %>
<%----%> @@ -57,7 +57,7 @@ <%--
--%>
- +  <%: traduci("QUOTATION") %>
<%--
--%> diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index cb2b767..02b519c 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -139,27 +139,41 @@ namespace C2P.WebUserControls /// private void setModVisibility(string req) { - mod_Q_Costs1.Visible = false; - mod_Q_ExtrPar1.Visible = false; - mod_Q_Header1.Visible = false; - mod_Q_PackPar1.Visible = false; switch (req) { case "Costs": mod_Q_Costs1.Visible = true; + mod_Q_ExtrPar1.Visible = false; + mod_Q_Header1.Visible = false; + mod_Q_PackPar1.Visible = false; break; case "ExtrPar": + mod_Q_Costs1.Visible = false; mod_Q_ExtrPar1.Visible = true; + mod_Q_Header1.Visible = false; + mod_Q_PackPar1.Visible = false; break; case "Header": - if (prevReq==req) mod_Q_Header1.toggleMode(); + if (prevReq == req) mod_Q_Header1.toggleMode(); + mod_Q_Costs1.Visible = false; + mod_Q_ExtrPar1.Visible = false; mod_Q_Header1.Visible = true; + mod_Q_PackPar1.Visible = false; break; case "PackPar": + mod_Q_Costs1.Visible = false; + mod_Q_ExtrPar1.Visible = false; + mod_Q_Header1.Visible = false; mod_Q_PackPar1.Visible = true; break; + case "Quote": + if (prevReq == req) mod_Q_Quot1.toggleMode(); + break; default: + mod_Q_Costs1.Visible = false; + mod_Q_ExtrPar1.Visible = false; mod_Q_Header1.Visible = true; + mod_Q_PackPar1.Visible = false; break; } prevReq = req; diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs index 0645ab3..01b2c58 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs @@ -85,13 +85,13 @@ namespace C2P.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lbExtrPar; /// - /// lbPAckPar control. + /// lbPackPar control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton lbPAckPar; + protected global::System.Web.UI.WebControls.LinkButton lbPackPar; /// /// mod_Q_Costs1 control. @@ -138,6 +138,15 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton LinkButton1; + /// + /// lbQuotation control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbQuotation; + /// /// mod_Q_Quot1 control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 9fe2e10..9a18fde 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 1f19601..82f0c1b 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/C2P_Data.pdb b/C2P/bin/C2P_Data.pdb index 6f18030..be19078 100644 Binary files a/C2P/bin/C2P_Data.pdb and b/C2P/bin/C2P_Data.pdb differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index fc96029..a30e2ab 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 a5d8afb..25acfff 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -12197,7 +12197,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [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[5]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_QL_fullDataAll"; @@ -12233,20 +12233,29 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, 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_QLF_UpdHead"; + this._commandCollection[4].CommandText = "dbo.stp_QLF_UpdCosts"; 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("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, 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("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", 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("@CodClient", global::System.Data.SqlDbType.NVarChar, 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("@CodItem", global::System.Data.SqlDbType.NVarChar, 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("@RawMat", global::System.Data.SqlDbType.NVarChar, 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("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, 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("@Note", global::System.Data.SqlDbType.NVarChar, 2500, 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("@PriceOff", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, 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_QLF_UpdHead"; + 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("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", 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("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12353,7 +12362,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_Quotes.QuoteFull_QDataTable updateHeaders(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note) { + public virtual DS_Quotes.QuoteFull_QDataTable updateCosts(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable PriceOff) { this.Adapter.SelectCommand = this.CommandCollection[4]; if ((Original_QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -12373,6 +12382,41 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((PriceOff.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((decimal)(PriceOff.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + DS_Quotes.QuoteFull_QDataTable dataTable = new DS_Quotes.QuoteFull_QDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Quotes.QuoteFull_QDataTable updateHeaders(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note) { + this.Adapter.SelectCommand = this.CommandCollection[5]; + if ((Original_QuoteType == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Original_QuoteType)); + } + if ((Original_CodQuote.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((long)(Original_CodQuote.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((Original_QuoteRev.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(Original_QuoteRev.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } if ((CodClient == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 45548a3..e3d6ea8 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -866,6 +866,20 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + + + + dbo.stp_QLF_UpdCosts + + + + + + + + + + @@ -897,7 +911,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -981,7 +995,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1017,7 +1031,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1042,7 +1056,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1122,7 +1136,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1159,7 +1173,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1229,7 +1243,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1506,11 +1520,11 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - - - - - + + + + + \ No newline at end of file diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 72f4192..11173ce 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll index 466c3f3..b1ab3ec 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ