diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs index 64b6f268..e76ae2c1 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs @@ -489,14 +489,19 @@ namespace GMW.WebUserControls // salvo anche dato x filtraggio udcByPart string UDC = ""; string particolare = ""; + string codLista = ""; + string codTipoLista = ""; try { UDC = grView.SelectedDataKey["UDC"].ToString(); particolare = MagClass.magazzino.taDettUDC.getByFullUdc(UDC, memLayer.ML.StringSessionObj("CodCS"))[0].Particolare; + codLista = grView.SelectedDataKey["CodLista"].ToString(); + codTipoLista = MagClass.magazzino.taElencoListePrelievo.getByCodLista(codLista)[0].CodTipoLista; } catch { } - memLayer.ML.setSessionVal("UdcByPart_conditio", particolare); + memLayer.ML.setSessionVal("UdcByPart_Particolare", particolare); + memLayer.ML.setSessionVal("UdcByPart_CodLista", codTipoLista); } /// /// ridisegno x cancel editing diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 022ab197..a786f797 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 874c103d..d0d3f75b 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index ac20b317..a786f797 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 02a37816..9d37a524 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 9cf4e4ce..29bdbbd3 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 20d3a858..9a17d969 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index cad2b96e..29bdbbd3 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index c4d7b268..b8764d4c 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs index f58d4acd..05ffb252 100644 --- a/GMW/GMW_data/DS_Utility.Designer.cs +++ b/GMW/GMW_data/DS_Utility.Designer.cs @@ -2766,7 +2766,11 @@ namespace GMW_data { private global::System.Data.DataColumn columnlabel; - private global::System.Data.DataColumn columnconditio; + private global::System.Data.DataColumn columnParticolare; + + private global::System.Data.DataColumn columnIdxPosizione; + + private global::System.Data.DataColumn columnCodCS; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public v_selUdcByPartDataTable() { @@ -2813,9 +2817,23 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Data.DataColumn conditioColumn { + public global::System.Data.DataColumn ParticolareColumn { get { - return this.columnconditio; + return this.columnParticolare; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn IdxPosizioneColumn { + get { + return this.columnIdxPosizione; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn CodCSColumn { + get { + return this.columnCodCS; } } @@ -2848,12 +2866,14 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public v_selUdcByPartRow Addv_selUdcByPartRow(string value, string label, string conditio) { + public v_selUdcByPartRow Addv_selUdcByPartRow(string value, string label, string Particolare, int IdxPosizione, string CodCS) { v_selUdcByPartRow rowv_selUdcByPartRow = ((v_selUdcByPartRow)(this.NewRow())); object[] columnValuesArray = new object[] { value, label, - conditio}; + Particolare, + IdxPosizione, + CodCS}; rowv_selUdcByPartRow.ItemArray = columnValuesArray; this.Rows.Add(rowv_selUdcByPartRow); return rowv_selUdcByPartRow; @@ -2881,7 +2901,9 @@ namespace GMW_data { internal void InitVars() { this.columnvalue = base.Columns["value"]; this.columnlabel = base.Columns["label"]; - this.columnconditio = base.Columns["conditio"]; + this.columnParticolare = base.Columns["Particolare"]; + this.columnIdxPosizione = base.Columns["IdxPosizione"]; + this.columnCodCS = base.Columns["CodCS"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2890,8 +2912,12 @@ namespace GMW_data { base.Columns.Add(this.columnvalue); this.columnlabel = new global::System.Data.DataColumn("label", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnlabel); - this.columnconditio = new global::System.Data.DataColumn("conditio", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnconditio); + this.columnParticolare = new global::System.Data.DataColumn("Particolare", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnParticolare); + this.columnIdxPosizione = new global::System.Data.DataColumn("IdxPosizione", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIdxPosizione); + this.columnCodCS = new global::System.Data.DataColumn("CodCS", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodCS); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnvalue}, true)); this.columnvalue.AllowDBNull = false; @@ -2899,7 +2925,8 @@ namespace GMW_data { this.columnvalue.MaxLength = 50; this.columnlabel.ReadOnly = true; this.columnlabel.MaxLength = 152; - this.columnconditio.MaxLength = 15; + this.columnParticolare.MaxLength = 15; + this.columnCodCS.MaxLength = 2; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4606,17 +4633,47 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public string conditio { + public string Particolare { get { try { - return ((string)(this[this.tablev_selUdcByPart.conditioColumn])); + return ((string)(this[this.tablev_selUdcByPart.ParticolareColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'conditio\' in table \'v_selUdcByPart\' is DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'Particolare\' in table \'v_selUdcByPart\' is DBNull.", e); } } set { - this[this.tablev_selUdcByPart.conditioColumn] = value; + this[this.tablev_selUdcByPart.ParticolareColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public int IdxPosizione { + get { + try { + return ((int)(this[this.tablev_selUdcByPart.IdxPosizioneColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'IdxPosizione\' in table \'v_selUdcByPart\' is DBNull.", e); + } + } + set { + this[this.tablev_selUdcByPart.IdxPosizioneColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string CodCS { + get { + try { + return ((string)(this[this.tablev_selUdcByPart.CodCSColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'CodCS\' in table \'v_selUdcByPart\' is DBNull.", e); + } + } + set { + this[this.tablev_selUdcByPart.CodCSColumn] = value; } } @@ -4631,13 +4688,33 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public bool IsconditioNull() { - return this.IsNull(this.tablev_selUdcByPart.conditioColumn); + public bool IsParticolareNull() { + return this.IsNull(this.tablev_selUdcByPart.ParticolareColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public void SetconditioNull() { - this[this.tablev_selUdcByPart.conditioColumn] = global::System.Convert.DBNull; + public void SetParticolareNull() { + this[this.tablev_selUdcByPart.ParticolareColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsIdxPosizioneNull() { + return this.IsNull(this.tablev_selUdcByPart.IdxPosizioneColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetIdxPosizioneNull() { + this[this.tablev_selUdcByPart.IdxPosizioneColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsCodCSNull() { + return this.IsNull(this.tablev_selUdcByPart.CodCSColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetCodCSNull() { + this[this.tablev_selUdcByPart.CodCSColumn] = global::System.Convert.DBNull; } } @@ -7453,7 +7530,9 @@ namespace GMW_data.DS_UtilityTableAdapters { tableMapping.DataSetTable = "v_selUdcByPart"; tableMapping.ColumnMappings.Add("value", "value"); tableMapping.ColumnMappings.Add("label", "label"); - tableMapping.ColumnMappings.Add("conditio", "conditio"); + tableMapping.ColumnMappings.Add("Particolare", "Particolare"); + tableMapping.ColumnMappings.Add("IdxPosizione", "IdxPosizione"); + tableMapping.ColumnMappings.Add("CodCS", "CodCS"); this._adapter.TableMappings.Add(tableMapping); } @@ -7468,14 +7547,16 @@ namespace GMW_data.DS_UtilityTableAdapters { 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 value, label, conditio FROM dbo.v_selUdcByPart"; + this._commandCollection[0].CommandText = "SELECT * FROM v_selUdcByPart"; 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 = "SELECT value, label, conditio FROM dbo.v_selUdcByPart\r\nwhere conditio = @conditio" + - ""; - this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conditio", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, "conditio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].CommandText = "dbo.stp_UdcPerParticolareCodLista"; + 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("@Particolare", global::System.Data.SqlDbType.VarChar, 50, 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7503,13 +7584,25 @@ namespace GMW_data.DS_UtilityTableAdapters { [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_selUdcByPartDataTable getByConditio(string conditio) { + public virtual DS_Utility.v_selUdcByPartDataTable getByConditio(string Particolare, string CodCS, string CodTipoLista) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((conditio == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + if ((Particolare == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(conditio)); + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Particolare)); + } + if ((CodCS == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodCS)); + } + if ((CodTipoLista == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodTipoLista)); } DS_Utility.v_selUdcByPartDataTable dataTable = new DS_Utility.v_selUdcByPartDataTable(); this.Adapter.Fill(dataTable); diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd index c4b9b097..f5cac2a6 100644 --- a/GMW/GMW_data/DS_Utility.xsd +++ b/GMW/GMW_data/DS_Utility.xsd @@ -287,7 +287,7 @@ WHERE (value = @value) - + dbo.stp_processaSpedizTerz @@ -297,7 +297,7 @@ WHERE (value = @value) - + dbo.stp_UDC_delibera @@ -378,10 +378,10 @@ WHERE (value = @value) - + - - SELECT value, label, conditio FROM dbo.v_selUdcByPart + + SELECT * FROM v_selUdcByPart @@ -390,16 +390,20 @@ WHERE (value = @value) - + + + - + - - SELECT value, label, conditio FROM dbo.v_selUdcByPart -where conditio = @conditio + + dbo.stp_UdcPerParticolareCodLista - + + + + @@ -527,21 +531,21 @@ where value = @value - + - + - + @@ -554,22 +558,22 @@ where value = @value - - + + - + - + @@ -582,35 +586,15 @@ where value = @value - - + + - - - - - - - - - - - - - - - - - - - - - + @@ -624,21 +608,41 @@ where value = @value - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -651,29 +655,29 @@ where value = @value - - + + - + - + - + @@ -686,8 +690,8 @@ where value = @value - - + + @@ -700,14 +704,14 @@ where value = @value - + - + @@ -720,41 +724,49 @@ where value = @value - + - + - + + + + + + + + + - + - + @@ -767,21 +779,21 @@ where value = @value - + - + - + @@ -794,21 +806,21 @@ where value = @value - + - + - + diff --git a/GMW/GMW_data/DS_Utility.xss b/GMW/GMW_data/DS_Utility.xss index fc37d675..b11258d4 100644 --- a/GMW/GMW_data/DS_Utility.xss +++ b/GMW/GMW_data/DS_Utility.xss @@ -6,19 +6,19 @@ --> - - + + - + - - - - - + + + + + \ No newline at end of file diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 2def0d23..1dac1b6d 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -1028,10 +1028,10 @@ namespace GMW_data // e SE specificato nel web.config... if (memLayer.ML.confReadBool("Cosumo84PostDelibera")) { - // sposto da 84 a -84... - if (fatto) + // SE si tratta di mag 84, sposto da 84 a -84... + if (fatto && IdxPosizione == 84) { - // devo fare un movimento di compensazioen su mag 84 x non scaricare subito la quantità che ho appena messo in AS400... + // devo fare un movimento di compensazione su mag 84 x non scaricare subito la quantità che ho appena messo in AS400... DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); } } diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index e93eca10..d0d3f75b 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/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index e93eca10..d0d3f75b 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 6bdafa1e..4a56e461 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/selData.cs b/GMW/GMW_data/selData.cs index 39a596d1..bd68685b 100644 --- a/GMW/GMW_data/selData.cs +++ b/GMW/GMW_data/selData.cs @@ -23,15 +23,22 @@ namespace GMW_data /// public GMW_data.DS_Utility.v_selUdcByPartDataTable getSelUdcByPart() { - string conditio = ""; + string Particolare = ""; + string CodLista = ""; // cerco da rete se c'è la condizione di filtraggio... try { - conditio = SteamWare.memLayer.ML.StringSessionObj("UdcByPart_conditio"); + Particolare = SteamWare.memLayer.ML.StringSessionObj("UdcByPart_Particolare"); } catch { } - return GMW_data.utils.obj.taUdcByPart.getByConditio(conditio); + try + { + CodLista = SteamWare.memLayer.ML.StringSessionObj("UdcByPart_CodLista"); + } + catch + { } + return GMW_data.utils.obj.taUdcByPart.getByConditio(Particolare, memLayer.ML.confReadString("CodCS"), CodLista); } }