diff --git a/C2P.v11.suo b/C2P.v11.suo index e405b10..73e0a90 100644 Binary files a/C2P.v11.suo and b/C2P.v11.suo differ diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index cd6e4d9..13cdb5f 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -194,6 +194,7 @@ + diff --git a/C2P/Report.aspx b/C2P/Report.aspx index e4f84af..8582ff0 100644 --- a/C2P/Report.aspx +++ b/C2P/Report.aspx @@ -4,4 +4,6 @@ +

+ Work In Progress

diff --git a/C2P/Simulation.aspx b/C2P/Simulation.aspx index 7c9e573..dcfc555 100644 --- a/C2P/Simulation.aspx +++ b/C2P/Simulation.aspx @@ -1,7 +1,15 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Simulation.aspx.cs" Inherits="C2P.Simulation" %> + +

+ Work In Progress

diff --git a/C2P/WebUserControls/mod_QuoteList.ascx b/C2P/WebUserControls/mod_QuoteList.ascx index 2ef1874..3511d0b 100644 --- a/C2P/WebUserControls/mod_QuoteList.ascx +++ b/C2P/WebUserControls/mod_QuoteList.ascx @@ -99,7 +99,7 @@ - / + / @@ -111,7 +111,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -127,15 +127,16 @@ - + + - + @@ -156,9 +157,15 @@ - + + + + + + + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index dea9416..2aec9e8 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P.pdb b/C2P/bin/C2P.pdb index 19a1c00..6269d0c 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 194ea40..b03ae2f 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 ba90cff..e3c2b00 100644 Binary files a/C2P/bin/C2P_Data.pdb and b/C2P/bin/C2P_Data.pdb differ diff --git a/C2P/help/index.html b/C2P/help/index.html new file mode 100644 index 0000000..0230881 --- /dev/null +++ b/C2P/help/index.html @@ -0,0 +1,11 @@ + + + + + + + +

+ Work In Progress

+ + diff --git a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache index e186def..0457b54 100644 Binary files a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache and b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache differ diff --git a/C2P/obj/Debug/C2P.dll b/C2P/obj/Debug/C2P.dll index dea9416..2aec9e8 100644 Binary files a/C2P/obj/Debug/C2P.dll and b/C2P/obj/Debug/C2P.dll differ diff --git a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 283616e..471ff34 100644 Binary files a/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/C2P/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs index 1bb9d88..b267e65 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -11639,7 +11639,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[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_QL_fullDataAll"; @@ -11654,6 +11654,15 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteRev", 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("@DoUpdate", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 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_QuoteFull_Q_update"; + 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("@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[2].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[2].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[2].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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11714,6 +11723,52 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas 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")] + public virtual int QuoteFull_Q_update(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable PriceOff) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((Original_QuoteType == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_QuoteType)); + } + if ((Original_CodQuote.HasValue == true)) { + command.Parameters[2].Value = ((long)(Original_CodQuote.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((Original_QuoteRev.HasValue == true)) { + command.Parameters[3].Value = ((int)(Original_QuoteRev.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((PriceOff.HasValue == true)) { + command.Parameters[4].Value = ((decimal)(PriceOff.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index d6b5da2..592d8ad 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -649,7 +649,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QL_fullDataAll @@ -757,6 +757,20 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + + + + dbo.stp_QuoteFull_Q_update + + + + + + + + + + diff --git a/C2P_Data/bin/Debug/C2P_Data.dll b/C2P_Data/bin/Debug/C2P_Data.dll index 194ea40..b03ae2f 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.dll and b/C2P_Data/bin/Debug/C2P_Data.dll differ diff --git a/C2P_Data/bin/Debug/C2P_Data.pdb b/C2P_Data/bin/Debug/C2P_Data.pdb index ba90cff..e3c2b00 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.pdb and b/C2P_Data/bin/Debug/C2P_Data.pdb differ diff --git a/C2P_Data/obj/Debug/C2P_Data.dll b/C2P_Data/obj/Debug/C2P_Data.dll index 194ea40..b03ae2f 100644 Binary files a/C2P_Data/obj/Debug/C2P_Data.dll and b/C2P_Data/obj/Debug/C2P_Data.dll differ diff --git a/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll b/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll index 9f92c2f..153ec77 100644 Binary files a/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll and b/C2P_Data/obj/Debug/TempPE/DS_Quotes.Designer.cs.dll differ