diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index da9feef0..0528f495 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index ec6e4967..5077abdd 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index 424cf620..1dec0607 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index e781ea06..b08f7b6a 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index ec6e4967..5077abdd 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll index 424cf620..1dec0607 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW/AnagFormatiDtx.aspx.cs b/GMW/AnagFormatiDtx.aspx.cs index 0cdb8dca..3f0b7614 100644 --- a/GMW/AnagFormatiDtx.aspx.cs +++ b/GMW/AnagFormatiDtx.aspx.cs @@ -17,6 +17,7 @@ namespace GMW mod_specDmtx.FormatoDtmx = "*"; mod_trascFormDmtx.FormatoDtmx = "*"; mod_trascPn2Part.FormatoDtmx = "*"; + mod_trascPn2Part.PartNumber = "*"; mod_trascPn2Pn.FormatoDtmx = "*"; } mod_anagFormatiDtx.eh_ucev += Mod_anagFormatiDtx_eh_ucev; @@ -63,6 +64,8 @@ namespace GMW case ucEvType.Reset: mod_specDmtx.FormatoDtmx = "*"; mod_trascFormDmtx.FormatoDtmx = "*"; + mod_trascPn2Part.FormatoDtmx = "*"; + mod_trascPn2Pn.FormatoDtmx = "*"; break; case ucEvType.ReqUpdateParent: break; diff --git a/GMW/WebUserControls/mod_trascPn2Part.ascx b/GMW/WebUserControls/mod_trascPn2Part.ascx index e70b7268..8565d49b 100644 --- a/GMW/WebUserControls/mod_trascPn2Part.ascx +++ b/GMW/WebUserControls/mod_trascPn2Part.ascx @@ -1,27 +1,17 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_trascPn2Part.ascx.cs" Inherits="GMW.WebUserControls.mod_trascPn2Part" %> - + - - + + + - - - - - - - - - + + - - - - \ No newline at end of file diff --git a/GMW/WebUserControls/mod_trascPn2Pn.ascx b/GMW/WebUserControls/mod_trascPn2Pn.ascx index 321415f6..a466ec22 100644 --- a/GMW/WebUserControls/mod_trascPn2Pn.ascx +++ b/GMW/WebUserControls/mod_trascPn2Pn.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_trascPn2Pn.ascx.cs" Inherits="GMW.WebUserControls.mod_trascPn2Pn" %> - + diff --git a/GMW/WebUserControls/mod_trascPn2Pn.ascx.cs b/GMW/WebUserControls/mod_trascPn2Pn.ascx.cs index c0287b6f..ad9d4968 100644 --- a/GMW/WebUserControls/mod_trascPn2Pn.ascx.cs +++ b/GMW/WebUserControls/mod_trascPn2Pn.ascx.cs @@ -133,6 +133,10 @@ namespace GMW.WebUserControls if (e.InputParameters["PartNumberOUT"] == null) e.InputParameters["PartNumberOUT"] = ""; } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + raiseEvent(ucEvType.Selected); + } public string FormatoDtmx { get diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index e049ff8c..82aff94a 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index ec6e4967..5077abdd 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 424cf620..1dec0607 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW_data/DS_DataMatrix.xsd b/GMW_data/DS_DataMatrix.xsd index 96a25344..f50f57cf 100644 --- a/GMW_data/DS_DataMatrix.xsd +++ b/GMW_data/DS_DataMatrix.xsd @@ -1293,7 +1293,20 @@ SELECT PartNumber, Particolare, FormatoDtmx FROM TrascDatamatrix WHERE (PartNumb - + + + + + dmtx.stp_TPN2P_getByTipo + + + + + + + + + diff --git a/GMW_data/DS_DataMatrix.xss b/GMW_data/DS_DataMatrix.xss index ef1cb464..15639b74 100644 --- a/GMW_data/DS_DataMatrix.xss +++ b/GMW_data/DS_DataMatrix.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -26,7 +26,7 @@ - + diff --git a/GMW_data/DS_DataMatrix1.Designer.cs b/GMW_data/DS_DataMatrix1.Designer.cs index b2cb1b2a..891472df 100644 --- a/GMW_data/DS_DataMatrix1.Designer.cs +++ b/GMW_data/DS_DataMatrix1.Designer.cs @@ -17832,11 +17832,18 @@ SELECT PartNumber, Particolare, FormatoDtmx FROM TrascDatamatrix WHERE (PartNumb [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] 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 PartNumber, Particolare, FormatoDtmx FROM dbo.TrascDatamatrix"; 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 = "dmtx.stp_TPN2P_getByTipo"; + 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("@FormatoDtmx", global::System.Data.SqlDbType.NVarChar, 20, 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("@PartNumber", global::System.Data.SqlDbType.NVarChar, 30, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17863,6 +17870,29 @@ SELECT PartNumber, Particolare, FormatoDtmx FROM TrascDatamatrix WHERE (PartNumb return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_DataMatrix.TrascDatamatrixDataTable getByPnFormato(string FormatoDtmx, string PartNumber) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((FormatoDtmx == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(FormatoDtmx)); + } + if ((PartNumber == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(PartNumber)); + } + DS_DataMatrix.TrascDatamatrixDataTable dataTable = new DS_DataMatrix.TrascDatamatrixDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]