diff --git a/C2P/C2P.csproj.user b/C2P/C2P.csproj.user index 32915f7..cd5a0b1 100644 --- a/C2P/C2P.csproj.user +++ b/C2P/C2P.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - costimate + costimateZip diff --git a/C2P/MakeSim.aspx.cs b/C2P/MakeSim.aspx.cs index 0b99395..ee9de5f 100644 --- a/C2P/MakeSim.aspx.cs +++ b/C2P/MakeSim.aspx.cs @@ -61,7 +61,7 @@ namespace C2P long CodQuote = 0; try { - DS_Quotes.QuoteFull_QDataTable tabQuote = DtProxy.man.taQFQ.insertNew("Q", ddlCodCustomer.SelectedValue, CodItem, ddlRawMat.SelectedValue, RawMatCost, 0, batchQty, "EXW", "EXT"); + DS_Quotes.QuoteFull_QDataTable tabQuote = DtProxy.man.taQFQ.insertNew("Q", ddlCodCustomer.SelectedValue, CodItem, ddlRawMat.SelectedValue, RawMatCost, 0, batchQty, "EXW", "EXT", user_std.UtSn.utente); CodQuote = tabQuote[0].CodQuote; if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("MakeSim: Step 03", tipoLog.INFO); } @@ -71,7 +71,7 @@ namespace C2P if (CodQuote > 0) { if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("MakeSim: Step 04", tipoLog.INFO); - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.makeSim(Convert.ToInt32(CodQuote), 0); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.makeSim(Convert.ToInt32(CodQuote), 0, user_std.UtSn.utente); if (tab.Rows.Count > 0) { if (memLayer.ML.confReadInt("_logLevel") > 5) logger.lg.scriviLog("MakeSim: Step 05", tipoLog.INFO); diff --git a/C2P/Properties/PublishProfiles/costimate.pubxml b/C2P/Properties/PublishProfiles/costimate.pubxml index c5e1960..e13830c 100644 --- a/C2P/Properties/PublishProfiles/costimate.pubxml +++ b/C2P/Properties/PublishProfiles/costimate.pubxml @@ -12,13 +12,13 @@ by editing this MSBuild file. In order to learn more about this please visit htt True False https://costimate:8172/MsDeploy.axd - Default Web Site + Default Web Site/C2P True WMSVC True costimate\steamware - <_SavePWD>False + <_SavePWD>True diff --git a/C2P/Properties/PublishProfiles/costimateZip.pubxml b/C2P/Properties/PublishProfiles/costimateZip.pubxml new file mode 100644 index 0000000..c10379f --- /dev/null +++ b/C2P/Properties/PublishProfiles/costimateZip.pubxml @@ -0,0 +1,42 @@ + + + + + Package + Release + Any CPU + + True + True + C:\Users\samuele\Documents\Visual Studio 2012\Projects\C2P\ReleaseClienti\C2P.zip + true + Default Web Site/C2P + + + + + + + + + + + + + + + True + True + False + DonotMerge + + + + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer + False + + + \ No newline at end of file diff --git a/C2P/RevisionHistory.aspx.cs b/C2P/RevisionHistory.aspx.cs index e546281..8671386 100644 --- a/C2P/RevisionHistory.aspx.cs +++ b/C2P/RevisionHistory.aspx.cs @@ -193,7 +193,7 @@ namespace C2P protected void lbDuplicate_Click(object sender, EventArgs e) { // duplica offerta! - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone(QuoteType, QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone(QuoteType, user_std.UtSn.utente, QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); if (tab.Rows.Count > 0) { // seleziona l'offerta duplicata! diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs index 3a4fd1f..2fc6a29 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs @@ -434,7 +434,7 @@ namespace C2P.WebUserControls protected void lbDuplicate_Click(object sender, EventArgs e) { // duplica offerta! - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone(QuoteType, QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone(QuoteType, user_std.UtSn.utente, QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); if (tab.Rows.Count > 0) { // seleziona l'offerta duplicata! @@ -449,7 +449,7 @@ namespace C2P.WebUserControls protected void lbSimulate_Click(object sender, EventArgs e) { // duplico dati come simulazione... - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone("S", QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.clone("S", user_std.UtSn.utente, QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); if (tab.Rows.Count > 0) { // apro pagina simulazione appena creata... diff --git a/C2P/WebUserControls/mod_Q_Header.ascx.cs b/C2P/WebUserControls/mod_Q_Header.ascx.cs index b211530..d80e762 100644 --- a/C2P/WebUserControls/mod_Q_Header.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Header.ascx.cs @@ -6,6 +6,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using C2P_Data; using System.Globalization; +using SteamWare; namespace C2P.WebUserControls { @@ -96,7 +97,7 @@ namespace C2P.WebUserControls try { // chiamo update e vedo risultati (se ultimo record è cambiato rispetto a prima...) - rigaPost = DtProxy.man.taQFQ.insertNew(QuoteType, CodClient, CodItem, RawMat, RawMatCost, RawMatExtraCost, BatchQty, CodInco, Note)[0]; + rigaPost = DtProxy.man.taQFQ.insertNew(QuoteType, CodClient, CodItem, RawMat, RawMatCost, RawMatExtraCost, BatchQty, CodInco, Note, user_std.UtSn.utente)[0]; if (rigaPost != null) { // verifico SE E' CAMBIATO mando a pagina edit... diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index efc94da..5747863 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -359,18 +359,6 @@ namespace C2P.WebUserControls break; } } - /// - /// Crea un offerta (SE - /// - /// - /// - protected void lnkCreateOffer_Click(object sender, EventArgs e) - { - // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1); - // aggiorno! - updateBaseData(); - } /// /// CONVERTE offerta in simulazione @@ -380,13 +368,49 @@ namespace C2P.WebUserControls protected void lbConvQ2S_Click(object sender, EventArgs e) { // update da Q ad S del tipo offerta - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.makeSim(Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.makeSim(Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), user_std.UtSn.utente); if (tab.Rows.Count > 0) { // seleziona l'offerta duplicata! Response.Redirect(string.Format("Quote?QuoteType={0}&CodQuote={1}&QuoteRev={2}", tab[0].QuoteType, tab[0].CodQuote, tab[0].QuoteRev)); } } + /// + /// invia email x workflow + /// + /// + /// + /// + private void sendWFlowEmail(string _mailTo, string _subj2T, string _obj2T) + { + if (_mailTo != "") + { + string _mailFrom = memLayer.ML.confReadString("_fromEmail"); + string _oggetto = traduci(_subj2T); + string fullUrl = string.Format("{0}/Quote?QuoteType={1}&CodQuote={2}&QuoteRev={3}", memLayer.ML.confReadString("baseUrl"), QuoteType, CodQuote, QuoteRev); + string _corpo = string.Format(traduci(_obj2T), fullUrl); + gestEmail.geAuth.mandaEmail(_mailFrom, _mailTo, _oggetto, _corpo); + } + else + { + logger.lg.scriviLog("Errore: manca email!", tipoLog.ERROR); + } + } + /// + /// Crea un offerta (SE + /// + /// + /// + protected void lnkCreateOffer_Click(object sender, EventArgs e) + { + // cambio stato offerta da draft! + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1, user_std.UtSn.utente); + // invio email di stato CREATED ad approvatore + string _mailTo = memLayer.ML.confReadString("wfApprTo"); + sendWFlowEmail(_mailTo, "subjMailCreate", "objMailCreate"); + // aggiorno! + updateBaseData(); + } /// @@ -396,8 +420,11 @@ namespace C2P.WebUserControls /// protected void lbReject_Click(object sender, EventArgs e) { - // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 0); + // invio email di stato REJECTED da approvatore + string _mailTo = user_std.UtSn.emailDaUsername(DtProxy.man.taQL.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev))[0].UserMod); + sendWFlowEmail(_mailTo, "subjMailReject", "objMailReject"); + // riporto in DRAFT! + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 0, user_std.UtSn.utente); // aggiorno! updateBaseData(); } @@ -408,8 +435,11 @@ namespace C2P.WebUserControls /// protected void lbApprove_Click(object sender, EventArgs e) { - // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 2); + // invio email di stato CREATED da approvatore + string _mailTo = user_std.UtSn.emailDaUsername(DtProxy.man.taQL.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev))[0].UserMod); + sendWFlowEmail(_mailTo, "subjMailApprove", "objMailApprove"); + // approvo + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 2, user_std.UtSn.utente); // aggiorno! updateBaseData(); } @@ -420,8 +450,11 @@ namespace C2P.WebUserControls /// protected void lbRelease_Click(object sender, EventArgs e) { - // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 3); + // indica rilasciato + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 3, user_std.UtSn.utente); + // invio email di stato RELEASED ad approvatore + string _mailTo = memLayer.ML.confReadString("wfApprTo"); + sendWFlowEmail(_mailTo, "subjMailRelease", "objMailRelease"); // aggiorno! updateBaseData(); } @@ -444,7 +477,7 @@ namespace C2P.WebUserControls /// protected void lbNewRev_Click(object sender, EventArgs e) { - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.newRev(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.newRev(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), user_std.UtSn.utente); if (tab.Rows.Count > 0) { // seleziona l'offerta duplicata! diff --git a/C2P/WebUserControls/mod_S_Header.ascx.cs b/C2P/WebUserControls/mod_S_Header.ascx.cs index 83ea098..3a27667 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx.cs +++ b/C2P/WebUserControls/mod_S_Header.ascx.cs @@ -6,6 +6,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using C2P_Data; using System.Globalization; +using SteamWare; namespace C2P.WebUserControls { @@ -99,7 +100,7 @@ namespace C2P.WebUserControls try { // chiamo update e vedo risultati (se ultimo record è cambiato rispetto a prima...) - rigaPost = DtProxy.man.taQFQ.insertNew(QuoteType, CodClient, CodItem, RawMat, RawMatCost, RawMatExtraCost, BatchQty, CodInco, Note)[0]; + rigaPost = DtProxy.man.taQFQ.insertNew(QuoteType, CodClient, CodItem, RawMat, RawMatCost, RawMatExtraCost, BatchQty, CodInco, Note, user_std.UtSn.utente)[0]; if (rigaPost != null) { // verifico SE E' CAMBIATO mando a pagina edit... diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs index 83b7752..2c8c6e2 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx.cs +++ b/C2P/WebUserControls/mod_newProduct.ascx.cs @@ -469,7 +469,7 @@ namespace C2P.WebUserControls protected void lnkCreateOffer_Click(object sender, EventArgs e) { // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1); + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1, user_std.UtSn.utente); // invio email di stato CREATED ad approvatore string _mailTo = memLayer.ML.confReadString("wfApprTo"); sendWFlowEmail(_mailTo, "subjMailCreate", "objMailCreate"); @@ -483,10 +483,11 @@ namespace C2P.WebUserControls /// protected void lbReject_Click(object sender, EventArgs e) { - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 0); - // invio email di stato CREATED ad approvatore - string _mailTo = user_std.UtSn.emailDaUsername(user_std.UtSn.userNameAD); + // invio email di stato REJECTED da approvatore + string _mailTo = user_std.UtSn.emailDaUsername(DtProxy.man.taQL.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev))[0].UserMod); sendWFlowEmail(_mailTo, "subjMailReject", "objMailReject"); + // riporto in DRAFT + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 0, user_std.UtSn.utente); // aggiorno! updateBaseData(); } @@ -497,10 +498,11 @@ namespace C2P.WebUserControls /// protected void lbApprove_Click(object sender, EventArgs e) { - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 2); - // invio email di stato CREATED ad approvatore - string _mailTo = user_std.UtSn.emailDaUsername(user_std.UtSn.userNameAD); + // invio email di stato CREATED da approvatore + string _mailTo = user_std.UtSn.emailDaUsername(DtProxy.man.taQL.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev))[0].UserMod); sendWFlowEmail(_mailTo, "subjMailApprove", "objMailApprove"); + // approvo + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 2, user_std.UtSn.utente); // aggiorno! updateBaseData(); } @@ -511,7 +513,8 @@ namespace C2P.WebUserControls /// protected void lbRelease_Click(object sender, EventArgs e) { - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 3); + // indica rilasciato + DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 3, user_std.UtSn.utente); // invio email di stato RELEASED ad approvatore string _mailTo = memLayer.ML.confReadString("wfApprTo"); sendWFlowEmail(_mailTo, "subjMailRelease", "objMailRelease"); @@ -537,7 +540,7 @@ namespace C2P.WebUserControls /// protected void lbNewRev_Click(object sender, EventArgs e) { - DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.newRev(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.newRev(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), user_std.UtSn.utente); if (tab.Rows.Count > 0) { // seleziona l'offerta duplicata! diff --git a/C2P/WebUserControls/mod_newQuote.ascx.cs b/C2P/WebUserControls/mod_newQuote.ascx.cs index 21f16df..0a6591f 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx.cs +++ b/C2P/WebUserControls/mod_newQuote.ascx.cs @@ -205,7 +205,7 @@ namespace C2P.WebUserControls // tento insert! try { - DS_Quotes.QuoteListDataTable tabRes = DtProxy.man.taQL.insNew("Q", acCliente.valore, acArticolo.valore, ddlLega.SelectedValue, RawMatCost, RawMatExtraCost, batchQty, ddlConsegna.SelectedValue, txtNote.Text.Trim()); + DS_Quotes.QuoteListDataTable tabRes = DtProxy.man.taQL.insNew("Q", acCliente.valore, acArticolo.valore, ddlLega.SelectedValue, RawMatCost, RawMatExtraCost, batchQty, ddlConsegna.SelectedValue, txtNote.Text.Trim(), user_std.UtSn.utente); } catch (Exception exc) { diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 48f5538..d8275ef 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 a625656..bb3e948 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 b43958a..70fb120 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 95b7504..ef2f489 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -685,6 +685,20 @@ namespace C2P_Data { private global::System.Data.DataColumn columnIdxQState; + private global::System.Data.DataColumn columnOrdQty; + + private global::System.Data.DataColumn columnvalid; + + private global::System.Data.DataColumn columnerrorScore; + + private global::System.Data.DataColumn columnUserCreaz; + + private global::System.Data.DataColumn columnDataCreaz; + + private global::System.Data.DataColumn columnUserMod; + + private global::System.Data.DataColumn columnDataMod; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public QuoteListDataTable() { @@ -862,6 +876,62 @@ 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 OrdQtyColumn { + get { + return this.columnOrdQty; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn validColumn { + get { + return this.columnvalid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn errorScoreColumn { + get { + return this.columnerrorScore; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn UserCreazColumn { + get { + return this.columnUserCreaz; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DataCreazColumn { + get { + return this.columnDataCreaz; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn UserModColumn { + get { + return this.columnUserMod; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DataModColumn { + get { + return this.columnDataMod; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -917,7 +987,14 @@ namespace C2P_Data { string OrdNum, string OrdRow, decimal OrdPrice, - int IdxQState) { + int IdxQState, + int OrdQty, + bool valid, + int errorScore, + string UserCreaz, + System.DateTime DataCreaz, + string UserMod, + System.DateTime DataMod) { QuoteListRow rowQuoteListRow = ((QuoteListRow)(this.NewRow())); object[] columnValuesArray = new object[] { QuoteType, @@ -937,7 +1014,14 @@ namespace C2P_Data { OrdNum, OrdRow, OrdPrice, - IdxQState}; + IdxQState, + OrdQty, + valid, + errorScore, + UserCreaz, + DataCreaz, + UserMod, + DataMod}; rowQuoteListRow.ItemArray = columnValuesArray; this.Rows.Add(rowQuoteListRow); return rowQuoteListRow; @@ -987,6 +1071,13 @@ namespace C2P_Data { this.columnOrdRow = base.Columns["OrdRow"]; this.columnOrdPrice = base.Columns["OrdPrice"]; this.columnIdxQState = base.Columns["IdxQState"]; + this.columnOrdQty = base.Columns["OrdQty"]; + this.columnvalid = base.Columns["valid"]; + this.columnerrorScore = base.Columns["errorScore"]; + this.columnUserCreaz = base.Columns["UserCreaz"]; + this.columnDataCreaz = base.Columns["DataCreaz"]; + this.columnUserMod = base.Columns["UserMod"]; + this.columnDataMod = base.Columns["DataMod"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1028,6 +1119,20 @@ namespace C2P_Data { base.Columns.Add(this.columnOrdPrice); this.columnIdxQState = new global::System.Data.DataColumn("IdxQState", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnIdxQState); + this.columnOrdQty = new global::System.Data.DataColumn("OrdQty", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOrdQty); + this.columnvalid = new global::System.Data.DataColumn("valid", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnvalid); + this.columnerrorScore = new global::System.Data.DataColumn("errorScore", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnerrorScore); + this.columnUserCreaz = new global::System.Data.DataColumn("UserCreaz", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnUserCreaz); + this.columnDataCreaz = new global::System.Data.DataColumn("DataCreaz", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDataCreaz); + this.columnUserMod = new global::System.Data.DataColumn("UserMod", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnUserMod); + this.columnDataMod = new global::System.Data.DataColumn("DataMod", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDataMod); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnQuoteType, this.columnCodQuote, @@ -1059,6 +1164,15 @@ namespace C2P_Data { this.columnOrdRow.MaxLength = 50; this.columnOrdPrice.AllowDBNull = false; this.columnIdxQState.AllowDBNull = false; + this.columnOrdQty.AllowDBNull = false; + this.columnvalid.AllowDBNull = false; + this.columnerrorScore.AllowDBNull = false; + this.columnUserCreaz.AllowDBNull = false; + this.columnUserCreaz.MaxLength = 50; + this.columnDataCreaz.AllowDBNull = false; + this.columnUserMod.AllowDBNull = false; + this.columnUserMod.MaxLength = 50; + this.columnDataMod.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8114,6 +8228,83 @@ namespace C2P_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int OrdQty { + get { + return ((int)(this[this.tableQuoteList.OrdQtyColumn])); + } + set { + this[this.tableQuoteList.OrdQtyColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool valid { + get { + return ((bool)(this[this.tableQuoteList.validColumn])); + } + set { + this[this.tableQuoteList.validColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int errorScore { + get { + return ((int)(this[this.tableQuoteList.errorScoreColumn])); + } + set { + this[this.tableQuoteList.errorScoreColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string UserCreaz { + get { + return ((string)(this[this.tableQuoteList.UserCreazColumn])); + } + set { + this[this.tableQuoteList.UserCreazColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public System.DateTime DataCreaz { + get { + return ((global::System.DateTime)(this[this.tableQuoteList.DataCreazColumn])); + } + set { + this[this.tableQuoteList.DataCreazColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string UserMod { + get { + return ((string)(this[this.tableQuoteList.UserModColumn])); + } + set { + this[this.tableQuoteList.UserModColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public System.DateTime DataMod { + get { + return ((global::System.DateTime)(this[this.tableQuoteList.DataModColumn])); + } + set { + this[this.tableQuoteList.DataModColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsKeyAMNull() { @@ -13527,10 +13718,17 @@ namespace C2P_Data.DS_QuotesTableAdapters { tableMapping.ColumnMappings.Add("OrdRow", "OrdRow"); tableMapping.ColumnMappings.Add("OrdPrice", "OrdPrice"); tableMapping.ColumnMappings.Add("IdxQState", "IdxQState"); + tableMapping.ColumnMappings.Add("OrdQty", "OrdQty"); + tableMapping.ColumnMappings.Add("valid", "valid"); + tableMapping.ColumnMappings.Add("errorScore", "errorScore"); + tableMapping.ColumnMappings.Add("UserCreaz", "UserCreaz"); + tableMapping.ColumnMappings.Add("DataCreaz", "DataCreaz"); + tableMapping.ColumnMappings.Add("UserMod", "UserMod"); + tableMapping.ColumnMappings.Add("DataMod", "DataMod"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"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))"; + this._adapter.DeleteCommand.CommandText = @"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))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QuoteType", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodQuote", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -13547,14 +13745,21 @@ namespace C2P_Data.DS_QuotesTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_PriceOff", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "PriceOff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_OrdDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdDate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdDate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdNum", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdNum", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdRow", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdRow", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdPrice", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "OrdPrice", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdQty", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_valid", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "valid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_errorScore", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "errorScore", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserCreaz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreaz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreaz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[QuoteList] ([QuoteType], [CodQuote], [QuoteRev], [IdxQState], [CodClient], [CodItem], [CodItemGroup], [RawMat], [UnitWeight], [BatchQty], [CodInco], [Note], [PriceOff], [OrdDate], [OrdNum], [OrdRow], [OrdPrice]) VALUES (@QuoteType, @CodQuote, @QuoteRev, @IdxQState, @CodClient, @CodItem, @CodItemGroup, @RawMat, @UnitWeight, @BatchQty, @CodInco, @Note, @PriceOff, @OrdDate, @OrdNum, @OrdRow, @OrdPrice); -SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[QuoteList] ([QuoteType], [CodQuote], [QuoteRev], [IdxQState], [CodClient], [CodItem], [CodItemGroup], [RawMat], [UnitWeight], [BatchQty], [CodInco], [Note], [PriceOff], [OrdDate], [OrdNum], [OrdRow], [OrdPrice], [OrdQty], [valid], [errorScore], [UserCreaz], [DataCreaz], [UserMod], [DataMod]) VALUES (@QuoteType, @CodQuote, @QuoteRev, @IdxQState, @CodClient, @CodItem, @CodItemGroup, @RawMat, @UnitWeight, @BatchQty, @CodInco, @Note, @PriceOff, @OrdDate, @OrdNum, @OrdRow, @OrdPrice, @OrdQty, @valid, @errorScore, @UserCreaz, @DataCreaz, @UserMod, @DataMod); +SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, OrdQty, valid, errorScore, UserCreaz, DataCreaz, UserMod, DataMod FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QuoteType", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodQuote", global::System.Data.SqlDbType.BigInt, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodQuote", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -13569,14 +13774,43 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodInco", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "PriceOff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdDate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdDate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdNum", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdNum", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdRow", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdRow", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdPrice", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "OrdPrice", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdQty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@valid", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "valid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@errorScore", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "errorScore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserCreaz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreaz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreaz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[QuoteList] SET [QuoteType] = @QuoteType, [CodQuote] = @CodQuote, [QuoteRev] = @QuoteRev, [IdxQState] = @IdxQState, [CodClient] = @CodClient, [CodItem] = @CodItem, [CodItemGroup] = @CodItemGroup, [RawMat] = @RawMat, [UnitWeight] = @UnitWeight, [BatchQty] = @BatchQty, [CodInco] = @CodInco, [Note] = @Note, [PriceOff] = @PriceOff, [OrdDate] = @OrdDate, [OrdNum] = @OrdNum, [OrdRow] = @OrdRow, [OrdPrice] = @OrdPrice 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)); -SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType)"; + this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[QuoteList] SET [QuoteType] = @QuoteType, [CodQuote] = @CodQuote, [Q" + + "uoteRev] = @QuoteRev, [IdxQState] = @IdxQState, [CodClient] = @CodClient, [CodIt" + + "em] = @CodItem, [CodItemGroup] = @CodItemGroup, [RawMat] = @RawMat, [UnitWeight]" + + " = @UnitWeight, [BatchQty] = @BatchQty, [CodInco] = @CodInco, [Note] = @Note, [P" + + "riceOff] = @PriceOff, [OrdDate] = @OrdDate, [OrdNum] = @OrdNum, [OrdRow] = @OrdR" + + "ow, [OrdPrice] = @OrdPrice, [OrdQty] = @OrdQty, [valid] = @valid, [errorScore] =" + + " @errorScore, [UserCreaz] = @UserCreaz, [DataCreaz] = @DataCreaz, [UserMod] = @U" + + "serMod, [DataMod] = @DataMod WHERE (([QuoteType] = @Original_QuoteType) AND ([Co" + + "dQuote] = @Original_CodQuote) AND ([QuoteRev] = @Original_QuoteRev) AND ([IdxQSt" + + "ate] = @Original_IdxQState) AND ([CodClient] = @Original_CodClient) AND ([CodIte" + + "m] = @Original_CodItem) AND ([CodItemGroup] = @Original_CodItemGroup) AND ([RawM" + + "at] = @Original_RawMat) AND ([UnitWeight] = @Original_UnitWeight) AND ([BatchQty" + + "] = @Original_BatchQty) AND ([CodInco] = @Original_CodInco) AND ([KeyAM] = @Orig" + + "inal_KeyAM) AND ([Note] = @Original_Note) AND ([PriceOff] = @Original_PriceOff) " + + "AND ((@IsNull_OrdDate = 1 AND [OrdDate] IS NULL) OR ([OrdDate] = @Original_OrdDa" + + "te)) AND ([OrdNum] = @Original_OrdNum) AND ([OrdRow] = @Original_OrdRow) AND ([O" + + "rdPrice] = @Original_OrdPrice) AND ([OrdQty] = @Original_OrdQty) AND ([valid] = " + + "@Original_valid) AND ([errorScore] = @Original_errorScore) AND ([UserCreaz] = @O" + + "riginal_UserCreaz) AND ([DataCreaz] = @Original_DataCreaz) AND ([UserMod] = @Ori" + + "ginal_UserMod) AND ([DataMod] = @Original_DataMod));\r\nSELECT QuoteType, CodQuote" + + ", QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, Bat" + + "chQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, OrdQty" + + ", valid, errorScore, UserCreaz, DataCreaz, UserMod, DataMod FROM QuoteList WHERE" + + " (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QuoteType", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodQuote", global::System.Data.SqlDbType.BigInt, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodQuote", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -13591,10 +13825,17 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodInco", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "PriceOff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdDate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdDate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdNum", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdNum", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdRow", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdRow", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdPrice", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "OrdPrice", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdQty", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@valid", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "valid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@errorScore", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "errorScore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserCreaz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreaz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreaz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QuoteType", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodQuote", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QuoteRev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -13610,10 +13851,17 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_PriceOff", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "PriceOff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_OrdDate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdDate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdDate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdDate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdNum", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdNum", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdRow", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdRow", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdPrice", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 9, 6, "OrdPrice", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_OrdQty", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "OrdQty", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_valid", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "valid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_errorScore", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "errorScore", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserCreaz", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreaz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreaz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13637,6 +13885,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType_orig", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodQuote_orig", 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_orig", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -13662,6 +13911,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].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[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, 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_QL_makeSim"; @@ -13669,6 +13919,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou 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("@CodQuote_orig", 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("@QuoteRev_orig", 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("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, 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_QL_newRev"; @@ -13677,6 +13928,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteRev_orig", 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("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; this._commandCollection[6].CommandText = "dbo.stp_QL_update"; @@ -13715,7 +13967,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou [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.QuoteListDataTable clone(string QuoteType, string QuoteType_orig, global::System.Nullable CodQuote_orig, global::System.Nullable QuoteRev_orig) { + public virtual DS_Quotes.QuoteListDataTable clone(string QuoteType, string UserMod, string QuoteType_orig, global::System.Nullable CodQuote_orig, global::System.Nullable QuoteRev_orig) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -13723,24 +13975,30 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(QuoteType)); } - if ((QuoteType_orig == null)) { + if ((UserMod == null)) { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[2].Value = ((string)(QuoteType_orig)); + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(UserMod)); } - if ((CodQuote_orig.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((long)(CodQuote_orig.Value)); - } - else { + if ((QuoteType_orig == null)) { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((QuoteRev_orig.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[4].Value = ((int)(QuoteRev_orig.Value)); + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(QuoteType_orig)); + } + if ((CodQuote_orig.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((long)(CodQuote_orig.Value)); } else { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } + if ((QuoteRev_orig.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[5].Value = ((int)(QuoteRev_orig.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } DS_Quotes.QuoteListDataTable dataTable = new DS_Quotes.QuoteListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -13779,7 +14037,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou [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.QuoteListDataTable insNew(string QuoteType, 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.QuoteListDataTable insNew(string QuoteType, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note, string UserMod) { this.Adapter.SelectCommand = this.CommandCollection[3]; if ((QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -13835,6 +14093,12 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou else { this.Adapter.SelectCommand.Parameters[9].Value = ((string)(Note)); } + if ((UserMod == null)) { + this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[10].Value = ((string)(UserMod)); + } DS_Quotes.QuoteListDataTable dataTable = new DS_Quotes.QuoteListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -13844,7 +14108,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou [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.QuoteListDataTable makeSim(global::System.Nullable CodQuote_orig, global::System.Nullable QuoteRev_orig) { + public virtual DS_Quotes.QuoteListDataTable makeSim(global::System.Nullable CodQuote_orig, global::System.Nullable QuoteRev_orig, string UserMod) { this.Adapter.SelectCommand = this.CommandCollection[4]; if ((CodQuote_orig.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((long)(CodQuote_orig.Value)); @@ -13858,6 +14122,12 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } + if ((UserMod == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(UserMod)); + } DS_Quotes.QuoteListDataTable dataTable = new DS_Quotes.QuoteListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -13867,7 +14137,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou [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.QuoteListDataTable newRev(string QuoteType, global::System.Nullable CodQuote, global::System.Nullable QuoteRev_orig) { + public virtual DS_Quotes.QuoteListDataTable newRev(string QuoteType, global::System.Nullable CodQuote, global::System.Nullable QuoteRev_orig, string UserMod) { this.Adapter.SelectCommand = this.CommandCollection[5]; if ((QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -13887,6 +14157,12 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((UserMod == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(UserMod)); + } DS_Quotes.QuoteListDataTable dataTable = new DS_Quotes.QuoteListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -13943,7 +14219,14 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou global::System.Nullable Original_OrdDate, string Original_OrdNum, string Original_OrdRow, - decimal Original_OrdPrice) { + decimal Original_OrdPrice, + int Original_OrdQty, + bool Original_valid, + int Original_errorScore, + string Original_UserCreaz, + System.DateTime Original_DataCreaz, + string Original_UserMod, + System.DateTime Original_DataMod) { if ((Original_QuoteType == null)) { throw new global::System.ArgumentNullException("Original_QuoteType"); } @@ -14019,6 +14302,23 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this.Adapter.DeleteCommand.Parameters[17].Value = ((string)(Original_OrdRow)); } this.Adapter.DeleteCommand.Parameters[18].Value = ((decimal)(Original_OrdPrice)); + this.Adapter.DeleteCommand.Parameters[19].Value = ((int)(Original_OrdQty)); + this.Adapter.DeleteCommand.Parameters[20].Value = ((bool)(Original_valid)); + this.Adapter.DeleteCommand.Parameters[21].Value = ((int)(Original_errorScore)); + if ((Original_UserCreaz == null)) { + throw new global::System.ArgumentNullException("Original_UserCreaz"); + } + else { + this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_UserCreaz)); + } + this.Adapter.DeleteCommand.Parameters[23].Value = ((System.DateTime)(Original_DataCreaz)); + if ((Original_UserMod == null)) { + throw new global::System.ArgumentNullException("Original_UserMod"); + } + else { + this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_UserMod)); + } + this.Adapter.DeleteCommand.Parameters[25].Value = ((System.DateTime)(Original_DataMod)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -14056,7 +14356,14 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou global::System.Nullable OrdDate, string OrdNum, string OrdRow, - decimal OrdPrice) { + decimal OrdPrice, + int OrdQty, + bool valid, + int errorScore, + string UserCreaz, + System.DateTime DataCreaz, + string UserMod, + System.DateTime DataMod) { if ((QuoteType == null)) { throw new global::System.ArgumentNullException("QuoteType"); } @@ -14124,6 +14431,23 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this.Adapter.InsertCommand.Parameters[15].Value = ((string)(OrdRow)); } this.Adapter.InsertCommand.Parameters[16].Value = ((decimal)(OrdPrice)); + this.Adapter.InsertCommand.Parameters[17].Value = ((int)(OrdQty)); + this.Adapter.InsertCommand.Parameters[18].Value = ((bool)(valid)); + this.Adapter.InsertCommand.Parameters[19].Value = ((int)(errorScore)); + if ((UserCreaz == null)) { + throw new global::System.ArgumentNullException("UserCreaz"); + } + else { + this.Adapter.InsertCommand.Parameters[20].Value = ((string)(UserCreaz)); + } + this.Adapter.InsertCommand.Parameters[21].Value = ((System.DateTime)(DataCreaz)); + if ((UserMod == null)) { + throw new global::System.ArgumentNullException("UserMod"); + } + else { + this.Adapter.InsertCommand.Parameters[22].Value = ((string)(UserMod)); + } + this.Adapter.InsertCommand.Parameters[23].Value = ((System.DateTime)(DataMod)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -14162,6 +14486,13 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou string OrdNum, string OrdRow, decimal OrdPrice, + int OrdQty, + bool valid, + int errorScore, + string UserCreaz, + System.DateTime DataCreaz, + string UserMod, + System.DateTime DataMod, string Original_QuoteType, long Original_CodQuote, int Original_QuoteRev, @@ -14179,7 +14510,14 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou global::System.Nullable Original_OrdDate, string Original_OrdNum, string Original_OrdRow, - decimal Original_OrdPrice) { + decimal Original_OrdPrice, + int Original_OrdQty, + bool Original_valid, + int Original_errorScore, + string Original_UserCreaz, + System.DateTime Original_DataCreaz, + string Original_UserMod, + System.DateTime Original_DataMod) { if ((QuoteType == null)) { throw new global::System.ArgumentNullException("QuoteType"); } @@ -14247,81 +14585,115 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(OrdRow)); } this.Adapter.UpdateCommand.Parameters[16].Value = ((decimal)(OrdPrice)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(OrdQty)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(valid)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(errorScore)); + if ((UserCreaz == null)) { + throw new global::System.ArgumentNullException("UserCreaz"); + } + else { + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(UserCreaz)); + } + this.Adapter.UpdateCommand.Parameters[21].Value = ((System.DateTime)(DataCreaz)); + if ((UserMod == null)) { + throw new global::System.ArgumentNullException("UserMod"); + } + else { + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(UserMod)); + } + this.Adapter.UpdateCommand.Parameters[23].Value = ((System.DateTime)(DataMod)); if ((Original_QuoteType == null)) { throw new global::System.ArgumentNullException("Original_QuoteType"); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_QuoteType)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_QuoteType)); } - this.Adapter.UpdateCommand.Parameters[18].Value = ((long)(Original_CodQuote)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_QuoteRev)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_IdxQState)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((long)(Original_CodQuote)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_QuoteRev)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_IdxQState)); if ((Original_CodClient == null)) { throw new global::System.ArgumentNullException("Original_CodClient"); } else { - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_CodClient)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_CodClient)); } if ((Original_CodItem == null)) { throw new global::System.ArgumentNullException("Original_CodItem"); } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_CodItem)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_CodItem)); } if ((Original_CodItemGroup == null)) { throw new global::System.ArgumentNullException("Original_CodItemGroup"); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_CodItemGroup)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_CodItemGroup)); } if ((Original_RawMat == null)) { throw new global::System.ArgumentNullException("Original_RawMat"); } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_RawMat)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_RawMat)); } - this.Adapter.UpdateCommand.Parameters[25].Value = ((decimal)(Original_UnitWeight)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_BatchQty)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((decimal)(Original_UnitWeight)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_BatchQty)); if ((Original_CodInco == null)) { throw new global::System.ArgumentNullException("Original_CodInco"); } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_CodInco)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_CodInco)); } if ((Original_KeyAM == null)) { throw new global::System.ArgumentNullException("Original_KeyAM"); } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_KeyAM)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_KeyAM)); } if ((Original_Note == null)) { throw new global::System.ArgumentNullException("Original_Note"); } else { - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_Note)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_Note)); } - this.Adapter.UpdateCommand.Parameters[30].Value = ((decimal)(Original_PriceOff)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((decimal)(Original_PriceOff)); if ((Original_OrdDate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((System.DateTime)(Original_OrdDate.Value)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_OrdDate.Value)); } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } if ((Original_OrdNum == null)) { throw new global::System.ArgumentNullException("Original_OrdNum"); } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_OrdNum)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_OrdNum)); } if ((Original_OrdRow == null)) { throw new global::System.ArgumentNullException("Original_OrdRow"); } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_OrdRow)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_OrdRow)); } - this.Adapter.UpdateCommand.Parameters[35].Value = ((decimal)(Original_OrdPrice)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((decimal)(Original_OrdPrice)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(Original_OrdQty)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((bool)(Original_valid)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(Original_errorScore)); + if ((Original_UserCreaz == null)) { + throw new global::System.ArgumentNullException("Original_UserCreaz"); + } + else { + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_UserCreaz)); + } + this.Adapter.UpdateCommand.Parameters[47].Value = ((System.DateTime)(Original_DataCreaz)); + if ((Original_UserMod == null)) { + throw new global::System.ArgumentNullException("Original_UserMod"); + } + else { + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_UserMod)); + } + this.Adapter.UpdateCommand.Parameters[49].Value = ((System.DateTime)(Original_DataMod)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -14357,6 +14729,13 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou string OrdNum, string OrdRow, decimal OrdPrice, + int OrdQty, + bool valid, + int errorScore, + string UserCreaz, + System.DateTime DataCreaz, + string UserMod, + System.DateTime DataMod, string Original_QuoteType, long Original_CodQuote, int Original_QuoteRev, @@ -14374,8 +14753,15 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou global::System.Nullable Original_OrdDate, string Original_OrdNum, string Original_OrdRow, - decimal Original_OrdPrice) { - return this.Update(Original_QuoteType, Original_CodQuote, Original_QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, Original_QuoteType, Original_CodQuote, Original_QuoteRev, Original_IdxQState, Original_CodClient, Original_CodItem, Original_CodItemGroup, Original_RawMat, Original_UnitWeight, Original_BatchQty, Original_CodInco, Original_KeyAM, Original_Note, Original_PriceOff, Original_OrdDate, Original_OrdNum, Original_OrdRow, Original_OrdPrice); + decimal Original_OrdPrice, + int Original_OrdQty, + bool Original_valid, + int Original_errorScore, + string Original_UserCreaz, + System.DateTime Original_DataCreaz, + string Original_UserMod, + System.DateTime Original_DataMod) { + return this.Update(Original_QuoteType, Original_CodQuote, Original_QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, OrdQty, valid, errorScore, UserCreaz, DataCreaz, UserMod, DataMod, Original_QuoteType, Original_CodQuote, Original_QuoteRev, Original_IdxQState, Original_CodClient, Original_CodItem, Original_CodItemGroup, Original_RawMat, Original_UnitWeight, Original_BatchQty, Original_CodInco, Original_KeyAM, Original_Note, Original_PriceOff, Original_OrdDate, Original_OrdNum, Original_OrdRow, Original_OrdPrice, Original_OrdQty, Original_valid, Original_errorScore, Original_UserCreaz, Original_DataCreaz, Original_UserMod, Original_DataMod); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17685,6 +18071,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[8].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[8].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[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; this._commandCollection[9].CommandText = "dbo.stp_QuoteFull_Q_update"; @@ -17799,6 +18186,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[18].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[18].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[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxQState", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17992,7 +18380,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 insertNew(string QuoteType, 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 insertNew(string QuoteType, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note, string UserMod) { this.Adapter.SelectCommand = this.CommandCollection[8]; if ((QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18048,6 +18436,12 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas else { this.Adapter.SelectCommand.Parameters[9].Value = ((string)(Note)); } + if ((UserMod == null)) { + this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[10].Value = ((string)(UserMod)); + } DS_Quotes.QuoteFull_QDataTable dataTable = new DS_Quotes.QuoteFull_QDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18481,7 +18875,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 updateQState(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable IdxQState) { + public virtual DS_Quotes.QuoteFull_QDataTable updateQState(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable IdxQState, string UserMod) { this.Adapter.SelectCommand = this.CommandCollection[18]; if ((Original_QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18507,6 +18901,12 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas else { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } + if ((UserMod == null)) { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(UserMod)); + } 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 7d71d45..e879a2b 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -12,7 +12,7 @@ - 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)) + 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)) @@ -29,17 +29,24 @@ - + + + + + + + + - INSERT INTO [dbo].[QuoteList] ([QuoteType], [CodQuote], [QuoteRev], [IdxQState], [CodClient], [CodItem], [CodItemGroup], [RawMat], [UnitWeight], [BatchQty], [CodInco], [Note], [PriceOff], [OrdDate], [OrdNum], [OrdRow], [OrdPrice]) VALUES (@QuoteType, @CodQuote, @QuoteRev, @IdxQState, @CodClient, @CodItem, @CodItemGroup, @RawMat, @UnitWeight, @BatchQty, @CodInco, @Note, @PriceOff, @OrdDate, @OrdNum, @OrdRow, @OrdPrice); -SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType) + INSERT INTO [dbo].[QuoteList] ([QuoteType], [CodQuote], [QuoteRev], [IdxQState], [CodClient], [CodItem], [CodItemGroup], [RawMat], [UnitWeight], [BatchQty], [CodInco], [Note], [PriceOff], [OrdDate], [OrdNum], [OrdRow], [OrdPrice], [OrdQty], [valid], [errorScore], [UserCreaz], [DataCreaz], [UserMod], [DataMod]) VALUES (@QuoteType, @CodQuote, @QuoteRev, @IdxQState, @CodClient, @CodItem, @CodItemGroup, @RawMat, @UnitWeight, @BatchQty, @CodInco, @Note, @PriceOff, @OrdDate, @OrdNum, @OrdRow, @OrdPrice, @OrdQty, @valid, @errorScore, @UserCreaz, @DataCreaz, @UserMod, @DataMod); +SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, OrdQty, valid, errorScore, UserCreaz, DataCreaz, UserMod, DataMod FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType) @@ -54,10 +61,17 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + + + + + + + + @@ -69,8 +83,8 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - UPDATE [dbo].[QuoteList] SET [QuoteType] = @QuoteType, [CodQuote] = @CodQuote, [QuoteRev] = @QuoteRev, [IdxQState] = @IdxQState, [CodClient] = @CodClient, [CodItem] = @CodItem, [CodItemGroup] = @CodItemGroup, [RawMat] = @RawMat, [UnitWeight] = @UnitWeight, [BatchQty] = @BatchQty, [CodInco] = @CodInco, [Note] = @Note, [PriceOff] = @PriceOff, [OrdDate] = @OrdDate, [OrdNum] = @OrdNum, [OrdRow] = @OrdRow, [OrdPrice] = @OrdPrice 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)); -SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType) + UPDATE [dbo].[QuoteList] SET [QuoteType] = @QuoteType, [CodQuote] = @CodQuote, [QuoteRev] = @QuoteRev, [IdxQState] = @IdxQState, [CodClient] = @CodClient, [CodItem] = @CodItem, [CodItemGroup] = @CodItemGroup, [RawMat] = @RawMat, [UnitWeight] = @UnitWeight, [BatchQty] = @BatchQty, [CodInco] = @CodInco, [Note] = @Note, [PriceOff] = @PriceOff, [OrdDate] = @OrdDate, [OrdNum] = @OrdNum, [OrdRow] = @OrdRow, [OrdPrice] = @OrdPrice, [OrdQty] = @OrdQty, [valid] = @valid, [errorScore] = @errorScore, [UserCreaz] = @UserCreaz, [DataCreaz] = @DataCreaz, [UserMod] = @UserMod, [DataMod] = @DataMod 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)); +SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, KeyAM, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, OrdQty, valid, errorScore, UserCreaz, DataCreaz, UserMod, DataMod FROM QuoteList WHERE (CodQuote = @CodQuote) AND (QuoteRev = @QuoteRev) AND (QuoteType = @QuoteType) @@ -85,10 +99,17 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + + + + + + + + @@ -104,10 +125,17 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou - + + + + + + + + @@ -132,6 +160,13 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou + + + + + + + @@ -141,6 +176,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou + @@ -176,6 +212,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou + @@ -188,6 +225,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou + @@ -201,6 +239,7 @@ SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClient, CodItem, CodItemGrou + @@ -1002,6 +1041,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + @@ -1166,6 +1206,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + @@ -1874,7 +1915,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1955,10 +1996,29 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer + + + + + + + + + + + + + + + + + + + - + @@ -1994,7 +2054,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2019,7 +2079,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2099,7 +2159,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2136,7 +2196,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2206,7 +2266,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2461,7 +2521,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2699,7 +2759,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2720,7 +2780,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2855,11 +2915,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 b196130..ee92cd8 100644 --- a/C2P_Data/DS_Quotes.xss +++ b/C2P_Data/DS_Quotes.xss @@ -4,18 +4,18 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + + @@ -62,7 +62,7 @@ 559 - 662 + 567 559 @@ -73,7 +73,7 @@ - 705 + 762 430 diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 673bdad..7d13827 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 ea68041..56e94b6 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index a625656..bb3e948 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 f562edc..2dbd105 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 b43958a..70fb120 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/ReleaseClienti/C2P.SetParameters.xml b/ReleaseClienti/C2P.SetParameters.xml index 6982f96..f2b53f1 100644 --- a/ReleaseClienti/C2P.SetParameters.xml +++ b/ReleaseClienti/C2P.SetParameters.xml @@ -1,6 +1,5 @@  - - - + + \ No newline at end of file diff --git a/ReleaseClienti/C2P.SourceManifest.xml b/ReleaseClienti/C2P.SourceManifest.xml index 52f99c1..dd59c82 100644 --- a/ReleaseClienti/C2P.SourceManifest.xml +++ b/ReleaseClienti/C2P.SourceManifest.xml @@ -1,6 +1,5 @@  - diff --git a/ReleaseClienti/C2P.deploy.cmd b/ReleaseClienti/C2P.deploy.cmd index 129f492..2240f4f 100644 --- a/ReleaseClienti/C2P.deploy.cmd +++ b/ReleaseClienti/C2P.deploy.cmd @@ -177,9 +177,9 @@ call :CheckParameterFile echo. Start executing msdeploy.exe echo ------------------------------------------------------- if not exist "%_DeploySetParametersFile%" ( -set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%C2P.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\Release\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='C2P\\App_Data$' +set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%C2P.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\Release\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default\ Web\ Site/C2P\\App_Data$' ) else ( -set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%C2P.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\Release\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='C2P\\App_Data$' -setParamFile:"%_DeploySetParametersFile%" +set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%C2P.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\Release\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default\ Web\ Site/C2P\\App_Data$' -setParamFile:"%_DeploySetParametersFile%" ) if "%_HaveArgMSDeployAdditonalFlags%" == "" ( diff --git a/ReleaseClienti/C2P.zip b/ReleaseClienti/C2P.zip index ce01704..79350e3 100644 Binary files a/ReleaseClienti/C2P.zip and b/ReleaseClienti/C2P.zip differ