diff --git a/GMW/GMW/WS/bilance.asmx.cs b/GMW/GMW/WS/bilance.asmx.cs index fddc73c5..a4e75fcf 100644 --- a/GMW/GMW/WS/bilance.asmx.cs +++ b/GMW/GMW/WS/bilance.asmx.cs @@ -150,24 +150,28 @@ namespace GMW.WS double answ = 0; try { - answ = DataProxy.obj.taCartellini.stp_getStatoByUdc(UDC)[0].Tara; + answ = DataProxy.obj.taCartellini.stp_getByUdc(UDC)[0].Tara; } catch { } return answ; - } -#if false + } /// /// Restituisce l'elenco degli UDC parent di quello specificato /// /// codice dell'UDC /// [WebMethod(Description = "Restituisce l'elenco degli UDC parent di quello specificato")] - public string[] UdcInfo_GetParentUdcList(string UDC_rich) + public string[] UdcInfo_GetUdcParentList(string UDC) { - int numRec = 1; //calcolare! + GMW_data.DS_Applicazione.RelazUDCDataTable tabRelUdc = DataProxy.obj.taRelazUDC.stp_getParent(UDC); + int numRec = tabRelUdc.Rows.Count; string[] answ = new string[numRec]; // caricare dati! + for (int i = 0; i < numRec; i++) + { + answ[i] = tabRelUdc[i].UDC_parent; + } return answ; } /// @@ -176,11 +180,16 @@ namespace GMW.WS /// codice dell'UDC /// [WebMethod(Description = "Restituisce l'elenco degli UDC child di quello specificato")] - public string[] UdcInfo_GetChildUdcList(string UDC_rich) + public string[] UdcInfo_GetUdcChildList(string UDC) { - int numRec = 1; //calcolare! + GMW_data.DS_Applicazione.RelazUDCDataTable tabRelUdc = DataProxy.obj.taRelazUDC.stp_getChild(UDC); + int numRec = tabRelUdc.Rows.Count; string[] answ = new string[numRec]; - // caricare dati!!! + // caricare dati! + for (int i = 0; i < numRec; i++) + { + answ[i] = tabRelUdc[i].UDC_child; + } return answ; } /// @@ -189,13 +198,11 @@ namespace GMW.WS /// codice dell'UDC /// [WebMethod(Description = "Restituisce tutti i dati dell'UDC indicato")] - public GMW.Type.UDC UdcInfo_GetFullData(string UDC_rich) + public GMW.Type.Cartellino UdcInfo_GetFullData(string UDC) { - GMW.Type.UDC answ = new GMW.Type.UDC(); - // caricare dati!!! + GMW.Type.Cartellino answ = new GMW.Type.Cartellino(DataProxy.obj.taCartellini.stp_getByUdc(UDC)[0]); return answ; } -#endif #if false /// /// Controlla che il codice imballo inviato sia valido (pre creazione TARA) diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 56d86fcf..b7d9b3a7 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 e42a60ff..aca6eed1 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 56d86fcf..b7d9b3a7 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 51c48afc..54e4da5d 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs index 88f46653..a58cfa02 100644 --- a/GMW/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW/GMW_data/DS_Applicazione.Designer.cs @@ -10696,11 +10696,23 @@ SELECT UDC_parent, UDC_child FROM RelazUDC WHERE (UDC_child = @UDC_child) AND (U [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT UDC_parent, UDC_child FROM dbo.RelazUDC"; 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_getUDC_Child"; + 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("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_getUDC_Parent"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10725,6 +10737,38 @@ SELECT UDC_parent, UDC_child FROM RelazUDC WHERE (UDC_child = @UDC_child) AND (U 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_Applicazione.RelazUDCDataTable stp_getChild(string UDC) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + DS_Applicazione.RelazUDCDataTable dataTable = new DS_Applicazione.RelazUDCDataTable(); + 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_Applicazione.RelazUDCDataTable stp_getParent(string UDC) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + DS_Applicazione.RelazUDCDataTable dataTable = new DS_Applicazione.RelazUDCDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(DS_Applicazione.RelazUDCDataTable dataTable) { @@ -12545,7 +12589,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_getStatoByUdc"; + this._commandCollection[2].CommandText = "dbo.stp_getCartellinoByUdc"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -12626,7 +12670,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [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_Applicazione.ElencoCartelliniDataTable stp_getStatoByUdc(string UDC) { + public virtual DS_Applicazione.ElencoCartelliniDataTable stp_getByUdc(string UDC) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((UDC == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd index e7c34ce2..70b54c28 100644 --- a/GMW/GMW_data/DS_Applicazione.xsd +++ b/GMW/GMW_data/DS_Applicazione.xsd @@ -613,7 +613,30 @@ SELECT UDC_parent, UDC_child FROM RelazUDC WHERE (UDC_child = @UDC_child) AND (U - + + + + + dbo.stp_getUDC_Child + + + + + + + + + + + dbo.stp_getUDC_Parent + + + + + + + + @@ -1068,10 +1091,10 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + - dbo.stp_getStatoByUdc + dbo.stp_getCartellinoByUdc diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss index 171be80a..d56b0358 100644 --- a/GMW/GMW_data/DS_Applicazione.xss +++ b/GMW/GMW_data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -14,7 +14,7 @@ - + diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index e42a60ff..aca6eed1 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 e42a60ff..aca6eed1 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_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 76ababee..1d9a9476 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_data/reportExporter.cs b/GMW/GMW_data/reportExporter.cs index 58758b31..83174608 100644 --- a/GMW/GMW_data/reportExporter.cs +++ b/GMW/GMW_data/reportExporter.cs @@ -53,7 +53,7 @@ public class reportExporter // tab = (DataTable)GMW_data.DataProxy.obj.taCartellini.getByUdc(UDC); // break; case reportRichiesto.CartellinoTara: - tab = (DataTable)GMW_data.DataProxy.obj.taCartellini.stp_getStatoByUdc(UDC); + tab = (DataTable)GMW_data.DataProxy.obj.taCartellini.stp_getByUdc(UDC); break; default: break; diff --git a/GMW/GMW_data/reportPrinter.cs b/GMW/GMW_data/reportPrinter.cs index 4a3b54d2..159e25bb 100644 --- a/GMW/GMW_data/reportPrinter.cs +++ b/GMW/GMW_data/reportPrinter.cs @@ -109,7 +109,7 @@ public class reportPrinter // tab = (DataTable)GMW_data.DataProxy.obj.taStatoOdpUdc.getByUdc(UDC); // break; case reportRichiesto.CartellinoTara: - tab = (DataTable)GMW_data.DataProxy.obj.taCartellini.stp_getStatoByUdc(UDC); + tab = (DataTable)GMW_data.DataProxy.obj.taCartellini.stp_getByUdc(UDC); break; default: break;