diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index ccc92b0a..42505c24 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -59,8 +59,8 @@ - - + + diff --git a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs index ffb09901..d2211aeb 100644 --- a/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_bolle4odette.ascx.cs @@ -69,7 +69,11 @@ namespace GMW.WebUserControls else { lblWarning.Visible = true; - if (Odette.mgr.taBORI.getByKeyPart(RaggMag, GrpBolla, NumBolla, DatBolla).Rows.Count > 0) + if (Odette.mgr.taOdette.getByBolla(RaggMag, GrpBolla, NumBolla, DatBolla, particolare).Rows.Count > 0) + { + lblWarning.Text = traduci("BollaGiaAssociata"); + } + else if (Odette.mgr.taBORI.getByKeyPart(RaggMag, GrpBolla, NumBolla, DatBolla).Rows.Count > 0) { lblWarning.Text = traduci("MismatchParticolare"); } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 6478b259..4b07d36c 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 a3836206..836dad96 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index 2c05122d..4f995878 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 2fcec4a0..32957dac 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -6,8 +6,8 @@ - - + + diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config index 414d78f6..f9b9b737 100644 --- a/GMW/GMW/mazzAppSettingsSP.config +++ b/GMW/GMW/mazzAppSettingsSP.config @@ -6,8 +6,8 @@ - - + + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 9bb005e7..7b5cc8e8 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/RdlCompile.cache b/GMW/GMW/obj/Debug/RdlCompile.cache index 5c0f3eb6..351fd79b 100644 Binary files a/GMW/GMW/obj/Debug/RdlCompile.cache and b/GMW/GMW/obj/Debug/RdlCompile.cache differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 1bc740c5..0a008818 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 6478b259..4b07d36c 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 5e69a756..461dd2b9 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_Odette.Designer.cs b/GMW/GMW_data/DS_Odette.Designer.cs index 5cc2a2eb..4c6b6b9e 100644 --- a/GMW/GMW_data/DS_Odette.Designer.cs +++ b/GMW/GMW_data/DS_Odette.Designer.cs @@ -6556,7 +6556,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.Odette"; @@ -6575,82 +6575,92 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CampoUDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_ODETTE_getByListaPrelievo"; + this._commandCollection[3].CommandText = "dbo.stp_ODETTE_getByBolla"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@GrpBolla", global::System.Data.SqlDbType.NVarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumBolla", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 6, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataBolla", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 8, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_ODETTE_getByUDC"; + this._commandCollection[4].CommandText = "dbo.stp_ODETTE_getByListaPrelievo"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", 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("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, 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_ODETTE_setStato"; + this._commandCollection[5].CommandText = "dbo.stp_ODETTE_getByUDC"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatoOk", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_ODETTE_updateLingua"; + this._commandCollection[6].CommandText = "dbo.stp_ODETTE_setStato"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo1_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo2_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo3_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo4_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo5_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo6_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo7_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo8_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo9_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo10_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo11_1_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo11_2_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo12_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo13_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo14_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo15_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo16_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatoOk", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_ODETTE_updateVal"; + this._commandCollection[7].CommandText = "dbo.stp_ODETTE_updateLingua"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ragSocCli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indirCli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@capCittCli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ragSocDest", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indirDest", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@capCittDest", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pesoNetto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pesoLordo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numColli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disPart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descPart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codPart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codImb", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codMaz", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codNael", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo1_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo2_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo3_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo4_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo5_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo6_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo7_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo8_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo9_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo10_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo11_1_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo11_2_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo12_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo13_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo14_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo15_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Campo16_1", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_ODETTE_upsertUdc"; + this._commandCollection[8].CommandText = "dbo.stp_ODETTE_updateVal"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numBolla", global::System.Data.SqlDbType.NVarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataBolla", global::System.Data.SqlDbType.NVarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@GrpBolla", global::System.Data.SqlDbType.NVarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IndStabFrom", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtaCont", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ragSocCli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indirCli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@capCittCli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ragSocDest", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indirDest", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@capCittDest", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pesoNetto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pesoLordo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numColli", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disPart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descPart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codPart", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codImb", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codMaz", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codNael", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[9].Connection = this.Connection; + this._commandCollection[9].CommandText = "dbo.stp_ODETTE_upsertUdc"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numBolla", global::System.Data.SqlDbType.NVarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataBolla", global::System.Data.SqlDbType.NVarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@GrpBolla", global::System.Data.SqlDbType.NVarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IndStabFrom", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtaCont", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6678,8 +6688,48 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [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_Odette.OdetteDataTable getByCodLista(string CodLista) { + public virtual DS_Odette.OdetteDataTable getByBolla(string CodMag, string GrpBolla, global::System.Nullable NumBolla, global::System.Nullable DataBolla, string Particolare) { this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((CodMag == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodMag)); + } + if ((GrpBolla == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(GrpBolla)); + } + if ((NumBolla.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((decimal)(NumBolla.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((DataBolla.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((decimal)(DataBolla.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Particolare == null)) { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Particolare)); + } + DS_Odette.OdetteDataTable dataTable = new DS_Odette.OdetteDataTable(); + 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_Odette.OdetteDataTable getByCodLista(string CodLista) { + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((CodLista == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -6695,7 +6745,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Odette.OdetteDataTable getByUdc(string UDC) { - this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((UDC == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -9475,7 +9525,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int setStato(string UDC, global::System.Nullable StatoOk) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9526,7 +9576,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT string Campo14_1, string Campo15_1, string Campo16_1) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9671,7 +9721,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT string codImb, string codMaz, string codNael) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -9788,7 +9838,7 @@ SELECT CDMFS, GRBOS, DTBOS, NRBOS, CDARS, NRRGS, CDINB, RA1ND, RA2ND, CAPND, CIT [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int upsertUdc(string UDC, string CodCS, string numBolla, string dataBolla, string CodMag, string GrpBolla, string Particolare, string CodLista, string IndStabFrom, string qtaCont) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/GMW/GMW_data/DS_Odette.xsd b/GMW/GMW_data/DS_Odette.xsd index 5be565b9..3991ac3c 100644 --- a/GMW/GMW_data/DS_Odette.xsd +++ b/GMW/GMW_data/DS_Odette.xsd @@ -744,7 +744,7 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + dbo.stp_ODETTE_deleteByLDP @@ -755,7 +755,7 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + dbo.stp_ODETTE_delete @@ -766,6 +766,21 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam + + + + dbo.stp_ODETTE_getByBolla + + + + + + + + + + + @@ -788,7 +803,7 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + dbo.stp_ODETTE_setStato @@ -800,7 +815,7 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + dbo.stp_ODETTE_updateLingua @@ -828,7 +843,7 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + dbo.stp_ODETTE_updateVal @@ -854,7 +869,7 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + dbo.stp_ODETTE_upsertUdc @@ -907,805 +922,805 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -1718,8 +1733,8 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam - - + + diff --git a/GMW/GMW_data/DataMatrix.cs b/GMW/GMW_data/DataMatrix.cs index 6b1c39e9..b60840af 100644 --- a/GMW/GMW_data/DataMatrix.cs +++ b/GMW/GMW_data/DataMatrix.cs @@ -96,6 +96,6 @@ namespace GMW_data return answ; } - + } } diff --git a/GMW/GMW_data/Odette.cs b/GMW/GMW_data/Odette.cs index 939d7f3f..7e17bbf4 100644 --- a/GMW/GMW_data/Odette.cs +++ b/GMW/GMW_data/Odette.cs @@ -171,8 +171,8 @@ namespace GMW_data // campo2 try { - destP1 = rigaAs.INEND.Substring(0, 15).Trim(); - destP2 = rigaAs.INEND.Substring(15, 15).Trim(); + destP2 = rigaAs.INEND.Substring(0, 15).Trim(); + destP1 = rigaAs.INEND.Substring(15, 15).Trim(); if (rigaAs.CRAGCL.Trim() == "13" || rigaAs.TELND.Substring(18, 2) == "13") { destP3 = "/S"; @@ -250,7 +250,7 @@ namespace GMW_data // campo6 try { - pesoLordo = Math.Round(peso + rigaAs.PELDB, 2).ToString(); + pesoLordo = Math.Round(rigaAs.PELDB / rigaAs.NRC1B, 2).ToString(); } catch { @@ -372,10 +372,11 @@ namespace GMW_data } catch { } - // controllo che la bolla non sia già associata... + // controllo che la bolla non sia già associata... ovvero SENZA NESSUNA etichetta odette associata x quel particolare... if (answ) { // controllo se trovo odette associate a tale bolla... + answ = (taOdette.getByBolla(RaggMag, GrpBolla, numBolla, dataBolla, particolare).Rows.Count == 0); } return answ; } @@ -393,10 +394,8 @@ namespace GMW_data int answ = 0; try { - // calcolo il totale dei pezzi - answ = Convert.ToInt32(taBORI.getByKeyFull(RaggMag, GrpBolla, Convert.ToDecimal(numBolla), Convert.ToDecimal(dataBolla), particolare).Compute("SUM(NRC1B)", "")); - //answ = (int)taBORI.getByKeyFull(RaggMag, GrpBolla, Convert.ToDecimal(numBolla), Convert.ToDecimal(dataBolla), particolare).[0].NRC1B; - + // calcolo il totale dei pezzi: ogni riga contiene il totale colli della bolla... + answ = (int)taBORI.getByKeyFull(RaggMag, GrpBolla, Convert.ToDecimal(numBolla), Convert.ToDecimal(dataBolla), particolare)[0].NRC1B; } catch { } @@ -469,7 +468,7 @@ namespace GMW_data foreach (DS_magazzino.RigheListePrelievoRow rigaUdc in ElencoUdc) { // per ogni UDC creo una riga - taOdette.upsertUdc(rigaUdc.UDC, memLayer.ML.confReadString("CodCS"), numBolla.ToString(), dataBolla.ToString(), RaggMag,GrpBolla,particolare,CodLista, memLayer.ML.confReadString("indStabFrom"), rigaUdc.Qta.ToString()); + taOdette.upsertUdc(rigaUdc.UDC, memLayer.ML.confReadString("CodCS"), numBolla.ToString(), dataBolla.ToString(), RaggMag, GrpBolla, particolare, CodLista, memLayer.ML.confReadString("indStabFrom"), rigaUdc.Qta.ToString()); udcOk++; // per ogni riga inserisco traduzione nella lingua richiesta caricaEtichetteLinguaPerOdette(rigaUdc.UDC, lingua); @@ -493,7 +492,7 @@ namespace GMW_data } else { - errCreazOdette = string.Format("Tentativo di generazione etichette odette da bolla inesistente: codice {0} del {1}", numBolla, dataBolla); + errCreazOdette = string.Format("Tentativo di generazione etichette odette da bolla inesistente/già impiegata: codice {0} del {1}", numBolla, dataBolla); logger.lg.scriviLog(errCreazOdette, tipoLog.ERROR); } // controllo se tutte le etichette sono sstate create @@ -616,7 +615,7 @@ namespace GMW_data try { codGitterboxFrom = DataMatrix.mgr.gitterboxFromDataMatrix(codDataMatrix); - if (codGitterboxFrom != "") + if (codGitterboxFrom != "EmptyGBox") { answ = (codGitterboxFrom.Substring(0, 2) == codGitterboxTo.Substring(0, 2)); } diff --git a/GMW/GMW_data/SqlScripts/GMW_00391.sql b/GMW/GMW_data/SqlScripts/GMW_00391.sql index 8a113457..1593f8db 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00391.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00391.sql @@ -224,6 +224,710 @@ commit go +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/***************************************** +* STORED stp_ODETTE_deleteByLDP +* +* Elimina una riga etichetta odette +* +* Steamware, S.E.L. +* mod: 2011.05.23 +* +****************************************/ +create PROCEDURE stp_ODETTE_deleteByLDP +( + @CodLista NVARCHAR(12) +) +AS + +DELETE +FROM Odette +WHERE CodLista = @CodLista + +RETURN +go + +/***************************************** +* STORED stp_ODETTE_getByBolla +* +* Recupera etichette odette associate ad una bolla CON STATO OK +* +* Steamware, S.E.L. +* mod: 2011.05.23 +* +****************************************/ +create PROCEDURE stp_ODETTE_getByBolla +( + @CodMag NVARCHAR(2), + @GrpBolla NVARCHAR(1), + @NumBolla NUMERIC(6,0), + @DataBolla NUMERIC(8,0), + @Particolare NVARCHAR(15) +) +AS + + +SELECT * +FROM Odette +WHERE CodMag = @CodMag +AND GrpBolla = @GrpBolla +AND NumBolla = @NumBolla +AND DataBolla = @DataBolla +AND Particolare = @Particolare +AND StatoOk = 1 + +RETURN +go + +/***************************************** +* STORED stp_ODETTE_getByListaPrelievo +* +* Recupera etichette odette associate ad una lista di prelievo CON STATO OK +* +* Steamware, S.E.L. +* mod: 2011.04.29 +* +****************************************/ +alter PROCEDURE stp_ODETTE_getByListaPrelievo +( + @CodLista NVARCHAR(12) +) +AS + +/* +SELECT o.* +FROM Odette o INNER JOIN RigheListePrelievo rlp ON o.CampoUDC = rlp.UDC +WHERE (rlp.CodLista = @CodLista) AND (o.StatoOk = 1) +*/ + +SELECT * +FROM Odette +WHERE (CodLista = @CodLista) AND (StatoOk = 1) + +RETURN +go + +/***************************************** +* STORED stp_ODETTE_upsertUdc +* +* effettua upsert x l'UDC (ovver crea nuovo solo se non c'è...) +* +* Steamware, S.E.L. +* mod: 2011.04.28 +* +****************************************/ +alter PROCEDURE stp_ODETTE_upsertUdc +( + @UDC NVARCHAR(10), + @CodCS VARCHAR(2), + @numBolla NVARCHAR(6), + @dataBolla NVARCHAR(8), + @CodMag NVARCHAR(2), + @GrpBolla NVARCHAR(1), + @Particolare NVARCHAR(15), + @CodLista NVARCHAR(12), + @IndStabFrom NVARCHAR(50), + @qtaCont NVARCHAR(50) +) +AS + + +-- DECLARE iniziali x gestione contatori odette +DECLARE @Flusso AS VARCHAR(2) +DECLARE @Anno AS VARCHAR(2) +DECLARE @numOdette AS INT +DECLARE @nextOdette AS INT + +------------------------------------------------------------------------------------------------------ +-- Fix flusso ed anno x 'OD' e '00' (contatore non spezzato su anno... +------------------------------------------------------------------------------------------------------ +SET @Flusso = 'OD' +SET @Anno = '00' + +------------------------------------------------------------------------------------------------------ +-- Contatore Odette +------------------------------------------------------------------------------------------------------ +-- controllo se ci sia già un odette per company / flusso / anno +BEGIN TRAN + -- cerco nella tab contatori UDC l'ultimo valido + SET @numOdette = ( + SELECT count(*) + FROM Odette + WHERE CodCS = @CodCS + ) + -- controllo se record c'è... + IF(@numOdette > 0) + BEGIN + -- se c'è incremento di 1 in tab + UPDATE ContatoriUdc + SET LastIdx = LastIdx + 1 + WHERE CodCS = @CodCS + AND Flusso = @Flusso + AND Anno = @Anno + END + ELSE + BEGIN + -- lo creo! + INSERT INTO ContatoriUdc(CodCS, Flusso, Anno, LastIdx) + VALUES (@CodCS, @Flusso, @Anno, 1) + END + -- aggiorno numero UDC + SET @numOdette = ( + SELECT LastIdx + FROM ContatoriUdc + WHERE CodCS = @CodCS + AND Flusso = @Flusso + AND Anno = @Anno + ) +COMMIT TRAN + +-- cerco se ci sia già la riga Odette +DECLARE @udcTrovati AS INT +SET @udcTrovati = ( SELECT COUNT(*) FROM Odette WHERE CampoUDC = @UDC ) + +-- controllo se esista già... se non c'è creo +IF (@udcTrovati = 0) + BEGIN + INSERT INTO Odette(CampoUDC, StatoOk, CodCS) + VALUES(@UDC, 0, @CodCS) + END + +-- calcolo valori x update +DECLARE @DataB AS NVARCHAR(7) +SET @DataB = ( SELECT 'D'+ SUBSTRING(@dataBolla, 3, 6) ) +DECLARE @udcShort NVARCHAR(10) +--SET @udcShort = SUBSTRING(@UDC, 3, LEN(@UDC)-2) -- prendo da 3° carattere perché prima "U" e una lettera x tipo prodotto gitterbox + +-- update valori (sovrascrivo...) +UPDATE Odette +SET Campo3_2 = @numBolla, + Campo3_3 = @numBolla, + Campo4_2 = @IndStabFrom, + Campo9_2 = @qtaCont, + Campo9_3 = @qtaCont, + Campo13_2 = @DataB, + Campo15_2 = @numOdette, + Campo15_3 = @numOdette, + Campo16_2 = @UDC, + CodMag = @CodMag, + GrpBolla = @GrpBolla, + DataBolla = CAST(@dataBolla AS NUMERIC(8,0)), + NumBolla = CAST(@numBolla AS NUMERIC(6,0)), + Particolare = @Particolare, + CodLista = @CodLista +WHERE CampoUDC = @UDC + +RETURN +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +alter table Odette_storico add + CodMag nvarchar(2) not null constraint DF_Odette_storico_CodMag default (''), + GrpBolla nvarchar(1) not null constraint DF_Odette_storico_GrpBolla default (''), + DataBolla numeric(8,0) not null constraint DF_Odette_storico_DataBolla default (0), + NumBolla numeric(6,0) not null constraint DF_Odette_storico_NumBolla default (0), + Particolare nvarchar(15) not null constraint DF_Odette_storico_Particolare default (''), + CodLista nvarchar(12) not null constraint DF_Odette_storico_CodLista default ('') +go + + + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +-- ============================================= +-- Author: Samuele E. Locatelli +-- Create date: 2011-05-20 +-- Description: trigger x inserimento in tab +-- storico record cancellati +-- ============================================= +alter TRIGGER trg_odetteDel + ON Odette + AFTER DELETE +AS +BEGIN + + -- setup variabili e verbosità + SET NOCOUNT ON; + -- inserisco in storico + INSERT INTO Odette_storico + (DataOraDelete,CampoUDC,Campo1_1,Campo1_2,Campo1_3,Campo1_4,Campo1_5,Campo2_1,Campo2_2,Campo2_3,Campo2_4,Campo2_5,Campo3_1, + Campo3_2,Campo3_3,Campo3_4,Campo3_5,Campo4_1,Campo4_2,Campo4_3,Campo4_4,Campo4_5,Campo5_1,Campo5_2,Campo5_3,Campo5_4,Campo5_5, + Campo6_1,Campo6_2,Campo6_3,Campo6_4,Campo6_5,Campo7_1,Campo7_2,Campo7_3,Campo7_4,Campo7_5,Campo8_1,Campo8_2,Campo8_3,Campo8_4, + Campo8_5,Campo9_1,Campo9_2,Campo9_3,Campo9_4,Campo9_5,Campo10_1,Campo10_2,Campo10_3,Campo10_4,Campo10_5,Campo11_1_1,Campo11_1_2, + Campo11_1_3,Campo11_1_4,Campo11_1_5,Campo11_2_1,Campo11_2_2,Campo11_2_3,Campo11_2_4,Campo11_2_5,Campo12_1,Campo12_2,Campo12_3, + Campo12_4,Campo12_5,Campo13_1,Campo13_2,Campo13_3,Campo13_4,Campo13_5,Campo14_1,Campo14_2,Campo14_3,Campo14_4,Campo14_5,Campo15_1, + Campo15_2,Campo15_3,Campo15_4,Campo15_5,Campo16_1,Campo16_2,Campo16_3,Campo16_4,Campo16_5,StatoOk,CodCS,CodMag,GrpBolla,DataBolla, + NumBolla,Particolare,CodLista) + + SELECT GETDATE(), CampoUDC,Campo1_1,Campo1_2,Campo1_3,Campo1_4,Campo1_5,Campo2_1,Campo2_2,Campo2_3,Campo2_4,Campo2_5,Campo3_1, + Campo3_2,Campo3_3,Campo3_4,Campo3_5,Campo4_1,Campo4_2,Campo4_3,Campo4_4,Campo4_5,Campo5_1,Campo5_2,Campo5_3,Campo5_4,Campo5_5, + Campo6_1,Campo6_2,Campo6_3,Campo6_4,Campo6_5,Campo7_1,Campo7_2,Campo7_3,Campo7_4,Campo7_5,Campo8_1,Campo8_2,Campo8_3,Campo8_4, + Campo8_5,Campo9_1,Campo9_2,Campo9_3,Campo9_4,Campo9_5,Campo10_1,Campo10_2,Campo10_3,Campo10_4,Campo10_5,Campo11_1_1,Campo11_1_2, + Campo11_1_3,Campo11_1_4,Campo11_1_5,Campo11_2_1,Campo11_2_2,Campo11_2_3,Campo11_2_4,Campo11_2_5,Campo12_1,Campo12_2,Campo12_3, + Campo12_4,Campo12_5,Campo13_1,Campo13_2,Campo13_3,Campo13_4,Campo13_5,Campo14_1,Campo14_2,Campo14_3,Campo14_4,Campo14_5,Campo15_1, + Campo15_2,Campo15_3,Campo15_4,Campo15_5,Campo16_1,Campo16_2,Campo16_3,Campo16_4,Campo16_5,StatoOk,CodCS,CodMag,GrpBolla,DataBolla, + NumBolla,Particolare,CodLista + FROM deleted + +END +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.ElencoCartellini + VALUES (N'EmptyGBox', N'SP', NULL, NULL, N'', NULL, N'', N'', NULL, NULL, NULL, N'', NULL, 0, N'', NULL, 1, 0, 27.00, N'Fin', 0, 0, 0, NULL, NULL) +go + +commit transaction +go + + + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/***************************************** +* STORED stp_EDM_svuotaGitterbox +* +* Elimina il codice gitterbox dai datamatrix associati (svuotandolo...) +* +* Steamware, S.E.L. +* mod: 2011.05.06 +* +****************************************/ +alter PROCEDURE stp_EDM_svuotaGitterbox +( + @CodGitterbox NVARCHAR(10) +) +AS + +UPDATE ElencoDataMatrix +SET CodGitterbox = 'EmptyGBox' +WHERE CodGitterbox = @CodGitterbox + +-- aggiorno valoti QTA gitterbox originale... +UPDATE ElencoCartellini +SET Qta = ( SELECT COUNT(*) FROM ElencoDataMatrix WHERE CodGitterbox = @CodGitterbox ) +WHERE UDC = @CodGitterbox +-- aggiorno valoti QTA gitterbox 'EmptyGBox +UPDATE ElencoCartellini +SET Qta = ( SELECT COUNT(*) FROM ElencoDataMatrix WHERE CodGitterbox = 'EmptyGBox' ) +WHERE UDC = 'EmptyGBox' + +-- aggiorno righe liste di prelievo... +UPDATE RigheListePrelievo +SET Qta = ( SELECT COUNT(*) FROM ElencoDataMatrix WHERE CodGitterbox = @CodGitterbox ) +WHERE UDC = @CodGitterbox + + + +RETURN +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/***************************************** +* STORED stp_DtMtrx_import +* +* Recupera dati Gitterbox/DataMatrix partendo leggendo dati successivi all'ultimo import e importanto in tab GMW +* +* Steamware, S.E.L. +* mod: 2011.04.29 +* +****************************************/ +alter PROCEDURE stp_DtMtrx_import +( + @CodCS VARCHAR(2), + @IdxPosizione INT +) +AS + +------------------------------------------------------------------------------------------------------ +-- leggo data ultimo import (o creo record...) +------------------------------------------------------------------------------------------------------ +DECLARE @nomeFlusso AS NVARCHAR(50) +DECLARE @lastImport AS DATETIME +DECLARE @trovati AS INT + +-- imposto valori +SET @nomeFlusso = 'DataMatrix' +SET @lastImport = DATEADD(yy,-10,GETDATE()) -- inizializzo a -10 anni ... +-- sistemo tab registrazione import... +BEGIN TRAN + -- cerco nella tab log ultima data caricamento + SET @trovati = ( + SELECT COUNT(*) + FROM logImportFlussi + WHERE NomeFlusso = @nomeFlusso + ) + -- controllo se record c'è... + IF(@trovati > 0) + BEGIN + SET @lastImport = ( SELECT LastImport FROM LogImportFlussi WHERE NomeFlusso = @nomeFlusso ) + END + ELSE + BEGIN + -- lo creo! + INSERT INTO LogImportFlussi(NomeFlusso, LastImport) + VALUES (@nomeFlusso, @lastImport) + END +COMMIT TRAN +------------------------------------------------------------------------------------------------------ + + +------------------------------------------------------------------------------------------------------ +-- ora gestisco il vero caricamento... +------------------------------------------------------------------------------------------------------ + -- filtro e salvo in tabella... gitterbox validi SOLO se iniziano per "U" + DECLARE @newData TABLE + ( + CodDataMatrix numeric(23, 0) , + CodGitterbox char(10) , + NumConchiglia int , + NumDisegno numeric(7, 0) , + EsponenteDisegno tinyint , + CodDifettoScarto varchar(5) , + InizioPreparazione smalldatetime , + FinePreparazione smalldatetime , + InizioIniezione smalldatetime , + FineIniezione smalldatetime , + MagDestinazione varchar(2) , + DataImport smalldatetime + ) + INSERT INTO @newData + SELECT CodDataMatrix, LTRIM(RTRIM(CodGitterbox)), NumConchiglia, NumDisegno, EsponenteDisegno, CodDifettoScarto, InizioPreparazione, FinePreparazione, InizioIniezione, FineIniezione, MagDestinazione, DataImport + + FROM v_trasfDataMatrix + WHERE DataImport > @lastImport AND LEFT(CodGitterbox, 1) = 'U' + AND CodDifettoScarto = '00' -- non importerò gli scarti!!! + + + + + -- creo UDC da gitterbox nuovi + INSERT INTO ElencoCartellini(UDC, Particolare, DataFus) + SELECT DISTINCT nd.CodGitterbox, null, MIN(InizioIniezione) + FROM @newData nd LEFT OUTER JOIN ElencoCartellini ec ON nd.CodGitterbox = ec.UDC + WHERE ec.UDC IS NULL + GROUP BY nd.CodGitterbox + + DECLARE @udc NVARCHAR(50) + DECLARE @Particolare NVARCHAR(50) + DECLARE @NumDisegno NVARCHAR(50) + DECLARE @EsponenteDisegno NVARCHAR(50) + DECLARE @Qta INT + DECLARE @IdxCellaTo INT + DECLARE @adesso DATETIME + DECLARE @posTrovate INT + + SET @adesso = GETDATE() + SET @posTrovate = 0 + + DECLARE cursoreImport CURSOR FOR + SELECT nd.CodGitterbox, tp.Particolare, tp.NumDisegno, tp.EsponenteDisegno, dbo.getNumDatamatrix(nd.CodGitterbox) + FROM @newData nd + INNER JOIN v_transcParticolari tp ON nd.NumDisegno = tp.NumDisegno AND nd.EsponenteDisegno = tp.EsponenteDisegno + + OPEN cursoreImport + FETCH NEXT FROM cursoreImport INTO @udc, @Particolare, @NumDisegno, @EsponenteDisegno, @Qta + + WHILE @@FETCH_STATUS = 0 + BEGIN + + -- aggiorno gli UDC gitterbox esistenti per quantità tra quelli dei dati da importare... + UPDATE ElencoCartellini + SET CodCS = @CodCS, + IdxPosizione = @IdxPosizione, + CreateDate = @adesso, + Particolare = @Particolare, + DisegnoGrezzo = @NumDisegno, + Esponente = @EsponenteDisegno, + Qta = @Qta, + Figura = '', + CodImballo = '', + Tara = 0, + PesoTot = 0, + PesoCad = 0, + CodStato = 'Fin', + NumCont = 1, + TurnoFus = 0, + ModDate = @adesso + WHERE UDC = @udc + + -- indico cella UDC corrente... calcolo la prima cella della nuova posizione... + SET @IdxCellaTo = ( SELECT dbo.f_getCellaByPos(CAST(@IdxPosizione AS NVARCHAR(50))) ) + /*( + SELECT TOP 1 IdxCella FROM Celle + WHERE IdxBlocco = ( + SELECT IdxBlocco FROM Blocchi + WHERE CodMag=CAST(@IdxPosizione AS NVARCHAR(50))) + )*/ + + -- controllo se posizione non ancora creata... + SET @posTrovate = ( SELECT COUNT(*) FROM PosizioneUdcCorrente WHERE UDC = @udc ) + IF( @posTrovate =0) + BEGIN + INSERT INTO PosizioneUdcCorrente + VALUES (@udc, @IdxCellaTo, @CodCS, @adesso) + END + + FETCH NEXT FROM cursoreImport INTO @udc, @Particolare, @NumDisegno, @EsponenteDisegno, @Qta + + + END + + CLOSE cursoreImport + DEALLOCATE cursoreImport + + -- inserisco datamatrix da ultimo import + INSERT INTO ElencoDataMatrix + SELECT * FROM @newData + + -- aggiorno dati ultimo caricamento + SET @lastImport = ( SELECT ISNULL(MAX(DataImport),@lastImport) FROM @newData ) + UPDATE LogImportFlussi + SET LastImport = @lastImport + WHERE NomeFlusso = @nomeFlusso + + +RETURN +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + + +/***************************************** +* STORED stp_DtMtrx_import +* +* Recupera dati Gitterbox/DataMatrix partendo leggendo dati successivi all'ultimo import e importanto in tab GMW +* +* Steamware, S.E.L. +* mod: 2011.04.29 +* +****************************************/ +ALTER PROCEDURE dbo.stp_DtMtrx_import +( + @CodCS VARCHAR(2), + @IdxPosizione INT +) +AS + +------------------------------------------------------------------------------------------------------ +-- leggo data ultimo import (o creo record...) +------------------------------------------------------------------------------------------------------ +DECLARE @nomeFlusso AS NVARCHAR(50) +DECLARE @lastImport AS DATETIME +DECLARE @trovati AS INT + +-- imposto valori +SET @nomeFlusso = 'DataMatrix' +SET @lastImport = DATEADD(yy,-10,GETDATE()) -- inizializzo a -10 anni ... +-- sistemo tab registrazione import... +BEGIN TRAN + -- cerco nella tab log ultima data caricamento + SET @trovati = ( + SELECT COUNT(*) + FROM logImportFlussi + WHERE NomeFlusso = @nomeFlusso + ) + -- controllo se record c'è... + IF(@trovati > 0) + BEGIN + SET @lastImport = ( SELECT LastImport FROM LogImportFlussi WHERE NomeFlusso = @nomeFlusso ) + END + ELSE + BEGIN + -- lo creo! + INSERT INTO LogImportFlussi(NomeFlusso, LastImport) + VALUES (@nomeFlusso, @lastImport) + END +COMMIT TRAN +------------------------------------------------------------------------------------------------------ + + +------------------------------------------------------------------------------------------------------ +-- ora gestisco il vero caricamento... +------------------------------------------------------------------------------------------------------ + -- filtro e salvo in tabella... gitterbox validi SOLO se iniziano per "U" + DECLARE @newData TABLE + ( + CodDataMatrix numeric(23, 0) , + CodGitterbox char(10) , + NumConchiglia int , + NumDisegno numeric(7, 0) , + EsponenteDisegno tinyint , + CodDifettoScarto varchar(5) , + InizioPreparazione smalldatetime , + FinePreparazione smalldatetime , + InizioIniezione smalldatetime , + FineIniezione smalldatetime , + MagDestinazione varchar(2) , + DataImport smalldatetime + ) + INSERT INTO @newData + SELECT CodDataMatrix, LTRIM(RTRIM(CodGitterbox)), NumConchiglia, NumDisegno, EsponenteDisegno, CodDifettoScarto, InizioPreparazione, FinePreparazione, InizioIniezione, FineIniezione, MagDestinazione, DataImport + + FROM v_trasfDataMatrix + WHERE DataImport > @lastImport AND LEFT(CodGitterbox, 1) = 'U' + AND CodDifettoScarto = '00' -- non importerò gli scarti!!! + + + + + -- creo UDC da gitterbox nuovi + INSERT INTO ElencoCartellini(UDC, Particolare, DataFus, Qta) + SELECT DISTINCT nd.CodGitterbox, null, MIN(InizioIniezione), dbo.getNumDatamatrix(nd.CodGitterbox) + FROM @newData nd LEFT OUTER JOIN ElencoCartellini ec ON nd.CodGitterbox = ec.UDC + WHERE ec.UDC IS NULL + GROUP BY nd.CodGitterbox + + DECLARE @udc NVARCHAR(50) + DECLARE @Particolare NVARCHAR(50) + DECLARE @NumDisegno NVARCHAR(50) + DECLARE @EsponenteDisegno NVARCHAR(50) + DECLARE @IdxCellaTo INT + DECLARE @adesso DATETIME + DECLARE @posTrovate INT + + SET @adesso = GETDATE() + SET @posTrovate = 0 + + DECLARE cursoreImport CURSOR FOR + SELECT nd.CodGitterbox, tp.Particolare, tp.NumDisegno, tp.EsponenteDisegno + FROM @newData nd + INNER JOIN v_transcParticolari tp ON nd.NumDisegno = tp.NumDisegno AND nd.EsponenteDisegno = tp.EsponenteDisegno + + OPEN cursoreImport + FETCH NEXT FROM cursoreImport INTO @udc, @Particolare, @NumDisegno, @EsponenteDisegno + + WHILE @@FETCH_STATUS = 0 + BEGIN + + -- aggiorno gli UDC gitterbox esistenti per quantità tra quelli dei dati da importare... + UPDATE ElencoCartellini + SET CodCS = @CodCS, + IdxPosizione = @IdxPosizione, + CreateDate = @adesso, + Particolare = @Particolare, + DisegnoGrezzo = @NumDisegno, + Esponente = @EsponenteDisegno, + Figura = '', + CodImballo = '', + Tara = 0, + PesoTot = 0, + PesoCad = 0, + CodStato = 'Fin', + NumCont = 1, + TurnoFus = 0, + ModDate = @adesso + WHERE UDC = @udc + + -- indico cella UDC corrente... calcolo la prima cella della nuova posizione... + SET @IdxCellaTo = ( SELECT dbo.f_getCellaByPos(CAST(@IdxPosizione AS NVARCHAR(50))) ) + /*( + SELECT TOP 1 IdxCella FROM Celle + WHERE IdxBlocco = ( + SELECT IdxBlocco FROM Blocchi + WHERE CodMag=CAST(@IdxPosizione AS NVARCHAR(50))) + )*/ + + -- controllo se posizione non ancora creata... + SET @posTrovate = ( SELECT COUNT(*) FROM PosizioneUdcCorrente WHERE UDC = @udc ) + IF( @posTrovate =0) + BEGIN + INSERT INTO PosizioneUdcCorrente + VALUES (@udc, @IdxCellaTo, @CodCS, @adesso) + END + + FETCH NEXT FROM cursoreImport INTO @udc, @Particolare, @NumDisegno, @EsponenteDisegno + + + END + + CLOSE cursoreImport + DEALLOCATE cursoreImport + + -- inserisco datamatrix da ultimo import + INSERT INTO ElencoDataMatrix + SELECT * FROM @newData + + -- aggiorno dati ultimo caricamento + SET @lastImport = ( SELECT ISNULL(MAX(DataImport),@lastImport) FROM @newData ) + UPDATE LogImportFlussi + SET LastImport = @lastImport + WHERE NomeFlusso = @nomeFlusso + + +RETURN +go + +commit +go diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 6ffb845b..bb2ea5fe 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 a3836206..836dad96 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/bin/Release/SteamWare.dll b/GMW/GMW_data/bin/Release/SteamWare.dll index 2c05122d..4f995878 100644 Binary files a/GMW/GMW_data/bin/Release/SteamWare.dll and b/GMW/GMW_data/bin/Release/SteamWare.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 6ffb845b..bb2ea5fe 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_Odette.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Odette.Designer.cs.dll index 589edf8f..645542eb 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Odette.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Odette.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 a3836206..836dad96 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/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache index e1f9d411..95a4f244 100644 Binary files a/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll index 8549db65..2d8c3f69 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll differ diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index df36f426..25bd92db 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:{4CB59469-16ED-4876-9B3A-C521C608927F}" - "PackageCode" = "8:{F06DA73C-172D-45BD-9C9C-AD0862B7D0A0}" + "ProductCode" = "8:{778C1F2A-43FD-4222-92D9-364C3A23F5F3}" + "PackageCode" = "8:{79A9067D-02F4-49B6-B862-35429BEFF9A4}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.390" + "ProductVersion" = "8:1.0.392" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index e540125d..4b65aee3 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj index 539093c0..0f715fa9 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -301,14 +301,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" - "ProductCode" = "8:{657D16D4-B3E6-4307-868B-3BE8E732C46D}" - "PackageCode" = "8:{3689D6EB-2830-4354-A460-761F805B11D7}" + "ProductCode" = "8:{DB5DA332-D69E-488E-A9B5-11338F0DA819}" + "PackageCode" = "8:{843A0094-C22F-4A2A-B798-4FEB2193968A}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.390" + "ProductVersion" = "8:1.1.392" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi index e2d2d906..0d3f047b 100644 Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ