diff --git a/GMW/GMW.suo b/GMW/GMW.suo index c27e2dd9..a9825dff 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index c23edf26..43a36777 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -836,6 +836,18 @@ + + + + + + + + + + + + @@ -892,7 +904,7 @@ False True - 53919 + 53622 / http://localhost/GMW True diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 25409d69..8ae6e51e 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -62,7 +62,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs index 4bf22b4b..69029514 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs @@ -10,19 +10,37 @@ namespace GMW.WebUserControls { public partial class mod_SearchProvParticolari : System.Web.UI.UserControl { + + /// + /// evento selezione valore + /// + public event EventHandler eh_selValore; + + protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) { doTraduci(); - //mod_detailParticolari1.Visible = false; mod_execParticolari1.Visible = false; } + mod_detailParticolari1.eh_selValore += new EventHandler(mod_detailParticolari1_eh_selValore); + mod_detailParticolari1.eh_resetSelezione += new EventHandler(mod_detailParticolari1_eh_resetSelezione); mod_listParticolari1.eh_selValore += new EventHandler(mod_listParticolari1_eh_selValore); mod_listParticolari1.eh_resetSelezione += new EventHandler(mod_listParticolari1_eh_resetSelezione); mod_execParticolari1.eh_btnGoToMagPressed += new EventHandler(mod_execParticolari1_eh_btnGoToMagPressed); mod_execParticolari1.eh_btnListaPrelievoPressed += new EventHandler(mod_execParticolari1_eh_btnListaPrelievoPressed); } + + void mod_detailParticolari1_eh_resetSelezione(object sender, EventArgs e) + { + mod_execParticolari1.Visible = false; + } + + void mod_detailParticolari1_eh_selValore(object sender, EventArgs e) + { + mod_execParticolari1.Visible = true; + } /// /// evento crea lista di prelievo chiamato /// @@ -45,15 +63,25 @@ namespace GMW.WebUserControls void mod_listParticolari1_eh_resetSelezione(object sender, EventArgs e) { - //mod_detailParticolari1.Visible = false; + mod_detailParticolari1.resetSelezione(); mod_execParticolari1.Visible = false; + memLayer.ML.emptySessionVal("Particolare_sel"); + // sollevo evento nuovo valore... + if (eh_selValore != null) + { + eh_selValore(this, new EventArgs()); + } } void mod_listParticolari1_eh_selValore(object sender, EventArgs e) { - //mod_detailParticolari1.Visible = true; - //mod_detailParticolari1.doUpdate(); - mod_execParticolari1.Visible = true; + mod_detailParticolari1.resetSelezione(); + mod_execParticolari1.Visible = false; + // sollevo evento nuovo valore... + if (eh_selValore != null) + { + eh_selValore(this, new EventArgs()); + } } @@ -80,6 +108,14 @@ namespace GMW.WebUserControls { return user_std.UtSn.Traduci(lemma); } + /// + /// effettua update della visualizzazione + /// + public void doRefresh() + { + mod_execParticolari1.Visible = false; + mod_listParticolari1.doRefresh(); + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs index fac1449f..70cba53b 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs @@ -10,6 +10,12 @@ namespace GMW.WebUserControls { public partial class mod_SearchProvUDC : System.Web.UI.UserControl { + + /// + /// evento selezione valore + /// + public event EventHandler eh_selValore; + protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -47,6 +53,18 @@ namespace GMW.WebUserControls { mod_detailUDC1.Visible = false; mod_execUDC1.Visible = false; + // svuoto in session + memLayer.ML.emptySessionVal("Particolare_sel"); + memLayer.ML.emptySessionVal("Esponente_sel"); + memLayer.ML.emptySessionVal("CodMag_sel"); + memLayer.ML.emptySessionVal("CodCellaMag"); + memLayer.ML.emptySessionVal("IdxCellaMag"); + memLayer.ML.emptySessionVal("IdxBlocco_sel"); + // sollevo evento nuovo valore... + if (eh_selValore != null) + { + eh_selValore(this, new EventArgs()); + } } void mod_listUDC1_eh_selValore(object sender, EventArgs e) @@ -71,6 +89,11 @@ namespace GMW.WebUserControls memLayer.ML.setSessionVal("CodCellaMag", codCellaMag, false); memLayer.ML.setSessionVal("IdxCellaMag", idxCellaMag, false); memLayer.ML.setSessionVal("IdxBlocco_sel", idxBlocco, false); + // sollevo evento nuovo valore... + if (eh_selValore != null) + { + eh_selValore(this, new EventArgs()); + } } @@ -97,5 +120,12 @@ namespace GMW.WebUserControls { return user_std.UtSn.Traduci(lemma); } + /// + /// effettua refresh della visualizzazione + /// + public void doRefresh() + { + mod_listUDC1.doRefresh(); + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx b/GMW/GMW/WebUserControls/mod_listParticolari.ascx index ea4285e5..6c1f6ebd 100644 --- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx +++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx @@ -4,7 +4,7 @@ + OnSorting="grView_Sorting" OnRowDataBound="grView_RowDataBound"> diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs index ae730190..99cc300a 100644 --- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs @@ -211,7 +211,33 @@ namespace GMW.WebUserControls // fix dell'ODS checkFixOds(); } + + protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) + { + // se riga di dati... + if (e.Row.RowType == DataControlRowType.DataRow) + { + // ottengo la riga tipizzata... + System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem; + DS_magazzino.V_ParticolariOverviewRow riga = (DS_magazzino.V_ParticolariOverviewRow)_drv.Row; + bool cond1 = SteamWare.memLayer.ML.StringSessionObj("Particolare_sel") == riga.Particolare.ToString(); + if (cond1) + { + grView.SelectedIndex = e.Row.RowIndex; + } + } + } + /// + /// effettua refresh 8senza reset) del modulo + /// + public void doRefresh() + { + checkFixOds(); + grView.SelectedIndex = -1; + DataBind(); + } #endregion + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_listUDC.ascx b/GMW/GMW/WebUserControls/mod_listUDC.ascx index df386172..4560167a 100644 --- a/GMW/GMW/WebUserControls/mod_listUDC.ascx +++ b/GMW/GMW/WebUserControls/mod_listUDC.ascx @@ -3,8 +3,8 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged" + OnSorting="grView_Sorting" OnRowDataBound="grView_RowDataBound"> diff --git a/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs index f4053f83..f4b8090a 100644 --- a/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_listUDC.ascx.cs @@ -213,7 +213,38 @@ namespace GMW.WebUserControls // fix dell'ODS checkFixOds(); } + /// + /// effettua refresh 8senza reset) del modulo + /// + public void doRefresh() + { + checkFixOds(); + //grView.SelectedIndex = -1; + DataBind(); + } + /// + /// aggiorna visualizzaizone selezione + /// + /// + /// + protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) + { + // se riga di dati... + if (e.Row.RowType == DataControlRowType.DataRow) + { + // ottengo la riga tipizzata... + System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem; + DS_magazzino.v_UdcDetailRow riga = (DS_magazzino.v_UdcDetailRow)_drv.Row; + bool cond1 = SteamWare.memLayer.ML.StringSessionObj("UDC_sel") == riga.UDC.ToString(); + if (cond1) + { + grView.SelectedIndex = e.Row.RowIndex; + } + } + } #endregion + + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx b/GMW/GMW/WebUserControls/mod_searchMag.ascx index e033fd17..44725306 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx @@ -52,9 +52,9 @@
-
- <%--
+ +
--%> diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs index 297c023f..39699a32 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -18,6 +18,18 @@ namespace GMW.WebUserControls pnlEmpty.Visible = true; pnlResults.Visible = false; } + mod_SearchProvUDC1.eh_selValore += new EventHandler(mod_SearchProvUDC1_eh_selValore); + mod_SearchProvParticolari1.eh_selValore += new EventHandler(mod_SearchProvParticolari1_eh_selValore); + } + + void mod_SearchProvParticolari1_eh_selValore(object sender, EventArgs e) + { + mod_SearchProvUDC1.doRefresh(); + } + + void mod_SearchProvUDC1_eh_selValore(object sender, EventArgs e) + { + mod_SearchProvParticolari1.doRefresh(); } @@ -53,8 +65,8 @@ namespace GMW.WebUserControls // è generica, mostro tutto! mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); - mod_SearchProvCelle1.Visible = true; - mod_SearchProvCelle1.doSearch(); + //mod_SearchProvCelle1.Visible = true; + //mod_SearchProvCelle1.doSearch(); mod_SearchProvParticolari1.Visible = true; mod_SearchProvParticolari1.doSearch(); //Mod_SearchProvImballi1.Visible = true; @@ -68,21 +80,23 @@ namespace GMW.WebUserControls { case "I": mod_SearchProvUDC1.Visible = false; - mod_SearchProvCelle1.Visible = false; + //mod_SearchProvCelle1.Visible = false; mod_SearchProvParticolari1.Visible = false; //Mod_SearchProvImballi1.Visible = true; //Mod_SearchProvImballi1.doSearch(); break; +#if false case "C": mod_SearchProvUDC1.Visible = false; - mod_SearchProvCelle1.Visible = true; - mod_SearchProvCelle1.doSearch(); + //mod_SearchProvCelle1.Visible = true; + //mod_SearchProvCelle1.doSearch(); mod_SearchProvParticolari1.Visible = false; //Mod_SearchProvImballi1.Visible = false; - break; + break; +#endif case "P": mod_SearchProvUDC1.Visible = false; - mod_SearchProvCelle1.Visible = false; + //mod_SearchProvCelle1.Visible = false; mod_SearchProvParticolari1.Visible = true; mod_SearchProvParticolari1.doSearch(); //Mod_SearchProvImballi1.Visible = false; @@ -90,15 +104,15 @@ namespace GMW.WebUserControls case "U": mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); - mod_SearchProvCelle1.Visible = false; + //mod_SearchProvCelle1.Visible = false; mod_SearchProvParticolari1.Visible = false; //Mod_SearchProvImballi1.Visible = false; break; default: mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); - mod_SearchProvCelle1.Visible = true; - mod_SearchProvCelle1.doSearch(); + //mod_SearchProvCelle1.Visible = true; + //mod_SearchProvCelle1.doSearch(); mod_SearchProvParticolari1.Visible = true; mod_SearchProvParticolari1.doSearch(); //Mod_SearchProvImballi1.Visible = true; diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index 1e484191..f78d75f4 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -85,15 +85,6 @@ namespace GMW.WebUserControls { /// protected global::GMW.WebUserControls.mod_SearchProvUDC mod_SearchProvUDC1; - /// - /// mod_SearchProvCelle1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.mod_SearchProvCelle mod_SearchProvCelle1; - /// /// pnlEmpty control. /// diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index d24835bc..c62e39e7 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 552319ec..f68ee9cd 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 5dab119e..7cb0786b 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/images/lista_01-PreFus_l.png b/GMW/GMW/images/lista_01-PreFus_l.png new file mode 100644 index 00000000..2070ee1d Binary files /dev/null and b/GMW/GMW/images/lista_01-PreFus_l.png differ diff --git a/GMW/GMW/images/lista_01-PreFus_m.png b/GMW/GMW/images/lista_01-PreFus_m.png new file mode 100644 index 00000000..e06cf998 Binary files /dev/null and b/GMW/GMW/images/lista_01-PreFus_m.png differ diff --git a/GMW/GMW/images/lista_01-PreFus_s.png b/GMW/GMW/images/lista_01-PreFus_s.png new file mode 100644 index 00000000..db7156af Binary files /dev/null and b/GMW/GMW/images/lista_01-PreFus_s.png differ diff --git a/GMW/GMW/images/lista_02-TerFus_l.png b/GMW/GMW/images/lista_02-TerFus_l.png new file mode 100644 index 00000000..4e767ead Binary files /dev/null and b/GMW/GMW/images/lista_02-TerFus_l.png differ diff --git a/GMW/GMW/images/lista_02-TerFus_m.png b/GMW/GMW/images/lista_02-TerFus_m.png new file mode 100644 index 00000000..6f04a5af Binary files /dev/null and b/GMW/GMW/images/lista_02-TerFus_m.png differ diff --git a/GMW/GMW/images/lista_02-TerFus_s.png b/GMW/GMW/images/lista_02-TerFus_s.png new file mode 100644 index 00000000..2087829a Binary files /dev/null and b/GMW/GMW/images/lista_02-TerFus_s.png differ diff --git a/GMW/GMW/images/lista_03-TerWip_l.png b/GMW/GMW/images/lista_03-TerWip_l.png new file mode 100644 index 00000000..b9bb07fa Binary files /dev/null and b/GMW/GMW/images/lista_03-TerWip_l.png differ diff --git a/GMW/GMW/images/lista_03-TerWip_m.png b/GMW/GMW/images/lista_03-TerWip_m.png new file mode 100644 index 00000000..1bd5552a Binary files /dev/null and b/GMW/GMW/images/lista_03-TerWip_m.png differ diff --git a/GMW/GMW/images/lista_03-TerWip_s.png b/GMW/GMW/images/lista_03-TerWip_s.png new file mode 100644 index 00000000..bdd2e144 Binary files /dev/null and b/GMW/GMW/images/lista_03-TerWip_s.png differ diff --git a/GMW/GMW/images/lista_04-PreCli_l.png b/GMW/GMW/images/lista_04-PreCli_l.png new file mode 100644 index 00000000..e003351c Binary files /dev/null and b/GMW/GMW/images/lista_04-PreCli_l.png differ diff --git a/GMW/GMW/images/lista_04-PreCli_m.png b/GMW/GMW/images/lista_04-PreCli_m.png new file mode 100644 index 00000000..9f02b002 Binary files /dev/null and b/GMW/GMW/images/lista_04-PreCli_m.png differ diff --git a/GMW/GMW/images/lista_04-PreCli_s.png b/GMW/GMW/images/lista_04-PreCli_s.png new file mode 100644 index 00000000..a92d6668 Binary files /dev/null and b/GMW/GMW/images/lista_04-PreCli_s.png differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index cbee258d..17c2adf7 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 d24835bc..c62e39e7 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 d50ae51c..15a682ef 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 0264f00d..8947804a 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 0b439b94..047bd3b0 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_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 49c3631a..bddbc083 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -18846,6 +18846,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co 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("@Anno", 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("@Mese", 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("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, 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("@IdxPosizione", 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("@CodCS", global::System.Data.SqlDbType.NChar, 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("@CodCliente", global::System.Data.SqlDbType.NVarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18937,7 +18938,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co [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.ElencoListePrelievoDataTable InsertQuery(string Anno, string Mese, global::System.Nullable IdxPosizione, string CodCS, string CodCliente, string RagSociale, string CodSoggetto, string Particolare, string DescParticolare, string DisegnoGrezzo, string Esponente, string Figura, string CodImballo, global::System.Nullable QtaTot) { + public virtual DS_magazzino.ElencoListePrelievoDataTable InsertQuery(string Anno, string Mese, string CodTipoLista, global::System.Nullable IdxPosizione, string CodCS, string CodCliente, string RagSociale, string CodSoggetto, string Particolare, string DescParticolare, string DisegnoGrezzo, string Esponente, string Figura, string CodImballo, global::System.Nullable QtaTot) { this.Adapter.SelectCommand = this.CommandCollection[4]; if ((Anno == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18951,77 +18952,83 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Mese)); } - if ((IdxPosizione.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((int)(IdxPosizione.Value)); - } - else { + if ((CodTipoLista == null)) { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((CodCS == null)) { - this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodTipoLista)); + } + if ((IdxPosizione.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((int)(IdxPosizione.Value)); } else { - this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodCS)); + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } - if ((CodCliente == null)) { + if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCliente)); + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCS)); } - if ((RagSociale == null)) { + if ((CodCliente == null)) { this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[6].Value = ((string)(RagSociale)); + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodCliente)); } - if ((CodSoggetto == null)) { + if ((RagSociale == null)) { this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[7].Value = ((string)(CodSoggetto)); + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(RagSociale)); } - if ((Particolare == null)) { + if ((CodSoggetto == null)) { this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[8].Value = ((string)(Particolare)); + this.Adapter.SelectCommand.Parameters[8].Value = ((string)(CodSoggetto)); } - if ((DescParticolare == null)) { + if ((Particolare == null)) { this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[9].Value = ((string)(DescParticolare)); + this.Adapter.SelectCommand.Parameters[9].Value = ((string)(Particolare)); } - if ((DisegnoGrezzo == null)) { + if ((DescParticolare == null)) { this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[10].Value = ((string)(DisegnoGrezzo)); + this.Adapter.SelectCommand.Parameters[10].Value = ((string)(DescParticolare)); } - if ((Esponente == null)) { + if ((DisegnoGrezzo == null)) { this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[11].Value = ((string)(Esponente)); + this.Adapter.SelectCommand.Parameters[11].Value = ((string)(DisegnoGrezzo)); } - if ((Figura == null)) { + if ((Esponente == null)) { this.Adapter.SelectCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[12].Value = ((string)(Figura)); + this.Adapter.SelectCommand.Parameters[12].Value = ((string)(Esponente)); } - if ((CodImballo == null)) { + if ((Figura == null)) { this.Adapter.SelectCommand.Parameters[13].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[13].Value = ((string)(CodImballo)); + this.Adapter.SelectCommand.Parameters[13].Value = ((string)(Figura)); } - if ((QtaTot.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[14].Value = ((decimal)(QtaTot.Value)); + if ((CodImballo == null)) { + this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[14].Value = ((string)(CodImballo)); + } + if ((QtaTot.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[15].Value = ((decimal)(QtaTot.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[15].Value = global::System.DBNull.Value; } DS_magazzino.ElencoListePrelievoDataTable dataTable = new DS_magazzino.ElencoListePrelievoDataTable(); this.Adapter.Fill(dataTable); diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index a93c87ff..3e0afdfb 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1741,6 +1741,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co + @@ -1899,273 +1900,127 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2180,17 +2035,17 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - - - - - - - + + + + + + + - + @@ -2200,14 +2055,271 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2221,101 +2333,307 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - + + + + + + + + + + - + - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2332,338 +2650,21 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index a4794f6c..c8cb5225 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,23 +4,23 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - + - + diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index f4c68e9f..387a6c0b 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -152,6 +152,11 @@ + + + + + @@ -62,7 +62,6 @@ -