diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 9c9749d7..cb2fbde8 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -848,6 +848,12 @@ + + + + + + diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index c01037fe..86812de5 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -496,6 +496,7 @@ namespace GMW.WebUserControls mod_viewRigheListaPrelievo1.Visible = false; } +#if false /// /// nasconde il modulo al cambiare dello stato checkbox /// @@ -517,7 +518,8 @@ namespace GMW.WebUserControls mod_viewRigheListaPrelievo1.Visible = false; grView.SelectedIndex = -1; grView.DataBind(); - } + } +#endif /// /// salvo in session che il prox comando è iniziare attivare prelievo... @@ -640,7 +642,9 @@ namespace GMW.WebUserControls { checkFixOds(); } - + /// + /// ssitema visualizzazione dal filtraggi + /// private void checkFixOds() { ods.FilterParameters.Clear(); diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx index 07dd4fe0..dbadda8d 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx @@ -59,13 +59,13 @@ diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 1d43eebb..de0098c1 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 88c9fde7..c17d8a5e 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/images/ArrowDownRed_l.png b/GMW/GMW/images/ArrowDownRed_l.png new file mode 100644 index 00000000..c7ee0a67 Binary files /dev/null and b/GMW/GMW/images/ArrowDownRed_l.png differ diff --git a/GMW/GMW/images/ArrowDownRed_m.png b/GMW/GMW/images/ArrowDownRed_m.png new file mode 100644 index 00000000..6946ea21 Binary files /dev/null and b/GMW/GMW/images/ArrowDownRed_m.png differ diff --git a/GMW/GMW/images/ArrowDownRed_s.png b/GMW/GMW/images/ArrowDownRed_s.png new file mode 100644 index 00000000..1973ace5 Binary files /dev/null and b/GMW/GMW/images/ArrowDownRed_s.png differ diff --git a/GMW/GMW/images/ArrowUpGreen_l.png b/GMW/GMW/images/ArrowUpGreen_l.png new file mode 100644 index 00000000..7c9a815b Binary files /dev/null and b/GMW/GMW/images/ArrowUpGreen_l.png differ diff --git a/GMW/GMW/images/ArrowUpGreen_m.png b/GMW/GMW/images/ArrowUpGreen_m.png new file mode 100644 index 00000000..c6a17c17 Binary files /dev/null and b/GMW/GMW/images/ArrowUpGreen_m.png differ diff --git a/GMW/GMW/images/ArrowUpGreen_s.png b/GMW/GMW/images/ArrowUpGreen_s.png new file mode 100644 index 00000000..1d5c6aaf Binary files /dev/null and b/GMW/GMW/images/ArrowUpGreen_s.png differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 1d43eebb..470f08c2 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 eb0fbd24..3810472b 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 aaa9411d..de0098c1 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 6869aa78..0d3033a9 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_SM.Designer.cs b/GMW/GMW_data/DS_SM.Designer.cs index 153e2d25..517346e3 100644 --- a/GMW/GMW_data/DS_SM.Designer.cs +++ b/GMW/GMW_data/DS_SM.Designer.cs @@ -3098,11 +3098,18 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo FROM TabTranPosizEventi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodEvento, IdxPosizione, IdxPosizioneTo FROM dbo.TabTranPosizEventi"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_TTPE_getByCodEventoPosizione"; + 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("@CodEvento", global::System.Data.SqlDbType.NVarChar, 10, 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("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3127,6 +3134,28 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo FROM TabTranPosizEventi WHERE (Co 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_SM.TabTranPosizEventiDataTable getByEventoPosizione(string CodEvento, global::System.Nullable IdxPosizione) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((CodEvento == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodEvento)); + } + if ((IdxPosizione.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(IdxPosizione.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + DS_SM.TabTranPosizEventiDataTable dataTable = new DS_SM.TabTranPosizEventiDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(DS_SM.TabTranPosizEventiDataTable dataTable) { diff --git a/GMW/GMW_data/DS_SM.xsd b/GMW/GMW_data/DS_SM.xsd index 2b900eb8..f9ac3ff1 100644 --- a/GMW/GMW_data/DS_SM.xsd +++ b/GMW/GMW_data/DS_SM.xsd @@ -168,7 +168,20 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo FROM TabTranPosizEventi WHERE (Co - + + + + + dbo.stp_TTPE_getByCodEventoPosizione + + + + + + + + + @@ -282,28 +295,28 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + - + - + - - + + @@ -313,17 +326,17 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + - + @@ -333,26 +346,26 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + - - + + - + - - + + @@ -362,24 +375,24 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + - + - + diff --git a/GMW/GMW_data/DS_SM.xss b/GMW/GMW_data/DS_SM.xss index f08bff57..2fed0d2a 100644 --- a/GMW/GMW_data/DS_SM.xss +++ b/GMW/GMW_data/DS_SM.xss @@ -8,7 +8,7 @@ - + diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 0b534d0e..e143b0ff 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -5230,11 +5230,9 @@ namespace GMW_data { private global::System.Data.DataColumn columnDescrLista; - private global::System.Data.DataColumn columnIdxPosizione; - private global::System.Data.DataColumn columnCodCella; - private global::System.Data.DataColumn columnIdxPosizioneFinal; + private global::System.Data.DataColumn columnCodEvento; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public TipoListaPrelievoDataTable() { @@ -5280,13 +5278,6 @@ namespace GMW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Data.DataColumn IdxPosizioneColumn { - get { - return this.columnIdxPosizione; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public global::System.Data.DataColumn CodCellaColumn { get { @@ -5295,9 +5286,9 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Data.DataColumn IdxPosizioneFinalColumn { + public global::System.Data.DataColumn CodEventoColumn { get { - return this.columnIdxPosizioneFinal; + return this.columnCodEvento; } } @@ -5330,14 +5321,13 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public TipoListaPrelievoRow AddTipoListaPrelievoRow(string CodTipoLista, string DescrLista, int IdxPosizione, string CodCella, int IdxPosizioneFinal) { + public TipoListaPrelievoRow AddTipoListaPrelievoRow(string CodTipoLista, string DescrLista, string CodCella, string CodEvento) { TipoListaPrelievoRow rowTipoListaPrelievoRow = ((TipoListaPrelievoRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodTipoLista, DescrLista, - IdxPosizione, CodCella, - IdxPosizioneFinal}; + CodEvento}; rowTipoListaPrelievoRow.ItemArray = columnValuesArray; this.Rows.Add(rowTipoListaPrelievoRow); return rowTipoListaPrelievoRow; @@ -5365,9 +5355,8 @@ namespace GMW_data { internal void InitVars() { this.columnCodTipoLista = base.Columns["CodTipoLista"]; this.columnDescrLista = base.Columns["DescrLista"]; - this.columnIdxPosizione = base.Columns["IdxPosizione"]; this.columnCodCella = base.Columns["CodCella"]; - this.columnIdxPosizioneFinal = base.Columns["IdxPosizioneFinal"]; + this.columnCodEvento = base.Columns["CodEvento"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5376,12 +5365,10 @@ namespace GMW_data { base.Columns.Add(this.columnCodTipoLista); this.columnDescrLista = new global::System.Data.DataColumn("DescrLista", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescrLista); - this.columnIdxPosizione = new global::System.Data.DataColumn("IdxPosizione", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnIdxPosizione); this.columnCodCella = new global::System.Data.DataColumn("CodCella", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodCella); - this.columnIdxPosizioneFinal = new global::System.Data.DataColumn("IdxPosizioneFinal", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnIdxPosizioneFinal); + this.columnCodEvento = new global::System.Data.DataColumn("CodEvento", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodEvento); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodTipoLista}, true)); this.columnCodTipoLista.AllowDBNull = false; @@ -5390,6 +5377,8 @@ namespace GMW_data { this.columnDescrLista.MaxLength = 250; this.columnCodCella.AllowDBNull = false; this.columnCodCella.MaxLength = 50; + this.columnCodEvento.AllowDBNull = false; + this.columnCodEvento.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9938,21 +9927,6 @@ namespace GMW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public int IdxPosizione { - get { - try { - return ((int)(this[this.tableTipoListaPrelievo.IdxPosizioneColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'IdxPosizione\' in table \'TipoListaPrelievo\' is DBNull.", e); - } - } - set { - this[this.tableTipoListaPrelievo.IdxPosizioneColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string CodCella { get { @@ -9964,17 +9938,12 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public int IdxPosizioneFinal { + public string CodEvento { get { - try { - return ((int)(this[this.tableTipoListaPrelievo.IdxPosizioneFinalColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'IdxPosizioneFinal\' in table \'TipoListaPrelievo\' is DBNull.", e); - } + return ((string)(this[this.tableTipoListaPrelievo.CodEventoColumn])); } set { - this[this.tableTipoListaPrelievo.IdxPosizioneFinalColumn] = value; + this[this.tableTipoListaPrelievo.CodEventoColumn] = value; } } @@ -9988,26 +9957,6 @@ namespace GMW_data { this[this.tableTipoListaPrelievo.DescrListaColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public bool IsIdxPosizioneNull() { - return this.IsNull(this.tableTipoListaPrelievo.IdxPosizioneColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public void SetIdxPosizioneNull() { - this[this.tableTipoListaPrelievo.IdxPosizioneColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public bool IsIdxPosizioneFinalNull() { - return this.IsNull(this.tableTipoListaPrelievo.IdxPosizioneFinalColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public void SetIdxPosizioneFinalNull() { - this[this.tableTipoListaPrelievo.IdxPosizioneFinalColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public ElencoListePrelievoRow[] _GetElencoListePrelievoRows() { if ((this.Table.ChildRelations["FK_ElencoListePrelievo_TipoListaPrelievo11"] == null)) { @@ -18257,50 +18206,41 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co tableMapping.DataSetTable = "TipoListaPrelievo"; tableMapping.ColumnMappings.Add("CodTipoLista", "CodTipoLista"); tableMapping.ColumnMappings.Add("DescrLista", "DescrLista"); - tableMapping.ColumnMappings.Add("IdxPosizione", "IdxPosizione"); tableMapping.ColumnMappings.Add("CodCella", "CodCella"); - tableMapping.ColumnMappings.Add("IdxPosizioneFinal", "IdxPosizioneFinal"); + tableMapping.ColumnMappings.Add("CodEvento", "CodEvento"); 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].[TipoListaPrelievo] WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ((@IsNull_IdxPosizione = 1 AND [IdxPosizione] IS NULL) OR ([IdxPosizione] = @Original_IdxPosizione)) AND ([CodCella] = @Original_CodCella) AND ((@IsNull_IdxPosizioneFinal = 1 AND [IdxPosizioneFinal] IS NULL) OR ([IdxPosizioneFinal] = @Original_IdxPosizioneFinal)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[TipoListaPrelievo] WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ([CodCella] = @Original_CodCella) AND ([CodEvento] = @Original_CodEvento))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodTipoLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoLista", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescrLista", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrLista", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrLista", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodCella", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCella", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxPosizioneFinal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneFinal", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizioneFinal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneFinal", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", 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].[TipoListaPrelievo] ([CodTipoLista], [DescrLista], [IdxPosizione], [CodCella], [IdxPosizioneFinal]) VALUES (@CodTipoLista, @DescrLista, @IdxPosizione, @CodCella, @IdxPosizioneFinal); -SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[TipoListaPrelievo] ([CodTipoLista], [DescrLista], [CodCella], [CodEvento]) VALUES (@CodTipoLista, @DescrLista, @CodCella, @CodEvento); +SELECT CodTipoLista, DescrLista, CodCella, CodEvento FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoLista", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrLista", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCella", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizioneFinal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneFinal", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", 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].[TipoListaPrelievo] SET [CodTipoLista] = @CodTipoLista, [DescrLista] = @DescrLista, [IdxPosizione] = @IdxPosizione, [CodCella] = @CodCella, [IdxPosizioneFinal] = @IdxPosizioneFinal WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ((@IsNull_IdxPosizione = 1 AND [IdxPosizione] IS NULL) OR ([IdxPosizione] = @Original_IdxPosizione)) AND ([CodCella] = @Original_CodCella) AND ((@IsNull_IdxPosizioneFinal = 1 AND [IdxPosizioneFinal] IS NULL) OR ([IdxPosizioneFinal] = @Original_IdxPosizioneFinal))); -SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[TipoListaPrelievo] SET [CodTipoLista] = @CodTipoLista, [DescrLista] = @DescrLista, [CodCella] = @CodCella, [CodEvento] = @CodEvento WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ([CodCella] = @Original_CodCella) AND ([CodEvento] = @Original_CodEvento)); +SELECT CodTipoLista, DescrLista, CodCella, CodEvento FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoLista", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrLista", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCella", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizioneFinal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneFinal", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodTipoLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoLista", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DescrLista", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrLista", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrLista", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrLista", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodCella", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCella", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxPosizioneFinal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneFinal", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizioneFinal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneFinal", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18314,7 +18254,7 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM dbo.TipoListaPrelievo"; + this._commandCollection[0].CommandText = "SELECT CodTipoLista, DescrLista, CodCella, CodEvento FROM TipoListaPrelievo"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -18390,7 +18330,7 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(string Original_CodTipoLista, string Original_DescrLista, global::System.Nullable Original_IdxPosizione, string Original_CodCella, global::System.Nullable Original_IdxPosizioneFinal) { + public virtual int Delete(string Original_CodTipoLista, string Original_DescrLista, string Original_CodCella, string Original_CodEvento) { if ((Original_CodTipoLista == null)) { throw new global::System.ArgumentNullException("Original_CodTipoLista"); } @@ -18405,27 +18345,17 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_DescrLista)); } - if ((Original_IdxPosizione.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((int)(Original_IdxPosizione.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; - } if ((Original_CodCella == null)) { throw new global::System.ArgumentNullException("Original_CodCella"); } else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_CodCella)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_CodCella)); } - if ((Original_IdxPosizioneFinal.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[7].Value = ((int)(Original_IdxPosizioneFinal.Value)); + if ((Original_CodEvento == null)) { + throw new global::System.ArgumentNullException("Original_CodEvento"); } else { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[7].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_CodEvento)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -18446,7 +18376,7 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string CodTipoLista, string DescrLista, global::System.Nullable IdxPosizione, string CodCella, global::System.Nullable IdxPosizioneFinal) { + public virtual int Insert(string CodTipoLista, string DescrLista, string CodCella, string CodEvento) { if ((CodTipoLista == null)) { throw new global::System.ArgumentNullException("CodTipoLista"); } @@ -18459,23 +18389,17 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM else { this.Adapter.InsertCommand.Parameters[1].Value = ((string)(DescrLista)); } - if ((IdxPosizione.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[2].Value = ((int)(IdxPosizione.Value)); - } - else { - this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; - } if ((CodCella == null)) { throw new global::System.ArgumentNullException("CodCella"); } else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(CodCella)); + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(CodCella)); } - if ((IdxPosizioneFinal.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[4].Value = ((int)(IdxPosizioneFinal.Value)); + if ((CodEvento == null)) { + throw new global::System.ArgumentNullException("CodEvento"); } else { - this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(CodEvento)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -18496,7 +18420,7 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string CodTipoLista, string DescrLista, global::System.Nullable IdxPosizione, string CodCella, global::System.Nullable IdxPosizioneFinal, string Original_CodTipoLista, string Original_DescrLista, global::System.Nullable Original_IdxPosizione, string Original_CodCella, global::System.Nullable Original_IdxPosizioneFinal) { + public virtual int Update(string CodTipoLista, string DescrLista, string CodCella, string CodEvento, string Original_CodTipoLista, string Original_DescrLista, string Original_CodCella, string Original_CodEvento) { if ((CodTipoLista == null)) { throw new global::System.ArgumentNullException("CodTipoLista"); } @@ -18509,59 +18433,43 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM else { this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(DescrLista)); } - if ((IdxPosizione.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(IdxPosizione.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; - } if ((CodCella == null)) { throw new global::System.ArgumentNullException("CodCella"); } else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(CodCella)); + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(CodCella)); } - if ((IdxPosizioneFinal.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[4].Value = ((int)(IdxPosizioneFinal.Value)); + if ((CodEvento == null)) { + throw new global::System.ArgumentNullException("CodEvento"); } else { - this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(CodEvento)); } if ((Original_CodTipoLista == null)) { throw new global::System.ArgumentNullException("Original_CodTipoLista"); } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_CodTipoLista)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_CodTipoLista)); } if ((Original_DescrLista == null)) { - this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_DescrLista)); - } - if ((Original_IdxPosizione.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_IdxPosizione.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_DescrLista)); } if ((Original_CodCella == null)) { throw new global::System.ArgumentNullException("Original_CodCella"); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_CodCella)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_CodCella)); } - if ((Original_IdxPosizioneFinal.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_IdxPosizioneFinal.Value)); + if ((Original_CodEvento == null)) { + throw new global::System.ArgumentNullException("Original_CodEvento"); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_CodEvento)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -18582,8 +18490,8 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string DescrLista, global::System.Nullable IdxPosizione, string CodCella, global::System.Nullable IdxPosizioneFinal, string Original_CodTipoLista, string Original_DescrLista, global::System.Nullable Original_IdxPosizione, string Original_CodCella, global::System.Nullable Original_IdxPosizioneFinal) { - return this.Update(Original_CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal, Original_CodTipoLista, Original_DescrLista, Original_IdxPosizione, Original_CodCella, Original_IdxPosizioneFinal); + public virtual int Update(string DescrLista, string CodCella, string CodEvento, string Original_CodTipoLista, string Original_DescrLista, string Original_CodCella, string Original_CodEvento) { + return this.Update(Original_CodTipoLista, DescrLista, CodCella, CodEvento, Original_CodTipoLista, Original_DescrLista, Original_CodCella, Original_CodEvento); } } @@ -19295,7 +19203,6 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co 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, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RagSociale", global::System.Data.SqlDbType.NVarChar, 35, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -19386,7 +19293,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, 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) { + public virtual DS_magazzino.ElencoListePrelievoDataTable InsertQuery(string Anno, string Mese, string CodTipoLista, 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; @@ -19406,77 +19313,71 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodTipoLista)); } - if ((IdxPosizione.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[4].Value = ((int)(IdxPosizione.Value)); - } - else { + if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } - if ((CodCS == null)) { + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodCS)); + } + if ((CodCliente == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCS)); + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCliente)); } - if ((CodCliente == null)) { + if ((RagSociale == null)) { this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodCliente)); + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(RagSociale)); } - if ((RagSociale == null)) { + if ((CodSoggetto == null)) { this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[7].Value = ((string)(RagSociale)); + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(CodSoggetto)); } - if ((CodSoggetto == null)) { + if ((Particolare == null)) { this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[8].Value = ((string)(CodSoggetto)); + this.Adapter.SelectCommand.Parameters[8].Value = ((string)(Particolare)); } - if ((Particolare == null)) { + if ((DescParticolare == null)) { this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[9].Value = ((string)(Particolare)); + this.Adapter.SelectCommand.Parameters[9].Value = ((string)(DescParticolare)); } - if ((DescParticolare == null)) { + if ((DisegnoGrezzo == null)) { this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[10].Value = ((string)(DescParticolare)); + this.Adapter.SelectCommand.Parameters[10].Value = ((string)(DisegnoGrezzo)); } - if ((DisegnoGrezzo == null)) { + if ((Esponente == null)) { this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[11].Value = ((string)(DisegnoGrezzo)); + this.Adapter.SelectCommand.Parameters[11].Value = ((string)(Esponente)); } - if ((Esponente == null)) { + if ((Figura == null)) { this.Adapter.SelectCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[12].Value = ((string)(Esponente)); + this.Adapter.SelectCommand.Parameters[12].Value = ((string)(Figura)); } - if ((Figura == null)) { + if ((CodImballo == null)) { this.Adapter.SelectCommand.Parameters[13].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[13].Value = ((string)(Figura)); - } - if ((CodImballo == null)) { - this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.SelectCommand.Parameters[14].Value = ((string)(CodImballo)); + this.Adapter.SelectCommand.Parameters[13].Value = ((string)(CodImballo)); } if ((QtaTot.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[15].Value = ((decimal)(QtaTot.Value)); + this.Adapter.SelectCommand.Parameters[14].Value = ((decimal)(QtaTot.Value)); } else { - this.Adapter.SelectCommand.Parameters[15].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[14].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 431887d7..2824f5b1 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1492,56 +1492,48 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co - DELETE FROM [dbo].[TipoListaPrelievo] WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ((@IsNull_IdxPosizione = 1 AND [IdxPosizione] IS NULL) OR ([IdxPosizione] = @Original_IdxPosizione)) AND ([CodCella] = @Original_CodCella) AND ((@IsNull_IdxPosizioneFinal = 1 AND [IdxPosizioneFinal] IS NULL) OR ([IdxPosizioneFinal] = @Original_IdxPosizioneFinal))) + DELETE FROM [dbo].[TipoListaPrelievo] WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ([CodCella] = @Original_CodCella) AND ([CodEvento] = @Original_CodEvento)) - - - - + - INSERT INTO [dbo].[TipoListaPrelievo] ([CodTipoLista], [DescrLista], [IdxPosizione], [CodCella], [IdxPosizioneFinal]) VALUES (@CodTipoLista, @DescrLista, @IdxPosizione, @CodCella, @IdxPosizioneFinal); -SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista) + INSERT INTO [dbo].[TipoListaPrelievo] ([CodTipoLista], [DescrLista], [CodCella], [CodEvento]) VALUES (@CodTipoLista, @DescrLista, @CodCella, @CodEvento); +SELECT CodTipoLista, DescrLista, CodCella, CodEvento FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista) - - + - SELECT * FROM dbo.TipoListaPrelievo + SELECT CodTipoLista, DescrLista, CodCella, CodEvento FROM TipoListaPrelievo - UPDATE [dbo].[TipoListaPrelievo] SET [CodTipoLista] = @CodTipoLista, [DescrLista] = @DescrLista, [IdxPosizione] = @IdxPosizione, [CodCella] = @CodCella, [IdxPosizioneFinal] = @IdxPosizioneFinal WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ((@IsNull_IdxPosizione = 1 AND [IdxPosizione] IS NULL) OR ([IdxPosizione] = @Original_IdxPosizione)) AND ([CodCella] = @Original_CodCella) AND ((@IsNull_IdxPosizioneFinal = 1 AND [IdxPosizioneFinal] IS NULL) OR ([IdxPosizioneFinal] = @Original_IdxPosizioneFinal))); -SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista) + UPDATE [dbo].[TipoListaPrelievo] SET [CodTipoLista] = @CodTipoLista, [DescrLista] = @DescrLista, [CodCella] = @CodCella, [CodEvento] = @CodEvento WHERE (([CodTipoLista] = @Original_CodTipoLista) AND ((@IsNull_DescrLista = 1 AND [DescrLista] IS NULL) OR ([DescrLista] = @Original_DescrLista)) AND ([CodCella] = @Original_CodCella) AND ([CodEvento] = @Original_CodEvento)); +SELECT CodTipoLista, DescrLista, CodCella, CodEvento FROM TipoListaPrelievo WHERE (CodTipoLista = @CodTipoLista) - - + - - - - + @@ -1550,9 +1542,8 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella, IdxPosizioneFinal FROM - - + @@ -1766,7 +1757,6 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - @@ -2531,7 +2521,6 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - @@ -2539,7 +2528,13 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + + + + + + + @@ -2748,7 +2743,7 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 9c93584a..6130c8a8 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,26 +4,26 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - + - + - + @@ -125,16 +125,16 @@ - 724 - 996 + 735 + 981 693 - 996 + 981 - + 392 diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 537a8c60..0a44008d 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -341,7 +341,7 @@ namespace GMW_data } catch (Exception e) { - logger.lg.scriviLog(string.Format("Non sono riuscito a recuperare il codice soggetto per l'utente loggato: {0}, errore {1}{2}", user_std.UtSn.userNameAD,Environment.NewLine, e), tipoLog.ERROR); + logger.lg.scriviLog(string.Format("Non sono riuscito a recuperare il codice soggetto per l'utente loggato: {0}, errore {1}{2}", user_std.UtSn.userNameAD, Environment.NewLine, e), tipoLog.ERROR); } return codSoggetto; } @@ -413,7 +413,7 @@ namespace GMW_data { } return answ; } - + #endregion @@ -458,16 +458,6 @@ namespace GMW_data // variabile di tipo datetime per data corrente DateTime adesso = DateTime.Now; - - // dati che mi servono... - int idxPosizione = 0; - try - { - idxPosizione = magazzino.taTipoListaPrelievo.getByCodTipoLista(TipoListaPrelievo)[0].IdxPosizione; - } - catch - { } - // non la valorizzo qui ma calcolo ... se non fa verificare string RagioneSociale = ""; @@ -514,7 +504,7 @@ namespace GMW_data try { // eseguo soltanto la query (meglio con try catch così se non c'è non dà errore...) - DS_magazzino.ElencoListePrelievoDataTable tabellaElencoListe = taElencoListePrelievo.InsertQuery(string.Format("{0:yy}", adesso), string.Format("{0:MM}", adesso), TipoListaPrelievo, idxPosizione, memLayer.ML.confReadString("CodCS"), codCliente, RagioneSociale, codSoggetto, Particolare, descParticolare, disegnoGrezzo, Esponente, Figura, CodImballo, QtaTot); + DS_magazzino.ElencoListePrelievoDataTable tabellaElencoListe = taElencoListePrelievo.InsertQuery(string.Format("{0:yy}", adesso), string.Format("{0:MM}", adesso), TipoListaPrelievo, memLayer.ML.confReadString("CodCS"), codCliente, RagioneSociale, codSoggetto, Particolare, descParticolare, disegnoGrezzo, Esponente, Figura, CodImballo, QtaTot); // ricavo prima (e unica) riga dalla select DS_magazzino.ElencoListePrelievoRow rigaElencoListe = tabellaElencoListe[0]; @@ -529,8 +519,6 @@ namespace GMW_data if (codListaAttuale != "") { answ = codListaAttuale; - // stored per ricavare il più vecchio in ordine ASC per Data Fusione - TABELLA - //DS_magazzino.ElencoCartelliniDataTable tabellaElencoCartellini = taElencoCartellini.getOlderUDC(Esponente, Particolare, idxPosizione); DS_magazzino.ElencoCartelliniDataTable tabellaElencoCartellini = taElencoCartellini.getUdcUnusedOlder(codListaAttuale); allocaRigheListaPrelievo(QtaTot, codListaAttuale, tabellaElencoCartellini); } @@ -634,7 +622,6 @@ namespace GMW_data { // da chiamare quando clicco e inizio lista prelievo .... vedi sopra esitoOperazione answ = esitoOperazione.errore; - try { // la query recupera la lista in base al CodLista @@ -662,16 +649,24 @@ namespace GMW_data string codCellaDestAttuale = rigaTipoLista.CodCella; // lo trasformo x avere la cella di destinazione... int idxCellaTo = taCelle.getByCodCella(codCellaDestAttuale)[0].IdxCella; - + int idxCellaFrom = 0; // sposto ("metto a terra") gli UDC foreach (DS_magazzino.RigheListePrelievoRow row in tabellaRigheListaPrelievo.Rows) { // ricavo il codice UDC... string UDC = row.UDC; - // mi serve per posizione udc corrente - DS_magazzino.PosizioneUdcCorrenteRow rigaUdcCorrente = taPosUdcCorr.getByUDC(UDC)[0]; - // il secondo idx che mi serve - int idxCellaFrom = rigaUdcCorrente.IdxCella; + // ora la posizioen + try + { + // mi serve per posizione udc corrente + DS_magazzino.PosizioneUdcCorrenteRow rigaUdcCorrente = taPosUdcCorr.getByUDC(UDC)[0]; + // il secondo idx che mi serve + idxCellaFrom = rigaUdcCorrente.IdxCella; + } + catch + { + idxCellaFrom = 0; + } // sposto UDC spostaUDC(CodCS, UDC, idxCellaFrom, idxCellaTo); } @@ -747,8 +742,11 @@ namespace GMW_data DS_magazzino.RigheListePrelievoRow rigaListaPrelievo = tabellaRigheListaPrelievo[0]; // leggo il codice della cella... - int idxPosizUdc = rigaTipoLista.IdxPosizioneFinal; - + string CodEvento = rigaTipoLista.CodEvento; + // posizione corrente dell'UDC + int idxPosizUdcCorr = 0; + // posizioen di destinazione per UDC corrente + int idxPosizUdcDest = 0; // scarico i vari UDC dal magazzino (come posizione corrente) foreach (DS_magazzino.RigheListePrelievoRow row in tabellaRigheListaPrelievo.Rows) { @@ -758,8 +756,11 @@ namespace GMW_data DS_magazzino.PosizioneUdcCorrenteRow rigaUdcCorrente = taPosUdcCorr.getByUDC(UDC)[0]; // il secondo idx che mi serve int idxCellaFrom = rigaUdcCorrente.IdxCella; + // calcolo posizione destinazione da state machine... + idxPosizUdcCorr = taElencoCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione; + idxPosizUdcDest = StateMachine.SM.getIdxPostizioneTo(CodEvento, idxPosizUdcCorr); // sposto UDC - scaricaUDC(CodCS, UDC, idxCellaFrom, idxPosizUdc); + scaricaUDC(CodCS, UDC, idxCellaFrom, idxPosizUdcDest); } // segna come scaricata la lista prelievo taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.scaricata); @@ -884,7 +885,7 @@ namespace GMW_data #endregion - + #endregion } } diff --git a/GMW/GMW_data/StateMachine.cs b/GMW/GMW_data/StateMachine.cs index 4e28c74a..299c054f 100644 --- a/GMW/GMW_data/StateMachine.cs +++ b/GMW/GMW_data/StateMachine.cs @@ -11,8 +11,32 @@ namespace GMW_data /// public class StateMachine { + #region area table adapters + + public DS_SMTableAdapters.TabTranPosizEventiTableAdapter taTTPE; + + /// + /// init dei table adapters + /// + protected void initTA() + { + taTTPE = new GMW_data.DS_SMTableAdapters.TabTranPosizEventiTableAdapter(); + } + /// + /// effettua setup dei connection strings da web.config delal singola applicazione + /// + protected virtual void setupConnectionStringBase() + { + // connections del db + taTTPE.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); + } + + #endregion + protected StateMachine() { + initTA(); + setupConnectionStringBase(); } /// @@ -32,6 +56,24 @@ namespace GMW_data logger.lg.scriviLog(string.Format("Non sono riuscito a fare la delibera di tipo {0} per l'UDC {1} da parte dell'user {2}, messaggio d'errore {3}{4}", CodTipoDelibera, UDC, user_std.UtSn.userNameAD, Environment.NewLine, e), SteamWare.tipoLog.ERROR); } } + /// + /// calcola dalla tabella di transizioni la nuova posizioen associata all'evento ed alla posizione attuale + /// + /// + /// + /// + public int getIdxPostizioneTo(string CodEvento, int idxPosizione) + { + int answ = 0; + try + { + answ = taTTPE.getByEventoPosizione(CodEvento, idxPosizione)[0].IdxPosizioneTo; + } + catch + { } + return answ; + } + /// /// Singleton accesos a state machine /// diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 88c9fde7..1f9fc310 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index 0f93878d..c17d8a5e 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 88c9fde7..1f9fc310 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_SM.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_SM.Designer.cs.dll index 34a0ff63..35b716ec 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_SM.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_SM.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index 58c612ce..d0c7c983 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 0f93878d..c17d8a5e 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 5b110569..83475d33 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll index bf4dc5eb..17674786 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll differ diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index a871d5c8..37d5d72d 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ