diff --git a/C2P/Properties/PublishProfiles/IIS02.pubxml b/C2P/Properties/PublishProfiles/IIS02.pubxml index 1fc132a..7476218 100644 --- a/C2P/Properties/PublishProfiles/IIS02.pubxml +++ b/C2P/Properties/PublishProfiles/IIS02.pubxml @@ -22,11 +22,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - + @@ -50,7 +50,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer diff --git a/C2P/Properties/PublishProfiles/RemoteZip.pubxml b/C2P/Properties/PublishProfiles/RemoteZip.pubxml index 408806f..ff77583 100644 --- a/C2P/Properties/PublishProfiles/RemoteZip.pubxml +++ b/C2P/Properties/PublishProfiles/RemoteZip.pubxml @@ -21,22 +21,22 @@ by editing this MSBuild file. In order to learn more about this please visit htt C2P - - + + - - + + - + - - Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer + + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer False diff --git a/C2P/Properties/PublishProfiles/WinLab.pubxml b/C2P/Properties/PublishProfiles/WinLab.pubxml index 1165c44..37e4dfa 100644 --- a/C2P/Properties/PublishProfiles/WinLab.pubxml +++ b/C2P/Properties/PublishProfiles/WinLab.pubxml @@ -22,11 +22,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - + @@ -50,7 +50,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - + Data Source=localhost\SQLExpress2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer False diff --git a/C2P/Properties/PublishProfiles/costimate.pubxml b/C2P/Properties/PublishProfiles/costimate.pubxml index 4c4d086..76c41a6 100644 --- a/C2P/Properties/PublishProfiles/costimate.pubxml +++ b/C2P/Properties/PublishProfiles/costimate.pubxml @@ -21,11 +21,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - + @@ -45,7 +45,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + \ No newline at end of file diff --git a/C2P/Properties/PublishProfiles/demo.pubxml b/C2P/Properties/PublishProfiles/demo.pubxml index 240ee34..e47049e 100644 --- a/C2P/Properties/PublishProfiles/demo.pubxml +++ b/C2P/Properties/PublishProfiles/demo.pubxml @@ -21,14 +21,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - - + + - + @@ -39,7 +39,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - + Data Source=localhost\SQLExpress;Initial Catalog=C2P;Persist Security Info=True;User ID=connC2P;Password=C2P_pwd False diff --git a/C2P/Properties/PublishProfiles/localhost.pubxml b/C2P/Properties/PublishProfiles/localhost.pubxml index bed5de2..492ea94 100644 --- a/C2P/Properties/PublishProfiles/localhost.pubxml +++ b/C2P/Properties/PublishProfiles/localhost.pubxml @@ -25,20 +25,20 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - - + + - + - + \ No newline at end of file diff --git a/C2P/Web.DEMO.config b/C2P/Web.DEMO.config index 9bf1a90..7541105 100644 --- a/C2P/Web.DEMO.config +++ b/C2P/Web.DEMO.config @@ -35,7 +35,7 @@ - + diff --git a/C2P/Web.WinLab.config b/C2P/Web.WinLab.config index 062d8d2..d014a25 100644 --- a/C2P/Web.WinLab.config +++ b/C2P/Web.WinLab.config @@ -25,7 +25,7 @@ - + diff --git a/C2P/Web.deploy.config b/C2P/Web.deploy.config index d3b6e96..c1d1fb6 100644 --- a/C2P/Web.deploy.config +++ b/C2P/Web.deploy.config @@ -35,7 +35,7 @@ - + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 1c78e59..8d4e0c9 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 bb0c14e..75ea0a2 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 bf1db42..552ecfa 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Data/App.Config b/C2P_Data/App.Config index 277ff36..1d5feeb 100644 --- a/C2P_Data/App.Config +++ b/C2P_Data/App.Config @@ -5,7 +5,7 @@ - + diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs index ef2f489..6990445 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -13868,7 +13868,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15007,7 +15007,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumRM, RawMat, RawMatCost, RawMatExtraCost [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15539,7 +15539,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumWE, EWC4UG, UM, valid FROM QuoteWorkExt [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16040,7 +16040,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumWI, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16827,7 +16827,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumP, ProcessNum, Descr, Parameter FROM Qu [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17296,7 +17296,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17979,7 +17979,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -19943,7 +19943,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -22160,7 +22160,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -22674,7 +22674,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index e879a2b..e0b46f6 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -4,12 +4,12 @@ - + - + DELETE FROM [dbo].[QuoteList] WHERE (([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([IdxQState] = @Original_IdxQState) AND ([CodClient] = @Original_CodClient) AND ([CodItem] = @Original_CodItem) AND ([CodItemGroup] = @Original_CodItemGroup) AND ([RawMat] = @Original_RawMat) AND ([UnitWeight] = @Original_UnitWeight) AND ([BatchQty] = @Original_BatchQty) AND ([CodInco] = @Original_CodInco) AND ([KeyAM] = @Original_KeyAM) AND ([Note] = @Original_Note) AND ([PriceOff] = @Original_PriceOff) AND ((@IsNull_OrdDate = 1 AND [OrdDate] IS NULL) OR ([OrdDate] = @Original_OrdDate)) AND ([OrdNum] = @Original_OrdNum) AND ([OrdRow] = @Original_OrdRow) AND ([OrdPrice] = @Original_OrdPrice) AND ([OrdQty] = @Original_OrdQty) AND ([valid] = @Original_valid) AND ([errorScore] = @Original_errorScore) AND ([UserCreaz] = @Original_UserCreaz) AND ([DataCreaz] = @Original_DataCreaz) AND ([UserMod] = @Original_UserMod) AND ([DataMod] = @Original_DataMod)) @@ -169,7 +169,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + dbo.stp_QL_clone @@ -184,7 +184,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + dbo.stp_QL_getByKey @@ -197,7 +197,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + dbo.stp_QL_insNew @@ -217,7 +217,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + dbo.stp_QL_makeSim @@ -230,7 +230,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + dbo.stp_QL_newRev @@ -244,7 +244,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + dbo.stp_QL_update @@ -261,7 +261,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + DELETE FROM [dbo].[QuoteRM] WHERE (([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([NumRM] = @Original_NumRM) AND ([RawMat] = @Original_RawMat) AND ([RawMatCost] = @Original_RawMatCost) AND ([RawMatExtraCost] = @Original_RawMatExtraCost) AND ([CodPackag] = @Original_CodPackag) AND ([FCR] = @Original_FCR) AND ((@IsNull_FYR = 1 AND [FYR] IS NULL) OR ([FYR] = @Original_FYR)) AND ((@IsNull_FSR = 1 AND [FSR] IS NULL) OR ([FSR] = @Original_FSR)) AND ([valid] = @Original_valid)) @@ -356,7 +356,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumRM, RawMat, RawMatCost, RawMatExtraCost - + dbo.stp_QRM_getByKey @@ -374,7 +374,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumRM, RawMat, RawMatCost, RawMatExtraCost - + DELETE FROM [dbo].[QuoteWorkExt] WHERE (([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([NumWE] = @Original_NumWE) AND ([EWC4UG] = @Original_EWC4UG) AND ([UM] = @Original_UM) AND ([valid] = @Original_valid)) @@ -447,7 +447,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumWE, EWC4UG, UM, valid FROM QuoteWorkExt - + DELETE FROM [dbo].[QuoteWorkInt] WHERE (([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([NumWI] = @Original_NumWI) AND ([ProcessNum] = @Original_ProcessNum) AND ([CodPlant] = @Original_CodPlant) AND ([Class01] = @Original_Class01) AND ([Class02] = @Original_Class02) AND ([Class03] = @Original_Class03) AND ([Class04] = @Original_Class04) AND ([Class05] = @Original_Class05) AND ([NetProd] = @Original_NetProd) AND ([WSR] = @Original_WSR) AND ([MSR] = @Original_MSR) AND ([DSR] = @Original_DSR) AND ([FC4UG] = @Original_FC4UG) AND ([VC4UG] = @Original_VC4UG) AND ([OH4UG] = @Original_OH4UG) AND ([SC4UG] = @Original_SC4UG) AND ((@IsNull_WYR = 1 AND [WYR] IS NULL) OR ([WYR] = @Original_WYR)) AND ((@IsNull_MYR = 1 AND [MYR] IS NULL) OR ([MYR] = @Original_MYR)) AND ((@IsNull_DYR = 1 AND [DYR] IS NULL) OR ([DYR] = @Original_DYR)) AND ((@IsNull_WCR = 1 AND [WCR] IS NULL) OR ([WCR] = @Original_WCR)) AND ((@IsNull_MCR = 1 AND [MCR] IS NULL) OR ([MCR] = @Original_MCR)) AND ((@IsNull_DCR = 1 AND [DCR] IS NULL) OR ([DCR] = @Original_DCR)) AND ([valid] = @Original_valid)) @@ -615,7 +615,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumWI, ProcessNum, CodPlant, Class01, Clas - + DELETE FROM [dbo].[QuoteParam] WHERE (([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([NumP] = @Original_NumP) AND ([ProcessNum] = @Original_ProcessNum) AND ([Descr] = @Original_Descr) AND ([Parameter] = @Original_Parameter)) @@ -688,7 +688,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumP, ProcessNum, Descr, Parameter FROM Qu - + DELETE FROM [dbo].[QuoteOC] WHERE (([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([NumEx] = @Original_NumEx) AND ([ProcessNum] = @Original_ProcessNum) AND ([CodPlant] = @Original_CodPlant) AND ([Class01] = @Original_Class01) AND ([Class02] = @Original_Class02) AND ([Class03] = @Original_Class03) AND ([Class04] = @Original_Class04) AND ([Class05] = @Original_Class05) AND ([TotQty] = @Original_TotQty) AND ([TotCost] = @Original_TotCost) AND ([Quota] = @Original_Quota) AND ((@IsNull_C4UG = 1 AND [C4UG] IS NULL) OR ([C4UG] = @Original_C4UG)) AND ([valid] = @Original_valid)) @@ -806,7 +806,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QL_fullDataAll @@ -925,7 +925,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_Delete @@ -938,7 +938,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QL_fullDataCount @@ -958,7 +958,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QL_fullData @@ -972,7 +972,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QL_fullDataSearch @@ -992,7 +992,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_getLast @@ -1002,7 +1002,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_getMinMax @@ -1014,7 +1014,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_revHist @@ -1026,7 +1026,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_Insert @@ -1046,7 +1046,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QuoteFull_Q_update @@ -1060,7 +1060,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_prt_dsQuoteFull_byChiave @@ -1071,7 +1071,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_prt_dsQuoteFull_Q_Data @@ -1082,7 +1082,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_UpdCosts @@ -1096,7 +1096,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLS_UpdDiesPar @@ -1113,7 +1113,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLS_UpdExtrPar @@ -1135,7 +1135,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_UpdHead @@ -1156,7 +1156,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLS_UpdHead @@ -1180,7 +1180,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLS_UpdPackPar @@ -1196,7 +1196,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + dbo.stp_QLF_UpdQState @@ -1215,7 +1215,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + DELETE FROM [dbo].[QuoteFull_S] WHERE (([Vers] = @Original_Vers) AND ([QuoteType] = @Original_QuoteType) AND ([CodQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([IdxQState] = @Original_IdxQState) AND ([CodClient] = @Original_CodClient) AND ([ClientName] = @Original_ClientName) AND ([CodItem] = @Original_CodItem) AND ([CodItemGroup] = @Original_CodItemGroup) AND ([RawMat] = @Original_RawMat) AND ([UnitWeight] = @Original_UnitWeight) AND ([BatchQty] = @Original_BatchQty) AND ([CodInco] = @Original_CodInco) AND ([TranspZone] = @Original_TranspZone) AND ([KeyAM] = @Original_KeyAM) AND ([Note] = @Original_Note) AND ([PriceOff] = @Original_PriceOff) AND ((@IsNull_CodClientAssoc = 1 AND [CodClientAssoc] IS NULL) OR ([CodClientAssoc] = @Original_CodClientAssoc)) AND ((@IsNull_ClientNameAssoc = 1 AND [ClientNameAssoc] IS NULL) OR ([ClientNameAssoc] = @Original_ClientNameAssoc)) AND ((@IsNull_ItemDescr = 1 AND [ItemDescr] IS NULL) OR ([ItemDescr] = @Original_ItemDescr)) AND ((@IsNull_CodifProfilo = 1 AND [CodifProfilo] IS NULL) OR ([CodifProfilo] = @Original_CodifProfilo)) AND ((@IsNull_ClasseMerc = 1 AND [ClasseMerc] IS NULL) OR ([ClasseMerc] = @Original_ClasseMerc)) AND ((@IsNull_TipoDies = 1 AND [TipoDies] IS NULL) OR ([TipoDies] = @Original_TipoDies)) AND ((@IsNull_CodDiesGroup = 1 AND [CodDiesGroup] IS NULL) OR ([CodDiesGroup] = @Original_CodDiesGroup)) AND ((@IsNull_DiamDies = 1 AND [DiamDies] IS NULL) OR ([DiamDies] = @Original_DiamDies)) AND ((@IsNull_HoleNumDies = 1 AND [HoleNumDies] IS NULL) OR ([HoleNumDies] = @Original_HoleNumDies)) AND ((@IsNull_DiesPrice_avg = 1 AND [DiesPrice_avg] IS NULL) OR ([DiesPrice_avg] = @Original_DiesPrice_avg)) AND ([DiesPrice] = @Original_DiesPrice) AND ([SamplePrice] = @Original_SamplePrice) AND ((@IsNull_DiesFullCost = 1 AND [DiesFullCost] IS NULL) OR ([DiesFullCost] = @Original_DiesFullCost)) AND ([DiesPriceClientQuote] = @Original_DiesPriceClientQuote) AND ((@IsNull_DiesExpLife = 1 AND [DiesExpLife] IS NULL) OR ([DiesExpLife] = @Original_DiesExpLife)) AND ((@IsNull_DiesEOLife = 1 AND [DiesEOLife] IS NULL) OR ([DiesEOLife] = @Original_DiesEOLife)) AND ([DiesTecLife] = @Original_DiesTecLife) AND ([DiesCommLife] = @Original_DiesCommLife) AND ([MonthSalesPrev] = @Original_MonthSalesPrev) AND ((@IsNull_SalesPrevCost = 1 AND [SalesPrevCost] IS NULL) OR ([SalesPrevCost] = @Original_SalesPrevCost)) AND ((@IsNull_DiesFinCost = 1 AND [DiesFinCost] IS NULL) OR ([DiesFinCost] = @Original_DiesFinCost)) AND ((@IsNull_ClientQuoteReven = 1 AND [ClientQuoteReven] IS NULL) OR ([ClientQuoteReven] = @Original_ClientQuoteReven)) AND ((@IsNull_ExtraDiscountDies = 1 AND [ExtraDiscountDies] IS NULL) OR ([ExtraDiscountDies] = @Original_ExtraDiscountDies)) AND ((@IsNull_DiesByClass = 1 AND [DiesByClass] IS NULL) OR ([DiesByClass] = @Original_DiesByClass)) AND ((@IsNull_NumDiesInList = 1 AND [NumDiesInList] IS NULL) OR ([NumDiesInList] = @Original_NumDiesInList)) AND ((@IsNull_NumDiesExaust = 1 AND [NumDiesExaust] IS NULL) OR ([NumDiesExaust] = @Original_NumDiesExaust)) AND ((@IsNull_CodPlant = 1 AND [CodPlant] IS NULL) OR ([CodPlant] = @Original_CodPlant)) AND ((@IsNull_KeyAMIL = 1 AND [KeyAMIL] IS NULL) OR ([KeyAMIL] = @Original_KeyAMIL)) AND ((@IsNull_KgTeo = 1 AND [KgTeo] IS NULL) OR ([KgTeo] = @Original_KgTeo)) AND ((@IsNull_NumSMED = 1 AND [NumSMED] IS NULL) OR ([NumSMED] = @Original_NumSMED)) AND ((@IsNull_QuotaMan = 1 AND [QuotaMan] IS NULL) OR ([QuotaMan] = @Original_QuotaMan)) AND ((@IsNull_PRMWeight = 1 AND [PRMWeight] IS NULL) OR ([PRMWeight] = @Original_PRMWeight)) AND ((@IsNull_PWeight = 1 AND [PWeight] IS NULL) OR ([PWeight] = @Original_PWeight)) AND ((@IsNull_PTare = 1 AND [PTare] IS NULL) OR ([PTare] = @Original_PTare)) AND ((@IsNull_LivPackage = 1 AND [LivPackage] IS NULL) OR ([LivPackage] = @Original_LivPackage)) AND ((@IsNull_LivPackageDett = 1 AND [LivPackageDett] IS NULL) OR ([LivPackageDett] = @Original_LivPackageDett)) AND ([RawMatCost] = @Original_RawMatCost) AND ([RawMatExtraCost] = @Original_RawMatExtraCost) AND ((@IsNull_RawMatFullCost = 1 AND [RawMatFullCost] IS NULL) OR ([RawMatFullCost] = @Original_RawMatFullCost)) AND ([CodPackag] = @Original_CodPackag) AND ((@IsNull_PkgDesc = 1 AND [PkgDesc] IS NULL) OR ([PkgDesc] = @Original_PkgDesc)) AND ((@IsNull_FSR = 1 AND [FSR] IS NULL) OR ([FSR] = @Original_FSR)) AND ([ProvvCost] = @Original_ProvvCost) AND ([EECost] = @Original_EECost) AND ([GasCost] = @Original_GasCost) AND ([DiesCost] = @Original_DiesCost) AND ([PackCost] = @Original_PackCost) AND ([TranspCost] = @Original_TranspCost) AND ([SellCost01] = @Original_SellCost01) AND ([RefCost01] = @Original_RefCost01) AND ([SellCost04] = @Original_SellCost04) AND ([RefCost04] = @Original_RefCost04) AND ([WSR01_avg] = @Original_WSR01_avg) AND ([WSR01] = @Original_WSR01) AND ([MSR01_avg] = @Original_MSR01_avg) AND ([MSR01] = @Original_MSR01) AND ([NetProd01_avg] = @Original_NetProd01_avg) AND ([NetProd01] = @Original_NetProd01) AND ([FC4UG01] = @Original_FC4UG01) AND ([VC4UG01] = @Original_VC4UG01) AND ([OH4UG01] = @Original_OH4UG01) AND ([SC4UG01] = @Original_SC4UG01) AND ([DSR_avg] = @Original_DSR_avg) AND ((@IsNull_DSR = 1 AND [DSR] IS NULL) OR ([DSR] = @Original_DSR)) AND ([NetProd04] = @Original_NetProd04) AND ([FC4UG04] = @Original_FC4UG04) AND ([VC4UG04] = @Original_VC4UG04) AND ((@IsNull_FVC = 1 AND [FVC] IS NULL) OR ([FVC] = @Original_FVC)) AND ([Charge] = @Original_Charge) AND ([valid] = @Original_valid) AND ([errorScore] = @Original_errorScore)) @@ -1753,7 +1753,7 @@ SELECT Vers, QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, ClientName, Co - + DELETE FROM [dbo].[RawMatDet] WHERE (([RawMat] = @Original_RawMat) AND ([ProcCost] = @Original_ProcCost) AND ([ProcYield] = @Original_ProcYield) AND ([CSR] = @Original_CSR) AND ((@IsNull_SSR = 1 AND [SSR] IS NULL) OR ([SSR] = @Original_SSR)) AND ((@IsNull_SSVA = 1 AND [SSVA] IS NULL) OR ([SSVA] = @Original_SSVA)) AND ((@IsNull_SSVR = 1 AND [SSVR] IS NULL) OR ([SSVR] = @Original_SSVR)) AND ((@IsNull_ExtraMatCost = 1 AND [ExtraMatCost] IS NULL) OR ([ExtraMatCost] = @Original_ExtraMatCost)) AND ((@IsNull_ExtraServCost = 1 AND [ExtraServCost] IS NULL) OR ([ExtraServCost] = @Original_ExtraServCost))) @@ -1843,7 +1843,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + dbo.stp_RMD_getByKey @@ -1858,7 +1858,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + SELECT DataRif, Class01, Class02, CodItem, RawMat, CodPlant, CodDiesGroup, CodPackag, batchQty, CodInco, RawMatFullCost, FVC, FullCost FROM dbo.v_StdCostList @@ -1883,7 +1883,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + dbo.stp_SC2C_deleteForDate @@ -1894,7 +1894,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + dbo.stp_QLR_getByDate diff --git a/C2P_Data/DS_Utility.xsd b/C2P_Data/DS_Utility.xsd index bcce600..85e1478 100644 --- a/C2P_Data/DS_Utility.xsd +++ b/C2P_Data/DS_Utility.xsd @@ -4,12 +4,12 @@ - + - + SELECT value, label @@ -25,7 +25,7 @@ ORDER BY label - + dbo.stp_VSCli_SearchLike @@ -40,7 +40,7 @@ ORDER BY label - + SELECT value, label FROM dbo.v_selItems @@ -54,7 +54,7 @@ ORDER BY label - + dbo.stp_VSItem_SearchLike @@ -69,7 +69,7 @@ ORDER BY label - + SELECT value, label FROM dbo.v_selRawMat @@ -83,7 +83,7 @@ ORDER BY label - + dbo.stp_VSRM_SearchLike @@ -98,7 +98,7 @@ ORDER BY label - + SELECT value, label FROM dbo.v_selCons @@ -115,7 +115,7 @@ ORDER BY label - + SELECT value, label FROM dbo.v_selIncoterms @@ -132,7 +132,7 @@ ORDER BY label - + DELETE FROM [dbo].[ReportPrintTicket] WHERE (([Ticket] = @Original_Ticket) AND ([Report] = @Original_Report) AND ([Chiave] = @Original_Chiave) AND ([UserReq] = @Original_UserReq) AND ([DataReq] = @Original_DataReq) AND ((@IsNull_DataPrint = 1 AND [DataPrint] IS NULL) OR ([DataPrint] = @Original_DataPrint))) @@ -199,7 +199,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_RPT_insertNew @@ -215,7 +215,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_RPT_reserveTicket @@ -231,7 +231,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_checkOffers4Item @@ -253,7 +253,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + SELECT value, label FROM dbo.v_selPackage @@ -270,7 +270,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + SELECT value, label FROM dbo.v_selPlant @@ -287,7 +287,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_PL_getByListLingua @@ -308,7 +308,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + SELECT FromDate, ToDate, NumOrderRows, NumOrders, NumItem, NumClients FROM dbo.v_MarginReportStats @@ -329,7 +329,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + tmp.importOrdersHistRaw @@ -345,7 +345,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + tmp.convertOrdersHistRaw @@ -356,7 +356,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_OH_countRemaining @@ -366,7 +366,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_QLR_insNew @@ -379,7 +379,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + tmp.importOrdersHistRaw @@ -390,7 +390,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + ext.stp_mergeOrdersHist @@ -405,7 +405,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + SELECT FromDate, ToDate, NumOrderRows, NumOrders, NumItem, NumClients FROM dbo.v_MarginReportStatsNewData @@ -426,7 +426,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + SELECT label, value FROM dbo.v_selDateStdCost @@ -443,7 +443,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_SC2C_countRemaining @@ -458,7 +458,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_SC2C_countRemaining @@ -468,7 +468,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_QLC_insNew @@ -481,7 +481,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + dbo.stp_SC2C_insertForDate @@ -497,7 +497,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke - + DELETE FROM [dbo].[ListValues] WHERE (([TableName] = @Original_TableName) AND ([FieldName] = @Original_FieldName) AND ([value] = @Original_value) AND ((@IsNull_label = 1 AND [label] IS NULL) OR ([label] = @Original_label)) AND ((@IsNull_ordinal = 1 AND [ordinal] IS NULL) OR ([ordinal] = @Original_ordinal))) @@ -561,7 +561,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN - + dbo.stp_listValues_getByTable @@ -576,7 +576,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN - + SELECT value, label FROM dbo.v_selListVal @@ -590,7 +590,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN - + dbo.stp_listValues_getValidValues diff --git a/C2P_Data/DS_Utility1.Designer.cs b/C2P_Data/DS_Utility1.Designer.cs index 96c76f1..f144be2 100644 --- a/C2P_Data/DS_Utility1.Designer.cs +++ b/C2P_Data/DS_Utility1.Designer.cs @@ -7606,7 +7606,7 @@ namespace C2P_Data.DS_UtilityTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7797,7 +7797,7 @@ namespace C2P_Data.DS_UtilityTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7988,7 +7988,7 @@ namespace C2P_Data.DS_UtilityTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8179,7 +8179,7 @@ namespace C2P_Data.DS_UtilityTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8347,7 +8347,7 @@ namespace C2P_Data.DS_UtilityTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8559,7 +8559,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9037,7 +9037,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9219,7 +9219,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9387,7 +9387,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9555,7 +9555,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9754,7 +9754,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9922,7 +9922,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10252,7 +10252,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10421,7 +10421,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10588,7 +10588,7 @@ SELECT Ticket, Report, Chiave, UserReq, DataReq, DataPrint FROM ReportPrintTicke [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10903,7 +10903,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11322,7 +11322,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.Proxima_C2PConnectionString; + this._connection.ConnectionString = global::C2P_Data.Properties.Settings.Default.C2PConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/C2P_Data/Properties/Settings.Designer.cs b/C2P_Data/Properties/Settings.Designer.cs index a870f55..8146f06 100644 --- a/C2P_Data/Properties/Settings.Designer.cs +++ b/C2P_Data/Properties/Settings.Designer.cs @@ -26,12 +26,12 @@ namespace C2P_Data.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] - [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security I" + - "nfo=True;User ID=sa;Password=keyhammer;MultipleActiveResultSets=True;Application" + - " Name=EntityFramework")] - public string Proxima_C2PConnectionString { + [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=C2P;Persist Security Info=True" + + ";User ID=sa;Password=keyhammer;MultipleActiveResultSets=True;Application Name=En" + + "tityFramework")] + public string C2PConnectionString { get { - return ((string)(this["Proxima_C2PConnectionString"])); + return ((string)(this["C2PConnectionString"])); } } } diff --git a/C2P_Data/Properties/Settings.settings b/C2P_Data/Properties/Settings.settings index 833e11b..f6b5b8c 100644 --- a/C2P_Data/Properties/Settings.settings +++ b/C2P_Data/Properties/Settings.settings @@ -2,13 +2,13 @@ - + <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer;MultipleActiveResultSets=True;Application Name=EntityFramework</ConnectionString> + <ConnectionString>Data Source=10.74.82.217\SQL2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer;MultipleActiveResultSets=True;Application Name=EntityFramework</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer;MultipleActiveResultSets=True;Application Name=EntityFramework + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer;MultipleActiveResultSets=True;Application Name=EntityFramework \ No newline at end of file diff --git a/C2P_Data/Sql_update/C2P_Update001.sql b/C2P_Data/Sql_update/C2P_Update001.sql index 6678d6f..83005eb 100644 --- a/C2P_Data/Sql_update/C2P_Update001.sql +++ b/C2P_Data/Sql_update/C2P_Update001.sql @@ -1,5 +1,5 @@ /* -Deployment script for Proxima_C2P_prod +Deployment script for C2P_prod This code was generated by a tool. Changes to this file may cause incorrect behavior and will be lost if @@ -13,8 +13,8 @@ SET NUMERIC_ROUNDABORT OFF; GO -:setvar DatabaseName "Proxima_C2P" -:setvar DefaultFilePrefix "Proxima_C2P_prod" +:setvar DatabaseName "C2P" +:setvar DefaultFilePrefix "C2P_prod" :setvar DefaultDataPath "G:\SQL2008R2\" :setvar DefaultLogPath "F:\SQL2008R2\" diff --git a/C2P_Data/Sql_update/C2P_Update002.sql b/C2P_Data/Sql_update/C2P_Update002.sql index a72c39c..c72181e 100644 --- a/C2P_Data/Sql_update/C2P_Update002.sql +++ b/C2P_Data/Sql_update/C2P_Update002.sql @@ -1,5 +1,5 @@ /* -Deployment script for Proxima_C2P_prod +Deployment script for C2P_prod This code was generated by a tool. Changes to this file may cause incorrect behavior and will be lost if @@ -13,8 +13,8 @@ SET NUMERIC_ROUNDABORT OFF; GO -:setvar DatabaseName "Proxima_C2P" -:setvar DefaultFilePrefix "Proxima_C2P_prod" +:setvar DatabaseName "C2P" +:setvar DefaultFilePrefix "C2P_prod" :setvar DefaultDataPath "G:\SQL2008R2\" :setvar DefaultLogPath "F:\SQL2008R2\" diff --git a/C2P_Data/Sql_update/C2P_Update003.sql b/C2P_Data/Sql_update/C2P_Update003.sql index 779e5c1..83d9d8c 100644 --- a/C2P_Data/Sql_update/C2P_Update003.sql +++ b/C2P_Data/Sql_update/C2P_Update003.sql @@ -1,6 +1,6 @@ /* This script was created by Visual Studio on 2/18/2014 at 5:09 PM. -Run this script on (localdb)\Projects.C2P_Project (STEAMWAREWIN\samuele) to make it the same as 10.74.82.217\SQL2008R2.Proxima_C2P (sa). +Run this script on (localdb)\Projects.C2P_Project (STEAMWAREWIN\samuele) to make it the same as 10.74.82.217\SQL2008R2.C2P (sa). This script performs its actions in the following order: 1. Disable foreign-key constraints. 2. Perform DELETE commands. diff --git a/C2P_Project/C2P_compare_dev2prod.scmp b/C2P_Project/C2P_compare_dev2prod.scmp index 887f1fd..982a028 100644 --- a/C2P_Project/C2P_compare_dev2prod.scmp +++ b/C2P_Project/C2P_compare_dev2prod.scmp @@ -9,7 +9,7 @@ - Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P_prod;Persist Security Info=True;User ID=sa;Pooling=False + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=C2P_prod;Persist Security Info=True;User ID=sa;Pooling=False diff --git a/C2P_Project/Compare Proxima_C2P vs C2P_DB.scmp b/C2P_Project/Compare Proxima_C2P vs C2P_DB.scmp index 4b9dc72..39829a6 100644 --- a/C2P_Project/Compare Proxima_C2P vs C2P_DB.scmp +++ b/C2P_Project/Compare Proxima_C2P vs C2P_DB.scmp @@ -3,7 +3,7 @@ 10 - Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Integrated Security=True;Pooling=False + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=C2P;Integrated Security=True;Pooling=False diff --git a/C2P_Project/dbo/Stored Procedures/dbo.stp_zzz_scratchDatiDemo.sql b/C2P_Project/dbo/Stored Procedures/dbo.stp_zzz_scratchDatiDemo.sql index 1c19999..81fd14d 100644 --- a/C2P_Project/dbo/Stored Procedures/dbo.stp_zzz_scratchDatiDemo.sql +++ b/C2P_Project/dbo/Stored Procedures/dbo.stp_zzz_scratchDatiDemo.sql @@ -252,32 +252,32 @@ BEGIN -- prima aggiorno i dati di Cost2Plant che non si sa da dove arrivano ( caricati a mano??? ) SELECT TOP 1000 * FROM Cost2Plant - SELECT TOP 1000 * FROM Proxima_C2P.dbo.Cost2Plant + SELECT TOP 1000 * FROM C2P.dbo.Cost2Plant SELECT * from TrascPlan DELETE FROM Cost2Plant INSERT INTO Cost2Plant SELECT t.CodPlantNew, ProcessNum, FC, VC, OH, SC, QuotaPlantStd, QuotaManStd - FROM Proxima_C2P.dbo.Cost2Plant AS cp + FROM C2P.dbo.Cost2Plant AS cp LEFT JOIN TrascPlan AS t ON cp.CodPlant = t.CodPlant -- GCARLO DEVO creare la riga per il test, la copio da quella di sviluppo e agg. i dati di demo SELECT TOP 1000 * FROM QuoteList SELECT TOP 1000 * FROM QuoteRM - SELECT TOP 1000 * FROM Proxima_C2P.dbo.QuoteList - SELECT TOP 1000 * FROM Proxima_C2P.dbo.QuoteRM WHERE CodQuote = '1402050001' + SELECT TOP 1000 * FROM C2P.dbo.QuoteList + SELECT TOP 1000 * FROM C2P.dbo.QuoteRM WHERE CodQuote = '1402050001' -- creo righe di test INSERT QuoteList SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClientNew, CodItemNew, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, valid, errorScore - FROM Proxima_C2P.[dbo].[QuoteList] AS q + FROM C2P.[dbo].[QuoteList] AS q INNER JOIN [dbo].[TrascClient] AS tc ON q.CodClient = tc.CodClient INNER JOIN dbo.TrascItem AS ti ON q.CodItem = ti.CodItem INSERT QuoteRM SELECT QuoteType, CodQuote, QuoteRev, NumRM, RawMat, RawMatCost, RawMatExtraCost, CodPackag, FCR, valid - FROM Proxima_C2P.[dbo].[QuoteRM] + FROM C2P.[dbo].[QuoteRM] UPDATE QuoteList SET CodClient = ( SELECT CodClientNew FROM TrascClient WHERE CodClient = '05000000382' ) diff --git a/C2P_Report/Properties/PublishProfiles/218.pubxml b/C2P_Report/Properties/PublishProfiles/218.pubxml index 8a8b1b0..a728f6a 100644 --- a/C2P_Report/Properties/PublishProfiles/218.pubxml +++ b/C2P_Report/Properties/PublishProfiles/218.pubxml @@ -21,14 +21,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - - + + - + @@ -39,6 +39,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - + \ No newline at end of file diff --git a/C2P_Report/Properties/PublishProfiles/DEMO.pubxml b/C2P_Report/Properties/PublishProfiles/DEMO.pubxml index dea2b80..79ad562 100644 --- a/C2P_Report/Properties/PublishProfiles/DEMO.pubxml +++ b/C2P_Report/Properties/PublishProfiles/DEMO.pubxml @@ -21,20 +21,20 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - - + + - + - + \ No newline at end of file diff --git a/C2P_Report/Properties/PublishProfiles/WinLab.pubxml b/C2P_Report/Properties/PublishProfiles/WinLab.pubxml index ff7687a..6267b4a 100644 --- a/C2P_Report/Properties/PublishProfiles/WinLab.pubxml +++ b/C2P_Report/Properties/PublishProfiles/WinLab.pubxml @@ -21,14 +21,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - - + + - + @@ -39,6 +39,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - + \ No newline at end of file diff --git a/C2P_Report/Web.DEMO.config b/C2P_Report/Web.DEMO.config index 4ef095e..76cd49a 100644 --- a/C2P_Report/Web.DEMO.config +++ b/C2P_Report/Web.DEMO.config @@ -20,7 +20,7 @@ - + diff --git a/C2P_Report/Web.WinLab.config b/C2P_Report/Web.WinLab.config index 44ee622..491b0da 100644 --- a/C2P_Report/Web.WinLab.config +++ b/C2P_Report/Web.WinLab.config @@ -20,7 +20,7 @@ - + diff --git a/C2P_Report/Web.config b/C2P_Report/Web.config index 278dd3b..5ebe82f 100644 --- a/C2P_Report/Web.config +++ b/C2P_Report/Web.config @@ -22,11 +22,11 @@ - - + + - + diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index bb0c14e..75ea0a2 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 aa9e07d..6849a82 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 bf1db42..552ecfa 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ