diff --git a/C2P/WebUserControls/mod_S_Header.ascx b/C2P/WebUserControls/mod_S_Header.ascx index 75f0c7f..886da81 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx +++ b/C2P/WebUserControls/mod_S_Header.ascx @@ -54,7 +54,7 @@
- +
@@ -68,7 +68,6 @@
- <%----%>
diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx b/C2P/WebUserControls/mod_S_PackPar.ascx index e70bd70..958d1dc 100644 --- a/C2P/WebUserControls/mod_S_PackPar.ascx +++ b/C2P/WebUserControls/mod_S_PackPar.ascx @@ -54,6 +54,9 @@
+
+ +
@@ -102,6 +105,10 @@
+
+ + +
@@ -128,6 +135,7 @@ + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index f0d1973..35b8d4c 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 652c980..5f64ce1 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 755c182..a6ad900 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 5c58b6b..d9f2cbd 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -3727,6 +3727,8 @@ namespace C2P_Data { private global::System.Data.DataColumn columnP_MinPrice_sim; + private global::System.Data.DataColumn columnNetProd04_sim; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public QuoteFull_QDataTable() { @@ -4592,6 +4594,14 @@ namespace C2P_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NetProd04_simColumn { + get { + return this.columnNetProd04_sim; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4733,7 +4743,8 @@ namespace C2P_Data { decimal NetMar_sim, decimal FCShield_sim, decimal MinPrice_sim, - decimal P_MinPrice_sim) { + decimal P_MinPrice_sim, + decimal NetProd04_sim) { QuoteFull_QRow rowQuoteFull_QRow = ((QuoteFull_QRow)(this.NewRow())); object[] columnValuesArray = new object[] { Vers, @@ -4839,7 +4850,8 @@ namespace C2P_Data { NetMar_sim, FCShield_sim, MinPrice_sim, - P_MinPrice_sim}; + P_MinPrice_sim, + NetProd04_sim}; rowQuoteFull_QRow.ItemArray = columnValuesArray; this.Rows.Add(rowQuoteFull_QRow); return rowQuoteFull_QRow; @@ -4975,6 +4987,7 @@ namespace C2P_Data { this.columnFCShield_sim = base.Columns["FCShield_sim"]; this.columnMinPrice_sim = base.Columns["MinPrice_sim"]; this.columnP_MinPrice_sim = base.Columns["P_MinPrice_sim"]; + this.columnNetProd04_sim = base.Columns["NetProd04_sim"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5188,6 +5201,8 @@ namespace C2P_Data { base.Columns.Add(this.columnMinPrice_sim); this.columnP_MinPrice_sim = new global::System.Data.DataColumn("P_MinPrice_sim", typeof(decimal), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnP_MinPrice_sim); + this.columnNetProd04_sim = new global::System.Data.DataColumn("NetProd04_sim", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNetProd04_sim); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnQuoteType, this.columnCodQuote, @@ -5291,6 +5306,7 @@ namespace C2P_Data { this.columnMSR01_sim.AllowDBNull = false; this.columnNetProd01_sim.AllowDBNull = false; this.columnDSR_sim.AllowDBNull = false; + this.columnNetProd04_sim.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10572,6 +10588,17 @@ namespace C2P_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public decimal NetProd04_sim { + get { + return ((decimal)(this[this.tableQuoteFull_Q.NetProd04_simColumn])); + } + set { + this[this.tableQuoteFull_Q.NetProd04_simColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsCodClientAssocNull() { @@ -17558,6 +17585,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas tableMapping.ColumnMappings.Add("MinPrice_sim", "MinPrice_sim"); tableMapping.ColumnMappings.Add("P_MinPrice_sim", "P_MinPrice_sim"); tableMapping.ColumnMappings.Add("NumSMED", "NumSMED"); + tableMapping.ColumnMappings.Add("NetProd04_sim", "NetProd04_sim"); this._adapter.TableMappings.Add(tableMapping); } @@ -17759,6 +17787,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[17].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[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPackag", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DSR_sim", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NetProd04_sim", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[18] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[18].Connection = this.Connection; this._commandCollection[18].CommandText = "dbo.stp_QLF_UpdQState"; @@ -18397,7 +18426,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 updatePackPar(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, string CodPackag, global::System.Nullable DSR_sim) { + public virtual DS_Quotes.QuoteFull_QDataTable updatePackPar(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, string CodPackag, global::System.Nullable DSR_sim, global::System.Nullable NetProd04_sim) { this.Adapter.SelectCommand = this.CommandCollection[17]; if ((Original_QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18429,6 +18458,12 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas else { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } + if ((NetProd04_sim.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[6].Value = ((decimal)(NetProd04_sim.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; + } DS_Quotes.QuoteFull_QDataTable dataTable = new DS_Quotes.QuoteFull_QDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 1533148..e38648a 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -883,6 +883,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + @@ -1148,6 +1149,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + @@ -1870,7 +1872,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1954,7 +1956,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1990,7 +1992,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2015,7 +2017,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2095,7 +2097,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2132,7 +2134,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2202,7 +2204,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2453,10 +2455,11 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer + - + @@ -2694,7 +2697,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2715,7 +2718,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2850,11 +2853,11 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - - - - - + + + + + \ No newline at end of file diff --git a/C2P_Data/DS_Quotes.xss b/C2P_Data/DS_Quotes.xss index d106d29..b196130 100644 --- a/C2P_Data/DS_Quotes.xss +++ b/C2P_Data/DS_Quotes.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -12,7 +12,7 @@ - + diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 652c980..5f64ce1 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 a3b42bc..274c809 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 755c182..a6ad900 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ