diff --git a/GMW/GMW/WS/AutoCompletamento.asmx.cs b/GMW/GMW/WS/AutoCompletamento.asmx.cs index c0346ae0..181841b5 100644 --- a/GMW/GMW/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW/WS/AutoCompletamento.asmx.cs @@ -25,7 +25,7 @@ namespace GMW.WS // inizializzo risposta List suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... - if (count > memLayer.ML.confReadInt("MinCharAutocomplete")) + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati DS_magazzino.V_ParticolariOverviewDataTable tabParticolari = MagClass.magazzino.taVParticolariOverwiew.getByLikePrefix(prefixText, memLayer.ML.confReadString("CodCS")); @@ -37,14 +37,13 @@ namespace GMW.WS } return suggerimenti.ToArray(); } - [System.Web.Services.WebMethod] public string[] elencoCelle(string prefixText, int count) { // inizializzo risposta List suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... - if (count > memLayer.ML.confReadInt("MinCharAutocomplete")) + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati DS_magazzino.CelleDataTable tabCelle = MagClass.magazzino.taCelle.getByCodCellaLike(prefixText, memLayer.ML.confReadString("CodCS")); @@ -56,5 +55,23 @@ namespace GMW.WS } return suggerimenti.ToArray(); } + [System.Web.Services.WebMethod] + public string[] elencoDestListePrel(string prefixText, int count) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_Utility.v_selDestinatariListePrelievoDataTable tabella = utils.obj.taDestListePre.getBySearchLike(prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selDestinatariListePrelievoRow riga in tabella) + { + suggerimenti.Add(riga.Destinatario); + } + } + return suggerimenti.ToArray(); + } } } diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 488d24f2..6aca20b4 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -62,7 +62,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx index 77a4affb..d80a7a2c 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx @@ -55,6 +55,11 @@ ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' /> + + + + + Imballo - - @@ -45,8 +43,8 @@ - + @@ -57,8 +55,8 @@ - + @@ -66,20 +64,26 @@ - - + - - + + + + Destinatario + + <%----%> + + diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs index 52a9ebe5..78de4d2d 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs @@ -87,15 +87,22 @@ namespace GMW.WebUserControls { // controllo se qta != 0... decimal qta = 0; + string destinatario = ""; + try + { + destinatario = txtDestinatario.Text.Trim(); + } + catch + { } try { qta = Convert.ToDecimal(txtQta.Text); } catch { } - if (qta > 0) + if (qta > 0 && destinatario!="") { - MagClass.magazzino.creaListaPrelievo(memLayer.ML.confReadString("CodCS"), ddlTipoLista.SelectedValue, txtParticolare.Text.Trim(), ddlEsponente.SelectedValue, ddlFigura.SelectedValue, qta, ddlImballo.SelectedValue); + MagClass.magazzino.creaListaPrelievo(memLayer.ML.confReadString("CodCS"), ddlTipoLista.SelectedValue, txtParticolare.Text.Trim(), ddlEsponente.SelectedValue, ddlFigura.SelectedValue, qta, ddlImballo.SelectedValue, destinatario); // sollevo evento nuovo valore... if (eh_nuovoValore != null) { diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs index 5e8e233a..2187b5da 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.designer.cs @@ -112,6 +112,24 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsImballo; + /// + /// txtDestinatario control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtDestinatario; + + /// + /// aceDestinatario control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.AutoCompleteExtender aceDestinatario; + /// /// btnCreaNuova control. /// diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index de0098c1..2168d10e 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 c17d8a5e..207d13a4 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 8bcae9c6..a55f091f 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 470f08c2..2168d10e 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 3810472b..107790a5 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 de0098c1..03653179 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 0d3033a9..0f3166af 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_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs index 85f051b4..8bb4ef86 100644 --- a/GMW/GMW_data/DS_Utility.Designer.cs +++ b/GMW/GMW_data/DS_Utility.Designer.cs @@ -45,6 +45,8 @@ namespace GMW_data { private v_selTipoDeliberaDataTable tablev_selTipoDelibera; + private v_selDestinatariListePrelievoDataTable tablev_selDestinatariListePrelievo; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -101,6 +103,9 @@ namespace GMW_data { if ((ds.Tables["v_selTipoDelibera"] != null)) { base.Tables.Add(new v_selTipoDeliberaDataTable(ds.Tables["v_selTipoDelibera"])); } + if ((ds.Tables["v_selDestinatariListePrelievo"] != null)) { + base.Tables.Add(new v_selDestinatariListePrelievoDataTable(ds.Tables["v_selDestinatariListePrelievo"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -209,6 +214,15 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public v_selDestinatariListePrelievoDataTable v_selDestinatariListePrelievo { + get { + return this.tablev_selDestinatariListePrelievo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] @@ -298,6 +312,9 @@ namespace GMW_data { if ((ds.Tables["v_selTipoDelibera"] != null)) { base.Tables.Add(new v_selTipoDeliberaDataTable(ds.Tables["v_selTipoDelibera"])); } + if ((ds.Tables["v_selDestinatariListePrelievo"] != null)) { + base.Tables.Add(new v_selDestinatariListePrelievoDataTable(ds.Tables["v_selDestinatariListePrelievo"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -388,6 +405,12 @@ namespace GMW_data { this.tablev_selTipoDelibera.InitVars(); } } + this.tablev_selDestinatariListePrelievo = ((v_selDestinatariListePrelievoDataTable)(base.Tables["v_selDestinatariListePrelievo"])); + if ((initTable == true)) { + if ((this.tablev_selDestinatariListePrelievo != null)) { + this.tablev_selDestinatariListePrelievo.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -417,6 +440,8 @@ namespace GMW_data { base.Tables.Add(this.tablev_selUdcByPart); this.tablev_selTipoDelibera = new v_selTipoDeliberaDataTable(); base.Tables.Add(this.tablev_selTipoDelibera); + this.tablev_selDestinatariListePrelievo = new v_selDestinatariListePrelievoDataTable(); + base.Tables.Add(this.tablev_selDestinatariListePrelievo); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -469,6 +494,11 @@ namespace GMW_data { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private bool ShouldSerializev_selDestinatariListePrelievo() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { @@ -542,6 +572,8 @@ namespace GMW_data { public delegate void v_selTipoDeliberaRowChangeEventHandler(object sender, v_selTipoDeliberaRowChangeEvent e); + public delegate void v_selDestinatariListePrelievoRowChangeEventHandler(object sender, v_selDestinatariListePrelievoRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -3169,6 +3201,230 @@ namespace GMW_data { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class v_selDestinatariListePrelievoDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnDestinatario; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoDataTable() { + this.TableName = "v_selDestinatariListePrelievo"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal v_selDestinatariListePrelievoDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected v_selDestinatariListePrelievoDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn DestinatarioColumn { + get { + return this.columnDestinatario; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoRow this[int index] { + get { + return ((v_selDestinatariListePrelievoRow)(this.Rows[index])); + } + } + + public event v_selDestinatariListePrelievoRowChangeEventHandler v_selDestinatariListePrelievoRowChanging; + + public event v_selDestinatariListePrelievoRowChangeEventHandler v_selDestinatariListePrelievoRowChanged; + + public event v_selDestinatariListePrelievoRowChangeEventHandler v_selDestinatariListePrelievoRowDeleting; + + public event v_selDestinatariListePrelievoRowChangeEventHandler v_selDestinatariListePrelievoRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void Addv_selDestinatariListePrelievoRow(v_selDestinatariListePrelievoRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoRow Addv_selDestinatariListePrelievoRow(string Destinatario) { + v_selDestinatariListePrelievoRow rowv_selDestinatariListePrelievoRow = ((v_selDestinatariListePrelievoRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + Destinatario}; + rowv_selDestinatariListePrelievoRow.ItemArray = columnValuesArray; + this.Rows.Add(rowv_selDestinatariListePrelievoRow); + return rowv_selDestinatariListePrelievoRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public override global::System.Data.DataTable Clone() { + v_selDestinatariListePrelievoDataTable cln = ((v_selDestinatariListePrelievoDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override global::System.Data.DataTable CreateInstance() { + return new v_selDestinatariListePrelievoDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal void InitVars() { + this.columnDestinatario = base.Columns["Destinatario"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitClass() { + this.columnDestinatario = new global::System.Data.DataColumn("Destinatario", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDestinatario); + this.columnDestinatario.MaxLength = 50; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoRow Newv_selDestinatariListePrelievoRow() { + return ((v_selDestinatariListePrelievoRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new v_selDestinatariListePrelievoRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override global::System.Type GetRowType() { + return typeof(v_selDestinatariListePrelievoRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.v_selDestinatariListePrelievoRowChanged != null)) { + this.v_selDestinatariListePrelievoRowChanged(this, new v_selDestinatariListePrelievoRowChangeEvent(((v_selDestinatariListePrelievoRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.v_selDestinatariListePrelievoRowChanging != null)) { + this.v_selDestinatariListePrelievoRowChanging(this, new v_selDestinatariListePrelievoRowChangeEvent(((v_selDestinatariListePrelievoRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.v_selDestinatariListePrelievoRowDeleted != null)) { + this.v_selDestinatariListePrelievoRowDeleted(this, new v_selDestinatariListePrelievoRowChangeEvent(((v_selDestinatariListePrelievoRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.v_selDestinatariListePrelievoRowDeleting != null)) { + this.v_selDestinatariListePrelievoRowDeleting(this, new v_selDestinatariListePrelievoRowChangeEvent(((v_selDestinatariListePrelievoRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void Removev_selDestinatariListePrelievoRow(v_selDestinatariListePrelievoRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_Utility ds = new DS_Utility(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "v_selDestinatariListePrelievoDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -3829,6 +4085,47 @@ namespace GMW_data { } } + /// + ///Represents strongly named DataRow class. + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + public partial class v_selDestinatariListePrelievoRow : global::System.Data.DataRow { + + private v_selDestinatariListePrelievoDataTable tablev_selDestinatariListePrelievo; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal v_selDestinatariListePrelievoRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tablev_selDestinatariListePrelievo = ((v_selDestinatariListePrelievoDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string Destinatario { + get { + try { + return ((string)(this[this.tablev_selDestinatariListePrelievo.DestinatarioColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Destinatario\' in table \'v_selDestinatariListePrelievo\' is D" + + "BNull.", e); + } + } + set { + this[this.tablev_selDestinatariListePrelievo.DestinatarioColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsDestinatarioNull() { + return this.IsNull(this.tablev_selDestinatariListePrelievo.DestinatarioColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetDestinatarioNull() { + this[this.tablev_selDestinatariListePrelievo.DestinatarioColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -4138,6 +4435,37 @@ namespace GMW_data { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + public class v_selDestinatariListePrelievoRowChangeEvent : global::System.EventArgs { + + private v_selDestinatariListePrelievoRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoRowChangeEvent(v_selDestinatariListePrelievoRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace GMW_data.DS_UtilityTableAdapters { @@ -6320,6 +6648,185 @@ namespace GMW_data.DS_UtilityTableAdapters { } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class v_selDestinatariListePrelievoTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public v_selDestinatariListePrelievoTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "v_selDestinatariListePrelievo"; + tableMapping.ColumnMappings.Add("Destinatario", "Destinatario"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.GMWConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + private void InitCommandCollection() { + 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 Destinatario FROM dbo.v_selDestinatariListePrelievo"; + 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_getDestListePrelLike"; + 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("@cerca", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(DS_Utility.v_selDestinatariListePrelievoDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_Utility.v_selDestinatariListePrelievoDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_Utility.v_selDestinatariListePrelievoDataTable dataTable = new DS_Utility.v_selDestinatariListePrelievoDataTable(); + 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_Utility.v_selDestinatariListePrelievoDataTable getBySearchLike(string cerca) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((cerca == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cerca)); + } + DS_Utility.v_selDestinatariListePrelievoDataTable dataTable = new DS_Utility.v_selDestinatariListePrelievoDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd index 8652ccd6..2018376e 100644 --- a/GMW/GMW_data/DS_Utility.xsd +++ b/GMW/GMW_data/DS_Utility.xsd @@ -375,6 +375,34 @@ where conditio = @conditio + + + + + + SELECT Destinatario FROM dbo.v_selDestinatariListePrelievo + + + + + + + + + + + + + dbo.stp_getDestListePrelLike + + + + + + + + + @@ -623,6 +651,19 @@ where conditio = @conditio + + + + + + + + + + + + + diff --git a/GMW/GMW_data/DS_Utility.xss b/GMW/GMW_data/DS_Utility.xss index b1483fce..2b543713 100644 --- a/GMW/GMW_data/DS_Utility.xss +++ b/GMW/GMW_data/DS_Utility.xss @@ -6,16 +6,17 @@ --> - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index e143b0ff..27f4762e 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -5832,6 +5832,8 @@ namespace GMW_data { private global::System.Data.DataColumn columnFigura; + private global::System.Data.DataColumn columnDestinatario; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public ElencoListePrelievoDataTable() { this.TableName = "ElencoListePrelievo"; @@ -5974,6 +5976,13 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn DestinatarioColumn { + get { + return this.columnDestinatario; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Browsable(false)] public int Count { @@ -6019,7 +6028,8 @@ namespace GMW_data { decimal QtaTot, int CodStatoLista, decimal Prelevato, - string Figura) { + string Figura, + string Destinatario) { ElencoListePrelievoRow rowElencoListePrelievoRow = ((ElencoListePrelievoRow)(this.NewRow())); object[] columnValuesArray = new object[] { CodLista, @@ -6037,7 +6047,8 @@ namespace GMW_data { QtaTot, CodStatoLista, Prelevato, - Figura}; + Figura, + Destinatario}; if ((parentTipoListaPrelievoRowByFK_ElencoListePrelievo_TipoListaPrelievo11 != null)) { columnValuesArray[1] = parentTipoListaPrelievoRowByFK_ElencoListePrelievo_TipoListaPrelievo11[0]; } @@ -6082,6 +6093,7 @@ namespace GMW_data { this.columnCodStatoLista = base.Columns["CodStatoLista"]; this.columnPrelevato = base.Columns["Prelevato"]; this.columnFigura = base.Columns["Figura"]; + this.columnDestinatario = base.Columns["Destinatario"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6118,6 +6130,8 @@ namespace GMW_data { base.Columns.Add(this.columnPrelevato); this.columnFigura = new global::System.Data.DataColumn("Figura", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnFigura); + this.columnDestinatario = new global::System.Data.DataColumn("Destinatario", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDestinatario); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCodLista}, true)); this.columnCodLista.AllowDBNull = false; @@ -6142,6 +6156,7 @@ namespace GMW_data { this.columnCodStatoLista.AllowDBNull = false; this.columnPrelevato.ReadOnly = true; this.columnFigura.MaxLength = 4; + this.columnDestinatario.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10297,6 +10312,21 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string Destinatario { + get { + try { + return ((string)(this[this.tableElencoListePrelievo.DestinatarioColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Destinatario\' in table \'ElencoListePrelievo\' is DBNull.", e); + } + } + set { + this[this.tableElencoListePrelievo.DestinatarioColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public TipoListaPrelievoRow TipoListaPrelievoRow { get { @@ -10387,6 +10417,16 @@ namespace GMW_data { this[this.tableElencoListePrelievo.FiguraColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsDestinatarioNull() { + return this.IsNull(this.tableElencoListePrelievo.DestinatarioColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetDestinatarioNull() { + this[this.tableElencoListePrelievo.DestinatarioColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public RigheListePrelievoRow[] GetRigheListePrelievoRows() { if ((this.Table.ChildRelations["FK_RigheListePrelievo_ElencoListePrelievo11"] == null)) { @@ -19160,6 +19200,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co tableMapping.ColumnMappings.Add("CodStatoLista", "CodStatoLista"); tableMapping.ColumnMappings.Add("Prelevato", "Prelevato"); tableMapping.ColumnMappings.Add("Figura", "Figura"); + tableMapping.ColumnMappings.Add("Destinatario", "Destinatario"); this._adapter.TableMappings.Add(tableMapping); } @@ -19214,6 +19255,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.NVarChar, 4, 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("@CodImballo", global::System.Data.SqlDbType.NVarChar, 15, 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("@QtaTot", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Destinatario", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; this._commandCollection[5].CommandText = "dbo.stp_LP_exportToAs400"; @@ -19293,7 +19335,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, 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, string Destinatario) { this.Adapter.SelectCommand = this.CommandCollection[4]; if ((Anno == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -19379,6 +19421,12 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co else { this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value; } + if ((Destinatario == null)) { + this.Adapter.SelectCommand.Parameters[15].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[15].Value = ((string)(Destinatario)); + } DS_magazzino.ElencoListePrelievoDataTable dataTable = new DS_magazzino.ElencoListePrelievoDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 2824f5b1..b9bb5527 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1712,6 +1712,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co + @@ -1768,6 +1769,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co + @@ -1964,273 +1966,127 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2245,17 +2101,17 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - - - - - - - + + + + + + + - + @@ -2265,14 +2121,271 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2286,101 +2399,319 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - + + + + + + + + + + - + - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2397,343 +2728,21 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2746,8 +2755,8 @@ 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 6130c8a8..0839878f 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -18,9 +18,9 @@ - + - + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 0a44008d..7954d201 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -429,8 +429,9 @@ namespace GMW_data /// /// /// + /// /// - public string creaListaPrelievo(string CodCS, string TipoListaPrelievo, string Particolare, string Esponente, string Figura, decimal QtaTot, string CodImballo) + public string creaListaPrelievo(string CodCS, string TipoListaPrelievo, string Particolare, string Esponente, string Figura, decimal QtaTot, string CodImballo, string Destinatario) { /* * - ordini gli UDC per data dal + vecchio (data fusione? direi di si!) @@ -504,7 +505,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, 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, Destinatario); // ricavo prima (e unica) riga dalla select DS_magazzino.ElencoListePrelievoRow rigaElencoListe = tabellaElencoListe[0]; diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 1f9fc310..207d13a4 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 c17d8a5e..1a61c874 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 1f9fc310..207d13a4 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_Utility.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll index 860d28b0..18a5ad77 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.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 d0c7c983..fe96e670 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 c17d8a5e..1a61c874 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/utils.cs b/GMW/GMW_data/utils.cs index b12493b5..53c9efab 100644 --- a/GMW/GMW_data/utils.cs +++ b/GMW/GMW_data/utils.cs @@ -14,6 +14,7 @@ namespace GMW_data public DS_UtilityTableAdapters.STPTableAdapter taSTP; public DS_UtilityTableAdapters.v_selTipoCellaTableAdapter taSelTipoCella; public DS_UtilityTableAdapters.v_selUdcByPartTableAdapter taUdcByPart; + public DS_UtilityTableAdapters.v_selDestinatariListePrelievoTableAdapter taDestListePre; /// @@ -24,6 +25,7 @@ namespace GMW_data taSTP = new GMW_data.DS_UtilityTableAdapters.STPTableAdapter(); taSelTipoCella = new GMW_data.DS_UtilityTableAdapters.v_selTipoCellaTableAdapter(); taUdcByPart = new GMW_data.DS_UtilityTableAdapters.v_selUdcByPartTableAdapter(); + taDestListePre = new GMW_data.DS_UtilityTableAdapters.v_selDestinatariListePrelievoTableAdapter(); } /// /// effettua setup dei connection strings da web.config delal singola applicazione @@ -34,6 +36,7 @@ namespace GMW_data taSTP.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); taSelTipoCella.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); taUdcByPart.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); + taDestListePre.Connection.ConnectionString = memLayer.ML.confReadString("GMWConnectionString"); } #endregion diff --git a/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs b/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs index c0346ae0..181841b5 100644 --- a/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs @@ -25,7 +25,7 @@ namespace GMW.WS // inizializzo risposta List suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... - if (count > memLayer.ML.confReadInt("MinCharAutocomplete")) + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati DS_magazzino.V_ParticolariOverviewDataTable tabParticolari = MagClass.magazzino.taVParticolariOverwiew.getByLikePrefix(prefixText, memLayer.ML.confReadString("CodCS")); @@ -37,14 +37,13 @@ namespace GMW.WS } return suggerimenti.ToArray(); } - [System.Web.Services.WebMethod] public string[] elencoCelle(string prefixText, int count) { // inizializzo risposta List suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... - if (count > memLayer.ML.confReadInt("MinCharAutocomplete")) + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati DS_magazzino.CelleDataTable tabCelle = MagClass.magazzino.taCelle.getByCodCellaLike(prefixText, memLayer.ML.confReadString("CodCS")); @@ -56,5 +55,23 @@ namespace GMW.WS } return suggerimenti.ToArray(); } + [System.Web.Services.WebMethod] + public string[] elencoDestListePrel(string prefixText, int count) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_Utility.v_selDestinatariListePrelievoDataTable tabella = utils.obj.taDestListePre.getBySearchLike(prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selDestinatariListePrelievoRow riga in tabella) + { + suggerimenti.Add(riga.Destinatario); + } + } + return suggerimenti.ToArray(); + } } } diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 1129fab3..c163e8ea 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -349,14 +349,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" - "ProductCode" = "8:{7C8E2714-79EB-4E9E-AA03-5E8220679B88}" - "PackageCode" = "8:{3A990B42-AD1B-4D39-8FAF-062A1289792D}" + "ProductCode" = "8:{6D70AF2C-4912-493A-839D-EFBDDB666E19}" + "PackageCode" = "8:{63B852CE-4128-4907-9790-1DE112AFE821}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.155" + "ProductVersion" = "8:1.0.160" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -801,7 +801,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" @@ -829,7 +829,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index 37d5d72d..3212fdb2 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ