diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 53d555da..163123db 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -63,7 +63,7 @@ - + @@ -166,14 +166,14 @@ - + - + - + diff --git a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx index e4606543..997702c5 100644 --- a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx +++ b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx @@ -1,6 +1,18 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_bolle4odette.ascx.cs" Inherits="GMW.WebUserControls.mod_bolle4odette" %>
+
+ + + +
+
+ + + +
diff --git a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs index 3268b9bf..af55e952 100644 --- a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs @@ -31,12 +31,24 @@ namespace GMW.WebUserControls protected void btnDoCreate_Click(object sender, EventArgs e) { // cerco bolla sennò mostro errore... + string CodLista = memLayer.ML.StringSessionObj("CodListaOd_sel"); decimal NumBolla = Convert.ToDecimal(txtNumBolla.Text.Trim()); decimal DatBolla = Convert.ToDecimal(txtDataBolla.Text.Trim()); - if (bollaEsistente(NumBolla, DatBolla)) + string RaggMag = txtRaggMag.Text.Trim(); + string GrpBolla = txtGrBolle.Text.Trim(); + string particolare = ""; + try + { + particolare = MagClass.magazzino.taElencoListePrelievo.getByCodLista(CodLista)[0].Particolare; + } + catch + { + logger.lg.scriviLog(string.Format("Particolare non trovato per codLista {0}", CodLista), tipoLog.ERROR); + } + if (Odette.mgr.checkCodBolla(RaggMag, GrpBolla, NumBolla, DatBolla, particolare)) { // chiamo creazione etichette! - Odette.mgr.creaOdetteByBollaPackList(memLayer.ML.StringSessionObj("CodLista_sel"), NumBolla, DatBolla, ddlLingua.SelectedValue); + Odette.mgr.creaOdetteByBollaPackList(CodLista, RaggMag, GrpBolla, NumBolla, DatBolla, particolare, ddlLingua.SelectedValue); lblWarning.Visible = false; lblWarning.Text = ""; // sollevo evento new! @@ -48,32 +60,26 @@ namespace GMW.WebUserControls else { lblWarning.Visible = true; - lblWarning.Text = "Bolla non trovata!"; + if (Odette.mgr.taBORI.getByKeyPart(RaggMag, GrpBolla, NumBolla, DatBolla).Rows.Count > 0) + { + lblWarning.Text = traduci("MismatchParticolare"); + } + else + { + lblWarning.Text = traduci("BollaNonTrovata"); + } } } /// - /// effettua ricerca delle bolle + /// wrapper traduzione /// - /// - /// + /// /// - public bool bollaEsistente(decimal numBolla, decimal dataBolla) + public string traduci(object lemma) { - bool answ = false; - try - { - // cerco se c'è già... - answ = Odette.mgr.taBORI.getByBolla(numBolla, dataBolla).Rows.Count > 0; - // se non c'è provo a caricare con stored di caricamento singolo... - if (!answ) - { - Odette.mgr.taBORI.caricaDatiBolla(numBolla, dataBolla); - answ = Odette.mgr.taBORI.getByBolla(numBolla, dataBolla).Rows.Count > 0; - } - } - catch - { } - return answ; + return user_std.UtSn.Traduci(lemma.ToString()); } + + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.designer.cs index 2dda5c6e..ec0c7e18 100644 --- a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.designer.cs @@ -13,6 +13,60 @@ namespace GMW.WebUserControls { public partial class mod_bolle4odette { + /// + /// lblRaggMag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblRaggMag; + + /// + /// txtRaggMag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtRaggMag; + + /// + /// RequiredFieldValidator2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2; + + /// + /// lblGrBolle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblGrBolle; + + /// + /// txtGrBolle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtGrBolle; + + /// + /// RequiredFieldValidator3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3; + /// /// lblNumBolla control. /// diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx index 65e1790f..e5617930 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx @@ -128,7 +128,7 @@ + Enabled="true" OnClick="img_Click" /> @@ -143,7 +143,7 @@ + Enabled="true" OnClick="img_Click" /> diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx index 3d45c660..0045857d 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx @@ -28,12 +28,12 @@ DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlTipoLista_SelectedIndexChanged"> - + SelectMethod="GetData" TypeName="GMW_data.DS_UtilityTableAdapters.v_selTipoListaTableAdapter" + FilterExpression="value='04-OdetSP'"> - + + DataSourceID="odsDestinatario" CssClass="WindowsStyle" MaxLength="0" Style="display: inline;" /> diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs index 64959dd9..c17a8277 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4952 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/GMW/GMW/WebUserControls/mod_odette.ascx b/GMW/GMW/WebUserControls/mod_odette.ascx index 6dbecbf0..1a59409c 100644 --- a/GMW/GMW/WebUserControls/mod_odette.ascx +++ b/GMW/GMW/WebUserControls/mod_odette.ascx @@ -12,9 +12,6 @@
-
- -
@@ -26,14 +23,14 @@ - - - - - - - - + + + + + + + + diff --git a/GMW/GMW/WebUserControls/mod_odette.ascx.cs b/GMW/GMW/WebUserControls/mod_odette.ascx.cs index 7f5cbf91..4226d63b 100644 --- a/GMW/GMW/WebUserControls/mod_odette.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_odette.ascx.cs @@ -286,10 +286,9 @@ namespace GMW.WebUserControls protected override void OnInit(EventArgs e) { base.OnInit(e); - _idxGridView = "CodLista"; + _idxGridView = "CodListaOd"; if (!Page.IsPostBack) { - btnForceReload.Text = traduci("ReloadBolle"); mod_viewOdette1.Visible = false; mod_periodoAnalisi1.setPeriodoFree(); mod_bolle4odette1.Visible = false; @@ -604,15 +603,6 @@ namespace GMW.WebUserControls return url; } - /// - /// forza ricaricamento dati datamatrix/gitterbox/odette - /// - /// - /// - protected void btnForceReload_Click(object sender, EventArgs e) - { - Odette.mgr.taBORI.stp_BORI_caricaDatiNew(); - } /// /// formatta una stringa x lo stato dell'odette (create/totale /// diff --git a/GMW/GMW/WebUserControls/mod_odette.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_odette.ascx.designer.cs index 05a7d7bf..9d38ddbc 100644 --- a/GMW/GMW/WebUserControls/mod_odette.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_odette.ascx.designer.cs @@ -22,15 +22,6 @@ namespace GMW.WebUserControls { /// protected global::mod_periodoAnalisi mod_periodoAnalisi1; - /// - /// btnForceReload control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnForceReload; - /// /// mod_bolle4odette1 control. /// diff --git a/GMW/GMW/WebUserControls/mod_viewOdette.ascx b/GMW/GMW/WebUserControls/mod_viewOdette.ascx index a7396103..bcb82dc6 100644 --- a/GMW/GMW/WebUserControls/mod_viewOdette.ascx +++ b/GMW/GMW/WebUserControls/mod_viewOdette.ascx @@ -8,14 +8,14 @@ DataKeyNames="CampoUDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged" OnSorted="grView_Sorted" OnRowUpdating="grView_RowUpdating" OnRowEditing="grView_RowEditing" OnRowCancelingEdit="grView_RowCancelingEdit" OnRowDeleted="grView_RowDeleted"> - - - - - - - - + + + + + + + + @@ -53,7 +53,7 @@ - diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index fe3690ff..72b5046c 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 781a47dc..4304292d 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index a491b88b..0dbcfde9 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 4064f70c..b3698950 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 9bc793e0..72b5046c 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index a2436ec7..ff30b3e2 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index fe3690ff..42450634 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index ecfee807..d637e48e 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_Odette.Designer.cs b/GMW/GMW_data/DS_Odette.Designer.cs index 1c705832..b5212f08 100644 --- a/GMW/GMW_data/DS_Odette.Designer.cs +++ b/GMW/GMW_data/DS_Odette.Designer.cs @@ -4664,7 +4664,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CITND, RASCL, INDCL, CAPCL, LOCCL, PROCL, INEND, CRAGCL, TELND, CCDMOL, CCDPTR, EPLAVO, NRC1B, ECMM01, DEPAR, RCARTC, PERND, CCDET1, ECDNAE, ECDNA1, EESPMD, PELDB, QTCNS FROM RawData.BORI202J"; @@ -4674,8 +4674,11 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT this._commandCollection[1].CommandText = "dbo.stp_BORI_caricaDatiBolla"; 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("@numB", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 6, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataB", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 8, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RaggrMagazz", global::System.Data.SqlDbType.NVarChar, 2, 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("@GruppoBolle", global::System.Data.SqlDbType.NVarChar, 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("@NumeroBolla", global::System.Data.SqlDbType.NVarChar, 6, 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("@DataBolla", global::System.Data.SqlDbType.NVarChar, 8, 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("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = "dbo.stp_BORI_getByBolla"; @@ -4685,9 +4688,23 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataB", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 8, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_BORI_caricaDatiNew"; + this._commandCollection[3].CommandText = "dbo.stp_BORI_getByBollaFull"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RaggrMagazz", global::System.Data.SqlDbType.NVarChar, 2, 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("@GruppoBolle", global::System.Data.SqlDbType.NVarChar, 1, 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("@NumeroBolla", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 6, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataBolla", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 8, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, 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_BORI_getByBollaPart"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RaggrMagazz", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@GruppoBolle", global::System.Data.SqlDbType.NVarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumeroBolla", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 6, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataBolla", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 8, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4734,6 +4751,80 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Odette.BORI202JDataTable getByKeyFull(string RaggrMagazz, string GruppoBolle, global::System.Nullable NumeroBolla, global::System.Nullable DataBolla, string Particolare) { + this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((RaggrMagazz == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(RaggrMagazz)); + } + if ((GruppoBolle == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(GruppoBolle)); + } + if ((NumeroBolla.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((decimal)(NumeroBolla.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((DataBolla.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((decimal)(DataBolla.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Particolare == null)) { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Particolare)); + } + DS_Odette.BORI202JDataTable dataTable = new DS_Odette.BORI202JDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Odette.BORI202JDataTable getByKeyPart(string RaggrMagazz, string GruppoBolle, global::System.Nullable NumeroBolla, global::System.Nullable DataBolla) { + this.Adapter.SelectCommand = this.CommandCollection[4]; + if ((RaggrMagazz == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(RaggrMagazz)); + } + if ((GruppoBolle == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(GruppoBolle)); + } + if ((NumeroBolla.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((decimal)(NumeroBolla.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((DataBolla.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((decimal)(DataBolla.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + DS_Odette.BORI202JDataTable dataTable = new DS_Odette.BORI202JDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(DS_Odette.BORI202JDataTable dataTable) { @@ -5672,41 +5763,38 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int caricaDatiBolla(global::System.Nullable numB, global::System.Nullable dataB) { + public virtual int caricaDatiBolla(string RaggrMagazz, string GruppoBolle, string NumeroBolla, string DataBolla, string Particolare) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; - if ((numB.HasValue == true)) { - command.Parameters[1].Value = ((decimal)(numB.Value)); - } - else { + if ((RaggrMagazz == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((dataB.HasValue == true)) { - command.Parameters[2].Value = ((decimal)(dataB.Value)); - } else { + command.Parameters[1].Value = ((string)(RaggrMagazz)); + } + if ((GruppoBolle == null)) { command.Parameters[2].Value = global::System.DBNull.Value; } - global::System.Data.ConnectionState previousConnectionState = command.Connection.State; - if (((command.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - command.Connection.Open(); + else { + command.Parameters[2].Value = ((string)(GruppoBolle)); } - int returnValue; - try { - returnValue = command.ExecuteNonQuery(); + if ((NumeroBolla == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - command.Connection.Close(); - } + else { + command.Parameters[3].Value = ((string)(NumeroBolla)); + } + if ((DataBolla == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(DataBolla)); + } + if ((Particolare == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Particolare)); } - return returnValue; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_BORI_caricaDatiNew() { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/GMW/GMW_data/DS_Odette.xsd b/GMW/GMW_data/DS_Odette.xsd index 05f08d5c..806a98c9 100644 --- a/GMW/GMW_data/DS_Odette.xsd +++ b/GMW/GMW_data/DS_Odette.xsd @@ -215,8 +215,11 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT dbo.stp_BORI_caricaDatiBolla - - + + + + + @@ -233,12 +236,31 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT - + - dbo.stp_BORI_caricaDatiNew + dbo.stp_BORI_getByBollaFull + + + + + + + + + + + + + dbo.stp_BORI_getByBollaPart + + + + + + diff --git a/GMW/GMW_data/DS_Odette.xss b/GMW/GMW_data/DS_Odette.xss index 401f9f6d..a9d76d7c 100644 --- a/GMW/GMW_data/DS_Odette.xss +++ b/GMW/GMW_data/DS_Odette.xss @@ -6,9 +6,9 @@ --> - - - + + + \ No newline at end of file diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 4b8e82b7..a2e6c2cc 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4952 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -22361,7 +22361,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM dbo.RigheListePrelievo"; @@ -22399,25 +22399,31 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.VarChar, 12, 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_RLP_sbloccaNonPrelevate"; + this._commandCollection[6].CommandText = "dbo.stp_RLP_eliminaNonPrelevate"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_RLP_updateQty"; + this._commandCollection[7].CommandText = "dbo.stp_RLP_sbloccaNonPrelevate"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_UDC_upsertPrelevato"; + this._commandCollection[8].CommandText = "dbo.stp_RLP_updateQty"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, 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("@UDC", global::System.Data.SqlDbType.NVarChar, 50, 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("@UDC", global::System.Data.SqlDbType.VarChar, 50, 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("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 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_UDC_upsertPrelevato"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", 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()] @@ -22516,7 +22522,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.RigheListePrelievoDataTable upsertPrelevato(string CodLista, string UDC) { - this.Adapter.SelectCommand = this.CommandCollection[8]; + this.Adapter.SelectCommand = this.CommandCollection[9]; if ((CodLista == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -22763,7 +22769,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_RLP_sbloccaNonPrelevate(string CodLista, string UDC) { + public virtual int stp_RLP_eliminaNonPrelevate(string CodLista) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((CodLista == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -22771,6 +22777,33 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co else { command.Parameters[1].Value = ((string)(CodLista)); } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int stp_RLP_sbloccaNonPrelevate(string CodLista, string UDC) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + if ((CodLista == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodLista)); + } if ((UDC == null)) { command.Parameters[2].Value = global::System.DBNull.Value; } @@ -22797,7 +22830,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_RLP_updateQty(string UDC, global::System.Nullable Qta) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 84d02053..84b3377d 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1793,6 +1793,17 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co + + + + dbo.stp_RLP_eliminaNonPrelevate + + + + + + + @@ -2563,274 +2574,127 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2845,18 +2709,18 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - - - - - - + + + + + + + + - + @@ -2866,7 +2730,154 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2880,99 +2891,99 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - - - + + + - - + + - - + + - + - + - - - - - + + + + + - + - + - + @@ -2983,6 +2994,343 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2999,358 +3347,21 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3363,131 +3374,131 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - + + - + - - + + - - - + + + - + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - + @@ -3507,8 +3518,8 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - + + @@ -3521,33 +3532,33 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - + + + - + - - + + - - - + + + @@ -3560,42 +3571,42 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - + - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 5f5b9007..37008d9d 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -19,7 +19,7 @@ - + @@ -123,7 +123,7 @@ 949 - 339 + 383 949 diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 36861514..3dd1a326 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -195,6 +195,8 @@ SettingsSingleFileGenerator Settings.Designer.cs + + @@ -249,6 +251,7 @@ +