diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index d4fae5d9..8ef6acb2 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -203,6 +203,20 @@ MasterAjax.master + + TermPage.Master + ASPXCodeBehind + + + TermPage.Master + + + TermPageAjax.Master + ASPXCodeBehind + + + TermPageAjax.Master + mod_anagBlocchi.ascx ASPXCodeBehind @@ -744,6 +758,8 @@ + + diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 720871e9..d5020833 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -65,7 +65,7 @@ - + diff --git a/GMW/GMW/WebMasterPages/TermPage.Master b/GMW/GMW/WebMasterPages/TermPage.Master new file mode 100644 index 00000000..de3859ea --- /dev/null +++ b/GMW/GMW/WebMasterPages/TermPage.Master @@ -0,0 +1,18 @@ +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="TermPage.master.cs" Inherits="GMW.WebMasterPages.TermPage" %> + + + + + + + + + +
+
+ + +
+
+ + diff --git a/GMW/GMW/WebMasterPages/TermPage.Master.cs b/GMW/GMW/WebMasterPages/TermPage.Master.cs new file mode 100644 index 00000000..86ec5cbd --- /dev/null +++ b/GMW/GMW/WebMasterPages/TermPage.Master.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebMasterPages +{ + public partial class TermPage : System.Web.UI.MasterPage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW/WebMasterPages/TermPage.Master.designer.cs b/GMW/GMW/WebMasterPages/TermPage.Master.designer.cs new file mode 100644 index 00000000..bd459048 --- /dev/null +++ b/GMW/GMW/WebMasterPages/TermPage.Master.designer.cs @@ -0,0 +1,43 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebMasterPages { + + + public partial class TermPage { + + /// + /// head control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder head; + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + } +} diff --git a/GMW/GMW/WebMasterPages/TermPageAjax.Master b/GMW/GMW/WebMasterPages/TermPageAjax.Master new file mode 100644 index 00000000..5bc57bdc --- /dev/null +++ b/GMW/GMW/WebMasterPages/TermPageAjax.Master @@ -0,0 +1,24 @@ +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="TermPageAjax.master.cs" + Inherits="GMW.WebMasterPages.TermPageAjax" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> + + + + + + + + + +
+ + + +
+ + +
+
+ + diff --git a/GMW/GMW/WebMasterPages/TermPageAjax.Master.cs b/GMW/GMW/WebMasterPages/TermPageAjax.Master.cs new file mode 100644 index 00000000..5b7eeadc --- /dev/null +++ b/GMW/GMW/WebMasterPages/TermPageAjax.Master.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebMasterPages +{ + public partial class TermPageAjax : System.Web.UI.MasterPage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW/WebMasterPages/TermPageAjax.Master.designer.cs b/GMW/GMW/WebMasterPages/TermPageAjax.Master.designer.cs new file mode 100644 index 00000000..4236ce73 --- /dev/null +++ b/GMW/GMW/WebMasterPages/TermPageAjax.Master.designer.cs @@ -0,0 +1,52 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebMasterPages { + + + public partial class TermPageAjax { + + /// + /// head control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder head; + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// sm control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ToolkitScriptManager sm; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; + } +} diff --git a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx index 277e8fe3..d3532025 100644 --- a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx +++ b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx @@ -1 +1,75 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detailParticolari.ascx.cs" Inherits="GMW.WebUserControls.mod_detailParticolari" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + + + +   + \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs index 96a96bf1..dd29458e 100644 --- a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs @@ -1,17 +1,199 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using System.Data; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; + namespace GMW.WebUserControls { - public partial class mod_detailParticolari : System.Web.UI.UserControl + public partial class mod_detailParticolari : SteamWare.ApplicationUserControl { - protected void Page_Load(object sender, EventArgs e) - { + #region area da NON modificare + #region area protected + + protected string _idxGridView; + protected string _idxGridViewExt; + protected string _tabCache; + + /// + /// aggiorna controlli datagrid e numero righe in pagina + /// + protected override void aggiornaControlliDataGL() + { + base.aggiornaControlliDataGL(); + grView.PageSize = _righeDataGridMed; } + /// + /// traduce gli header delle colonne + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + /// + /// reset della selezione + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + + + /// + /// collega i controlli + /// + protected override void bindControlli() + { + base.bindControlli(); + caricaTabelle(); + } + + #endregion + + #region gestione eventi + + public event EventHandler eh_resetSelezione; + public event EventHandler eh_nuovoValore; + public event EventHandler eh_selValore; + + #endregion + + #region public + + /// + /// effettua update del modulo + /// + public void doUpdate() + { + resetSelezione(); + } + + + #endregion + + #endregion + + #region area codice variabile + + /// + /// carico le tabelle + /// + private void caricaTabelle() + { + } + /// + /// elenco colonne del datagrid + /// + /// + protected DataColumnCollection colonneObj() + { + DS_magazzino.V_DettMagPartDataTable tabella = new DS_magazzino.V_DettMagPartDataTable(); + DataColumnCollection colonne = tabella.Columns; + return colonne; + } + /// + /// inizializzazione valori di default + /// + /// + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + } + + /// + /// segnalo nuovo valore filtro attivo... + /// + private void checkFixOds() + { + grView.DataBind(); + } + /// + /// aggiorno visualizzazione + /// + private void updateOdsDaFiltro() + { + grView.DataBind(); + } + /// + /// chiamata post page change gridview + /// + /// + /// + protected void grView_PageIndexChanged(object sender, EventArgs e) + { + // sistemazione dell'ods post evento cambio pagina + checkFixOds(); + } + /// + /// chiamata post sort gridview + /// + /// + /// + protected void grView_Sorted(object sender, EventArgs e) + { + // sistemazione dell'ods post evento sort + checkFixOds(); + } + /// + /// gestione cambio selezione valore + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + //// salvo in session il lo stato scelto... + //SteamWare.memLayer.ML.setSessionVal("DescStato_sel", grView.SelectedDataKey["DescStato"], false); + //// salvo anche l'esponente scelto... + //SteamWare.memLayer.ML.setSessionVal("Esponente_sel", grView.SelectedDataKey["Esponente"], false); + // sollevo evento nuovo valore... + if (eh_selValore != null) + { + eh_selValore(this, new EventArgs()); + } + } + + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + //SteamWare.memLayer.ML.emptySessionVal("DescStato_sel"); + //SteamWare.memLayer.ML.emptySessionVal("Esponente_sel"); + grView.SelectedIndex = -1; + grView.DataBind(); + lblWarning.Visible = false; + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } + } + #endregion } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.designer.cs index ba156e92..8d63a733 100644 --- a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.designer.cs @@ -1,18 +1,52 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace GMW.WebUserControls -{ - - - public partial class mod_detailParticolari - { +namespace GMW.WebUserControls { + + + public partial class mod_detailParticolari { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// lblNumRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; } } diff --git a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx index cfff835a..5f80b1a6 100644 --- a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx +++ b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx @@ -1,6 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_paretoPartByFullSpec.ascx.cs" Inherits="GMW.WebUserControls.mod_paretoPartByFullSpec" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="mod_barPlot.ascx" TagName="mod_barPlot" TagPrefix="uc2" %> - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 68d9b732..12e0357b 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 e80431c7..39950d80 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 e7f4f87e..46a778f5 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 2007076a..4f504bdf 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config index 572c7f5a..f7603956 100644 --- a/GMW/GMW_WS/Web.config +++ b/GMW/GMW_WS/Web.config @@ -88,7 +88,7 @@ - + diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs index 6dd85e7c..c5e7d68c 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -14,7 +14,7 @@ namespace GMW_WS /// /// WebService per gestione sw bilance /// - [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.50")] + [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.85")] [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] [System.ComponentModel.ToolboxItem(false)] public class bilance : System.Web.Services.WebService diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index 6f53d044..c49e982b 100644 Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll index 9a36481f..67115717 100644 Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll index e23324cb..bdcdd88c 100644 Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ diff --git a/GMW/GMW_WS/bin/SteamWare.dll b/GMW/GMW_WS/bin/SteamWare.dll index fa95249a..80a43d32 100644 Binary files a/GMW/GMW_WS/bin/SteamWare.dll and b/GMW/GMW_WS/bin/SteamWare.dll differ diff --git a/GMW/GMW_WS/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config index 9f27e869..641d4038 100644 --- a/GMW/GMW_WS/mazzAppSettings.config +++ b/GMW/GMW_WS/mazzAppSettings.config @@ -6,7 +6,7 @@ - + diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll index 9a36481f..67115717 100644 Binary files a/GMW/GMW_WS/obj/Release/GMW_WS.dll and b/GMW/GMW_WS/obj/Release/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache index 2c367c4d..f12eee90 100644 Binary files a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj index 7a227118..0c52c745 100644 --- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj +++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_WS" - "ProductCode" = "8:{BE396C8D-16AF-4259-88AB-3A24D70C22AA}" - "PackageCode" = "8:{F719988E-704B-4E30-A93F-DE27216A7712}" + "ProductCode" = "8:{04AE9758-A218-47B5-AC1B-EA88B6FDA581}" + "PackageCode" = "8:{933268D2-1E65-4558-B9BD-AFCC10097A4B}" "UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.51" + "ProductVersion" = "8:1.0.85" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi index b55a9b8d..b690aa21 100644 Binary files a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 0e091ec6..5b78bc1f 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -14151,7 +14151,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.V_DettMagPart"; @@ -14173,6 +14173,13 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_paretoDettMagByParticolare"; + 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("@CodCS", global::System.Data.SqlDbType.VarChar, 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("@Particolare", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14258,6 +14265,28 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co 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_magazzino.V_DettMagPartDataTable getParetoByParticolare(string CodCS, string Particolare) { + this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((CodCS == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodCS)); + } + if ((Particolare == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Particolare)); + } + DS_magazzino.V_DettMagPartDataTable dataTable = new DS_magazzino.V_DettMagPartDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index e3d7f400..173e16da 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1256,6 +1256,18 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co + + + + dbo.stp_paretoDettMagByParticolare + + + + + + + + @@ -1267,6 +1279,154 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1276,120 +1436,117 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1404,288 +1561,33 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1699,85 +1601,102 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co - - - - - - - - - - + - + - + + + + + + + + - + + + + + + + + + + + - - + + + + + + + + + - - - - - - + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - + + + + + + + @@ -1785,18 +1704,111 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 52240d63..1746da61 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. --> - + @@ -17,7 +17,7 @@ - + diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index a8643d26..c2884776 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -127,6 +127,12 @@ + + + + + +