diff --git a/GMW/GMW/GMW.Publish.xml b/GMW/GMW/GMW.Publish.xml index e7035ea2..bcb796bf 100644 --- a/GMW/GMW/GMW.Publish.xml +++ b/GMW/GMW/GMW.Publish.xml @@ -1,17 +1,18 @@ - + - + - + + @@ -22,28 +23,34 @@ - + - + - + - + + + - + + + + + @@ -53,26 +60,1011 @@ - + - + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -81,6 +1073,7 @@ + @@ -90,12 +1083,16 @@ + - + - + + + + @@ -107,217 +1104,218 @@ - + - + - - - + + + + + - - + + + - - + - + + - - + + + - + - - - - - + + + + - - + + - - + - + - - - + - - + + - - + - + + - - + - + - - + - + - + - + - + + + - + - - + + - - + - + + - + - - - + + + + - + - - + + + - + - + - + + - - + + + + - - + - - - - + - + - + @@ -326,49 +1324,43 @@ + - - + - + - + - - - + - - - + + - - + - - - + @@ -378,6 +1370,7 @@ + @@ -387,12 +1380,16 @@ + - + - + + + + @@ -404,194 +1401,199 @@ - + - + - - - + + + + + - - + + + - - + - + + - - + + + - + - - - - - + + + + - - + + - - + - + - - - + - - + + - - + - + + - - + - + - - + - + - + - + - + + + - + - - + + - - + - + + - + - - - + + + + - + - - + + + - + - + - + + - - + + + + diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 66ed35ef..df282316 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -938,7 +938,6 @@ - @@ -956,7 +955,6 @@ - @@ -1098,8 +1096,6 @@ - - diff --git a/GMW/GMW/GMW.csproj.user b/GMW/GMW/GMW.csproj.user index 0a8d1633..4f81fa80 100644 --- a/GMW/GMW/GMW.csproj.user +++ b/GMW/GMW/GMW.csproj.user @@ -9,7 +9,7 @@ False False RunFiles - http://localhost/GMW_SP/ + http://localhost/GMW_Test/ False False diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index fa1759c5..d40e595b 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -59,8 +59,8 @@ - - + + @@ -217,14 +217,14 @@ - - - - - + + + + + - + diff --git a/GMW/GMW/Web.config.SP_test b/GMW/GMW/Web.config.SP_test index ae5f13c6..bea270f5 100644 --- a/GMW/GMW/Web.config.SP_test +++ b/GMW/GMW/Web.config.SP_test @@ -59,8 +59,8 @@ - - + + diff --git a/GMW/GMW/Web.config.TK_test b/GMW/GMW/Web.config.TK_test index fa1759c5..71921fe6 100644 --- a/GMW/GMW/Web.config.TK_test +++ b/GMW/GMW/Web.config.TK_test @@ -59,8 +59,8 @@ - - + + diff --git a/GMW/GMW/WebUserControls/mod_anime.ascx.cs b/GMW/GMW/WebUserControls/mod_anime.ascx.cs index f15b2aac..65489bb4 100644 --- a/GMW/GMW/WebUserControls/mod_anime.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_anime.ascx.cs @@ -383,7 +383,7 @@ namespace GMW.WebUserControls try { // creo nuovo UDC del trattamento liquidi - newUdcChild = MagClass.magazzino.creaUdc("AN", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Anim", memLayer.ML.confReadInt("IdxPosizioneAnime"), true, "IdxPosizioneAnime", "UDC_ANIMA", noteTrim, "", DateTime.Now.Year); // !!! "AN" e "Anim" HARD CODED x indicare flusso ANIME + newUdcChild = MagClass.magazzino.creaUdc("AN", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Anim", memLayer.ML.confReadInt("IdxPosizioneAnime"), "IdxPosizioneAnime", "UDC_ANIMA", noteTrim, "", DateTime.Now.Year); // !!! "AN" e "Anim" HARD CODED x indicare flusso ANIME } catch (Exception exc) { diff --git a/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs b/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs index ae470f72..4a3f8c13 100644 --- a/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs @@ -441,7 +441,7 @@ namespace GMW.WebUserControls try { // creo nuovo UDC del trattamento liquidi - newUdcChild = MagClass.magazzino.creaUdc("AN", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "AnimExt", memLayer.ML.confReadInt("IdxPosizioneAnimeExt"), true, "IdxPosizioneAnimeExt", "UDC_ANIMA", noteTrim, "", DateTime.Now.Year); // !!! "AN" e "AnimExt" HARD CODED x indicare flusso ANIME + newUdcChild = MagClass.magazzino.creaUdc("AN", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "AnimExt", memLayer.ML.confReadInt("IdxPosizioneAnimeExt"),"IdxPosizioneAnimeExt", "UDC_ANIMA", noteTrim, "", DateTime.Now.Year); // !!! "AN" e "AnimExt" HARD CODED x indicare flusso ANIME } catch (Exception exc) { diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs index 52edf6e8..abcbf5aa 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs @@ -449,7 +449,7 @@ namespace GMW.WebUserControls try { // creo nuovo UDC del trattamento liquidi - newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidi"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), true, "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", DateTime.Now.Year); // !!! "LI" HARD CODED x indicare flusso liquidi + newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidi"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Liquidi", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", DateTime.Now.Year); // !!! "LI" HARD CODED x indicare flusso liquidi } catch { } @@ -466,7 +466,7 @@ namespace GMW.WebUserControls if (!UdcExists) { // creo UDC - MagClass.magazzino.creaUdc("TR", "", "", "", "", "", "", "", 0, "", "U", MagClass.magazzino.CodSoggCurrUser, 0, 0, 0, DateTime.Now, 0, "Wip", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), false, "IdxPosizioneTrattamenti", "UDC_WIP", "LI", newUdcParent, anno); + MagClass.magazzino.creaUdc("TR", "", "", "", "", "", "", "", 0, "", "U", MagClass.magazzino.CodSoggCurrUser, 0, 0, 0, DateTime.Now, 0, "Trattamenti", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), "IdxPosizioneTrattamenti", "UDC_WIP", "LI", newUdcParent, anno); } // associo tratt termici e liquidi MagClass.magazzino.associaUdcParent(newUdcChild, newUdcParent); diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs index ccd70b6c..fcc984f5 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs @@ -499,7 +499,7 @@ namespace GMW.WebUserControls try { // creo nuovo UDC del trattamento liquidi - newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidiDaSpedire"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), true, "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", DateTime.Now.Year); // !!! "LI" HARD CODED x indicare flusso liquidi + newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidiDaSpedire"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Liquidi", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", DateTime.Now.Year); // !!! "LI" HARD CODED x indicare flusso liquidi } catch { } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 3b4334e4..0e767a9e 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 f2d38e8e..f6d0c3fd 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 98d0c22a..0167d5e5 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 aca42bd7..122b78c4 100644 --- a/GMW/GMW/mazzAppSettingsSP.config +++ b/GMW/GMW/mazzAppSettingsSP.config @@ -6,8 +6,8 @@ - - + + diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config index adcc6956..f8035b8b 100644 --- a/GMW/GMW/mazzAppSettingsSP_test.config +++ b/GMW/GMW/mazzAppSettingsSP_test.config @@ -6,8 +6,8 @@ - - + + diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config index f33cd5d1..06abf4f0 100644 --- a/GMW/GMW/mazzAppSettingsTK.config +++ b/GMW/GMW/mazzAppSettingsTK.config @@ -6,8 +6,8 @@ - - + + diff --git a/GMW/GMW/mazzAppSettingsTK_test.config b/GMW/GMW/mazzAppSettingsTK_test.config index 98d0c22a..0167d5e5 100644 --- a/GMW/GMW/mazzAppSettingsTK_test.config +++ b/GMW/GMW/mazzAppSettingsTK_test.config @@ -6,8 +6,8 @@ - - + + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 3b4334e4..f3ff7ee9 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 d3570af7..6d9d8244 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 be16040b..0e767a9e 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 498e4688..99af8a1d 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_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs index ed9aef2f..cf76e7bc 100644 --- a/GMW/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW/GMW_data/DS_Applicazione.Designer.cs @@ -15925,7 +15925,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[12]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.ElencoCartellini"; @@ -16016,71 +16016,61 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 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_rettMovAs400"; + this._commandCollection[6].CommandText = "dbo.stp_riattivaUdc"; 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("@Particolare", 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("@UDC", 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("@CodMagAS", 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("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", 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("@UDC", global::System.Data.SqlDbType.VarChar, 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("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 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_riattivaUdc"; + this._commandCollection[7].CommandText = "dbo.stp_sbloccaUdc"; 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.VarChar, 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("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, 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_sbloccaUdc"; + this._commandCollection[8].CommandText = "dbo.stp_UDC_associaParent"; 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.VarChar, 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("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, 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("@UDC", 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("@UDC_parent", 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_UDC_associaParent"; + this._commandCollection[9].CommandText = "dbo.stp_UDC_delete_byRdQ"; 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, 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("@UDC_parent", 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("@nRapQual", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 6, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExecBatchInter", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; - this._commandCollection[10].CommandText = "dbo.stp_UDC_delete_byRdQ"; + this._commandCollection[10].CommandText = "dbo.stp_UDC_update"; this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nRapQual", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 6, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExecBatchInter", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[11].Connection = this.Connection; - this._commandCollection[11].CommandText = "dbo.stp_UDC_update"; - this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure; - this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_edit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Anno", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStampo", global::System.Data.SqlDbType.VarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Esponente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.VarChar, 4, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TurnoFus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImballo", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tara", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoTot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoCad", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStato", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_parent", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_edit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Anno", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImpianto", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStampo", global::System.Data.SqlDbType.VarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Esponente", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Figura", global::System.Data.SqlDbType.VarChar, 4, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TurnoFus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImballo", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tara", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoTot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PesoCad", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStato", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC_parent", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16586,7 +16576,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno string CodStato, string UDC_parent, string Note) { - this.Adapter.SelectCommand = this.CommandCollection[11]; + this.Adapter.SelectCommand = this.CommandCollection[10]; if ((UDC_edit == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -17707,61 +17697,10 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno return this.Update(Original_UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Esponente, CodImpianto, DescImpianto, CodStampo, Figura, DataFus, TurnoFus, CodImballo, CodSoggetto, NumCont, Tara, Qta, CodStato, IdxPosizione, PesoTot, PesoCad, CreateDate, ModDate, Note, Original_UDC, Original_CodCS, Original_CodCliente, Original_RagSociale, Original_Particolare, Original_DescParticolare, Original_DisegnoGrezzo, Original_Esponente, Original_CodImpianto, Original_DescImpianto, Original_CodStampo, Original_Figura, Original_DataFus, Original_TurnoFus, Original_CodImballo, Original_CodSoggetto, Original_NumCont, Original_Tara, Original_Qta, Original_CodStato, Original_IdxPosizione, Original_PesoTot, Original_PesoCad, Original_CreateDate, Original_ModDate, Original_Note); } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_rettMovAs400(string Particolare, string UDC, string CodMagAS, global::System.Nullable Qta, string CodEvento) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; - if ((Particolare == null)) { - command.Parameters[1].Value = global::System.DBNull.Value; - } - else { - command.Parameters[1].Value = ((string)(Particolare)); - } - if ((UDC == null)) { - command.Parameters[2].Value = global::System.DBNull.Value; - } - else { - command.Parameters[2].Value = ((string)(UDC)); - } - if ((CodMagAS == null)) { - command.Parameters[3].Value = global::System.DBNull.Value; - } - else { - command.Parameters[3].Value = ((string)(CodMagAS)); - } - if ((Qta.HasValue == true)) { - command.Parameters[4].Value = ((decimal)(Qta.Value)); - } - else { - command.Parameters[4].Value = global::System.DBNull.Value; - } - if ((CodEvento == null)) { - command.Parameters[5].Value = global::System.DBNull.Value; - } - else { - command.Parameters[5].Value = ((string)(CodEvento)); - } - global::System.Data.ConnectionState previousConnectionState = command.Connection.State; - if (((command.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - command.Connection.Open(); - } - int returnValue; - try { - returnValue = command.ExecuteNonQuery(); - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - command.Connection.Close(); - } - } - return returnValue; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_riattivaUdc(string UDC, string CodSoggetto) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -17794,7 +17733,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_sbloccaUdc(string UDC, string CodSoggetto) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -17827,7 +17766,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_UDC_associaParent(string UDC, string UDC_parent) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -17860,7 +17799,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_UDC_delete_byRdQ(global::System.Nullable nRapQual, global::System.Nullable ExecBatchInter) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((nRapQual.HasValue == true)) { command.Parameters[1].Value = ((decimal)(nRapQual.Value)); } diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd index 8c2fde31..e1d67634 100644 --- a/GMW/GMW_data/DS_Applicazione.xsd +++ b/GMW/GMW_data/DS_Applicazione.xsd @@ -799,22 +799,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - - - - dbo.stp_rettMovAs400 - - - - - - - - - - - - + dbo.stp_riattivaUdc @@ -826,7 +811,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_sbloccaUdc @@ -838,7 +823,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_UDC_associaParent @@ -850,7 +835,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_UDC_delete_byRdQ @@ -1680,8 +1665,8 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - - + + @@ -1694,14 +1679,14 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + @@ -1714,14 +1699,14 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + @@ -1734,14 +1719,14 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + @@ -1754,35 +1739,35 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + @@ -1795,35 +1780,35 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + @@ -1836,21 +1821,21 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + @@ -1863,93 +1848,93 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -1963,22 +1948,22 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - - - - + + + + - - - - - - + + + + + + @@ -1991,7 +1976,7 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + @@ -2018,96 +2003,96 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + @@ -2189,21 +2174,21 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + @@ -2216,42 +2201,42 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + - + @@ -2264,14 +2249,14 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + @@ -2284,21 +2269,21 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + @@ -2311,56 +2296,56 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + - + - + - + @@ -2373,14 +2358,14 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + @@ -2393,171 +2378,171 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - + - + - + - + - + - + - + @@ -2570,171 +2555,171 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - + - + - + - + - + - + - + @@ -2747,74 +2732,74 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - - - + + + - + - + - + - - + + - - + + - + - + - + - + diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss index 090f06dc..ecc57cbe 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. --> - + @@ -13,7 +13,7 @@ - + diff --git a/GMW/GMW_data/DS_SM.Designer.cs b/GMW/GMW_data/DS_SM.Designer.cs index 20089bfe..33900139 100644 --- a/GMW/GMW_data/DS_SM.Designer.cs +++ b/GMW/GMW_data/DS_SM.Designer.cs @@ -954,8 +954,6 @@ namespace GMW_data { private global::System.Data.DataColumn columnIdxPosizioneTo; - private global::System.Data.DataColumn columntoAs400; - private global::System.Data.DataColumn columnIdxBloccoTo; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1009,13 +1007,6 @@ namespace GMW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Data.DataColumn toAs400Column { - get { - return this.columntoAs400; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public global::System.Data.DataColumn IdxBloccoToColumn { get { @@ -1052,13 +1043,12 @@ namespace GMW_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public TabTranPosizEventiRow AddTabTranPosizEventiRow(AnagTipoEventoRow parentAnagTipoEventoRowByFK_TabTranPosizEventi_AnagTipoEvento, AnagPosizioniRow parentAnagPosizioniRowByFK_TabTranPosizEventi_AnagPosizioni, int IdxPosizioneTo, bool toAs400, int IdxBloccoTo) { + public TabTranPosizEventiRow AddTabTranPosizEventiRow(AnagTipoEventoRow parentAnagTipoEventoRowByFK_TabTranPosizEventi_AnagTipoEvento, AnagPosizioniRow parentAnagPosizioniRowByFK_TabTranPosizEventi_AnagPosizioni, int IdxPosizioneTo, int IdxBloccoTo) { TabTranPosizEventiRow rowTabTranPosizEventiRow = ((TabTranPosizEventiRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, null, IdxPosizioneTo, - toAs400, IdxBloccoTo}; if ((parentAnagTipoEventoRowByFK_TabTranPosizEventi_AnagTipoEvento != null)) { columnValuesArray[0] = parentAnagTipoEventoRowByFK_TabTranPosizEventi_AnagTipoEvento[0]; @@ -1095,7 +1085,6 @@ namespace GMW_data { this.columnCodEvento = base.Columns["CodEvento"]; this.columnIdxPosizione = base.Columns["IdxPosizione"]; this.columnIdxPosizioneTo = base.Columns["IdxPosizioneTo"]; - this.columntoAs400 = base.Columns["toAs400"]; this.columnIdxBloccoTo = base.Columns["IdxBloccoTo"]; } @@ -1107,8 +1096,6 @@ namespace GMW_data { base.Columns.Add(this.columnIdxPosizione); this.columnIdxPosizioneTo = new global::System.Data.DataColumn("IdxPosizioneTo", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnIdxPosizioneTo); - this.columntoAs400 = new global::System.Data.DataColumn("toAs400", typeof(bool), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columntoAs400); this.columnIdxBloccoTo = new global::System.Data.DataColumn("IdxBloccoTo", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnIdxBloccoTo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { @@ -1930,21 +1917,6 @@ namespace GMW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public bool toAs400 { - get { - try { - return ((bool)(this[this.tableTabTranPosizEventi.toAs400Column])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'toAs400\' in table \'TabTranPosizEventi\' is DBNull.", e); - } - } - set { - this[this.tableTabTranPosizEventi.toAs400Column] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public int IdxBloccoTo { get { @@ -1990,16 +1962,6 @@ namespace GMW_data { this[this.tableTabTranPosizEventi.IdxPosizioneToColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public bool IstoAs400Null() { - return this.IsNull(this.tableTabTranPosizEventi.toAs400Column); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public void SettoAs400Null() { - this[this.tableTabTranPosizEventi.toAs400Column] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsIdxBloccoToNull() { return this.IsNull(this.tableTabTranPosizEventi.IdxBloccoToColumn); @@ -3132,12 +3094,11 @@ SELECT CodEvento, DescEvento FROM AnagTipoEvento WHERE (CodEvento = @CodEvento)" tableMapping.ColumnMappings.Add("CodEvento", "CodEvento"); tableMapping.ColumnMappings.Add("IdxPosizione", "IdxPosizione"); tableMapping.ColumnMappings.Add("IdxPosizioneTo", "IdxPosizioneTo"); - tableMapping.ColumnMappings.Add("toAs400", "toAs400"); tableMapping.ColumnMappings.Add("IdxBloccoTo", "IdxBloccoTo"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[TabTranPosizEventi] WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo)) AND ((@IsNull_toAs400 = 1 AND [toAs400] IS NULL) OR ([toAs400] = @Original_toAs400)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [TabTranPosizEventi] WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -3145,36 +3106,30 @@ SELECT CodEvento, DescEvento FROM AnagTipoEvento WHERE (CodEvento = @CodEvento)" this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizioneTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneTo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxBloccoTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxBloccoTo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxBloccoTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxBloccoTo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_toAs400", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "toAs400", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_toAs400", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "toAs400", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[TabTranPosizEventi] ([CodEvento], [IdxPosizione], [IdxPosizioneTo], [IdxBloccoTo], [toAs400]) VALUES (@CodEvento, @IdxPosizione, @IdxPosizioneTo, @IdxBloccoTo, @toAs400); -SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [TabTranPosizEventi] ([CodEvento], [IdxPosizione], [IdxPosizioneTo], [IdxBloccoTo]) VALUES (@CodEvento, @IdxPosizione, @IdxPosizioneTo, @IdxBloccoTo); +SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizioneTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneTo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBloccoTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxBloccoTo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@toAs400", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "toAs400", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[TabTranPosizEventi] SET [CodEvento] = @CodEvento, [IdxPosizione] = @IdxPosizione, [IdxPosizioneTo] = @IdxPosizioneTo, [IdxBloccoTo] = @IdxBloccoTo, [toAs400] = @toAs400 WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo)) AND ((@IsNull_toAs400 = 1 AND [toAs400] IS NULL) OR ([toAs400] = @Original_toAs400))); -SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [TabTranPosizEventi] SET [CodEvento] = @CodEvento, [IdxPosizione] = @IdxPosizione, [IdxPosizioneTo] = @IdxPosizioneTo, [IdxBloccoTo] = @IdxBloccoTo WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo))); +SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizioneTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneTo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBloccoTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxBloccoTo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@toAs400", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "toAs400", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodEvento", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodEvento", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxPosizioneTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneTo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPosizioneTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxPosizioneTo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_IdxBloccoTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxBloccoTo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxBloccoTo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxBloccoTo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_toAs400", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "toAs400", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_toAs400", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "toAs400", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3188,7 +3143,8 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra 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 * FROM dbo.TabTranPosizEventi"; + this._commandCollection[0].CommandText = "SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo FROM TabTranPosizEven" + + "ti"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -3293,7 +3249,7 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(string Original_CodEvento, int Original_IdxPosizione, global::System.Nullable Original_IdxPosizioneTo, global::System.Nullable Original_IdxBloccoTo, global::System.Nullable Original_toAs400) { + public virtual int Delete(string Original_CodEvento, int Original_IdxPosizione, global::System.Nullable Original_IdxPosizioneTo, global::System.Nullable Original_IdxBloccoTo) { if ((Original_CodEvento == null)) { throw new global::System.ArgumentNullException("Original_CodEvento"); } @@ -3317,14 +3273,6 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; } - if ((Original_toAs400.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[7].Value = ((bool)(Original_toAs400.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[7].Value = global::System.DBNull.Value; - } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -3344,7 +3292,7 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string CodEvento, int IdxPosizione, global::System.Nullable IdxPosizioneTo, global::System.Nullable IdxBloccoTo, global::System.Nullable toAs400) { + public virtual int Insert(string CodEvento, int IdxPosizione, global::System.Nullable IdxPosizioneTo, global::System.Nullable IdxBloccoTo) { if ((CodEvento == null)) { throw new global::System.ArgumentNullException("CodEvento"); } @@ -3364,12 +3312,6 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra else { this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((toAs400.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[4].Value = ((bool)(toAs400.Value)); - } - else { - this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; - } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -3389,7 +3331,7 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string CodEvento, int IdxPosizione, global::System.Nullable IdxPosizioneTo, global::System.Nullable IdxBloccoTo, global::System.Nullable toAs400, string Original_CodEvento, int Original_IdxPosizione, global::System.Nullable Original_IdxPosizioneTo, global::System.Nullable Original_IdxBloccoTo, global::System.Nullable Original_toAs400) { + public virtual int Update(string CodEvento, int IdxPosizione, global::System.Nullable IdxPosizioneTo, global::System.Nullable IdxBloccoTo, string Original_CodEvento, int Original_IdxPosizione, global::System.Nullable Original_IdxPosizioneTo, global::System.Nullable Original_IdxBloccoTo) { if ((CodEvento == null)) { throw new global::System.ArgumentNullException("CodEvento"); } @@ -3409,42 +3351,28 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra else { this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((toAs400.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[4].Value = ((bool)(toAs400.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; - } if ((Original_CodEvento == null)) { throw new global::System.ArgumentNullException("Original_CodEvento"); } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_CodEvento)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_CodEvento)); } - this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_IdxPosizione)); + this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(Original_IdxPosizione)); if ((Original_IdxPosizioneTo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_IdxPosizioneTo.Value)); + this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_IdxPosizioneTo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; } if ((Original_IdxBloccoTo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_IdxBloccoTo.Value)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_IdxBloccoTo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; - } - if ((Original_toAs400.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((bool)(Original_toAs400.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -3465,8 +3393,8 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(global::System.Nullable IdxPosizioneTo, global::System.Nullable IdxBloccoTo, global::System.Nullable toAs400, string Original_CodEvento, int Original_IdxPosizione, global::System.Nullable Original_IdxPosizioneTo, global::System.Nullable Original_IdxBloccoTo, global::System.Nullable Original_toAs400) { - return this.Update(Original_CodEvento, Original_IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400, Original_CodEvento, Original_IdxPosizione, Original_IdxPosizioneTo, Original_IdxBloccoTo, Original_toAs400); + public virtual int Update(global::System.Nullable IdxPosizioneTo, global::System.Nullable IdxBloccoTo, string Original_CodEvento, int Original_IdxPosizione, global::System.Nullable Original_IdxPosizioneTo, global::System.Nullable Original_IdxBloccoTo) { + return this.Update(Original_CodEvento, Original_IdxPosizione, IdxPosizioneTo, IdxBloccoTo, Original_CodEvento, Original_IdxPosizione, Original_IdxPosizioneTo, Original_IdxBloccoTo); } } diff --git a/GMW/GMW_data/DS_SM.xsd b/GMW/GMW_data/DS_SM.xsd index eae8fb3a..0b0a37b8 100644 --- a/GMW/GMW_data/DS_SM.xsd +++ b/GMW/GMW_data/DS_SM.xsd @@ -117,10 +117,10 @@ SELECT CodEvento, DescEvento FROM AnagTipoEvento WHERE (CodEvento = @CodEvento)< - + - DELETE FROM [dbo].[TabTranPosizEventi] WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo)) AND ((@IsNull_toAs400 = 1 AND [toAs400] IS NULL) OR ([toAs400] = @Original_toAs400))) + DELETE FROM [TabTranPosizEventi] WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo))) @@ -128,48 +128,42 @@ SELECT CodEvento, DescEvento FROM AnagTipoEvento WHERE (CodEvento = @CodEvento)< - - - INSERT INTO [dbo].[TabTranPosizEventi] ([CodEvento], [IdxPosizione], [IdxPosizioneTo], [IdxBloccoTo], [toAs400]) VALUES (@CodEvento, @IdxPosizione, @IdxPosizioneTo, @IdxBloccoTo, @toAs400); -SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione) + INSERT INTO [TabTranPosizEventi] ([CodEvento], [IdxPosizione], [IdxPosizioneTo], [IdxBloccoTo]) VALUES (@CodEvento, @IdxPosizione, @IdxPosizioneTo, @IdxBloccoTo); +SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione) - - SELECT * FROM dbo.TabTranPosizEventi + SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo FROM TabTranPosizEventi - UPDATE [dbo].[TabTranPosizEventi] SET [CodEvento] = @CodEvento, [IdxPosizione] = @IdxPosizione, [IdxPosizioneTo] = @IdxPosizioneTo, [IdxBloccoTo] = @IdxBloccoTo, [toAs400] = @toAs400 WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo)) AND ((@IsNull_toAs400 = 1 AND [toAs400] IS NULL) OR ([toAs400] = @Original_toAs400))); -SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione) + UPDATE [TabTranPosizEventi] SET [CodEvento] = @CodEvento, [IdxPosizione] = @IdxPosizione, [IdxPosizioneTo] = @IdxPosizioneTo, [IdxBloccoTo] = @IdxBloccoTo WHERE (([CodEvento] = @Original_CodEvento) AND ([IdxPosizione] = @Original_IdxPosizione) AND ((@IsNull_IdxPosizioneTo = 1 AND [IdxPosizioneTo] IS NULL) OR ([IdxPosizioneTo] = @Original_IdxPosizioneTo)) AND ((@IsNull_IdxBloccoTo = 1 AND [IdxBloccoTo] IS NULL) OR ([IdxBloccoTo] = @Original_IdxBloccoTo))); +SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo FROM TabTranPosizEventi WHERE (CodEvento = @CodEvento) AND (IdxPosizione = @IdxPosizione) - - - @@ -179,7 +173,6 @@ SELECT CodEvento, IdxPosizione, IdxPosizioneTo, IdxBloccoTo, toAs400 FROM TabTra - @@ -326,22 +319,22 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + - - + + @@ -354,14 +347,14 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + @@ -374,25 +367,24 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - - - - + + + - - + + @@ -405,21 +397,21 @@ SELECT CodTipoDelibera, DescDelibera, CodEvento FROM AnagTipoDelibere WHERE (Cod - + - + - + diff --git a/GMW/GMW_data/DS_SM.xss b/GMW/GMW_data/DS_SM.xss index 2e6b2bea..48e6cf03 100644 --- a/GMW/GMW_data/DS_SM.xss +++ b/GMW/GMW_data/DS_SM.xss @@ -8,7 +8,7 @@ - + diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 5f97dce2..a74145cc 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -288,6 +288,7 @@ + @@ -315,6 +316,10 @@ + + + + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index e0bcd3e5..df084012 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -473,14 +473,13 @@ namespace GMW_data /// Peso unitario rilevato /// Codice dello stato del pezzo (da anagrafica: sabbiato, ...) /// Codice del magazzino in cui inserire l'UDC - /// TRUE = genera movimento AS400, FALSE = NON genera movimento di magazzino /// NOME della posizione default in cui creare UDC /// cod evento da associare al movimento mag /// note (opzionali) /// cod UDC pre-calcolato, se "" verrà calcolato dalla query /// anno in cui intestare i cartellini, trimma a 2 cifre DX /// UDC del nuovo cartellino per FINITI - public string creaUdc(string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_Parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag, bool toAS400, string defIdxPosiz, string codEvento, string note, string UDC, int anno) + public string creaUdc(string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_Parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag, string defIdxPosiz, string codEvento, string note, string UDC, int anno) { // trim fix string CodBilanciaTrim = CodBilancia.Trim(); @@ -530,7 +529,7 @@ namespace GMW_data { try { - logger.lg.scriviLog(string.Format("NUOVO cartellino da postazione: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} | {14} | {15} | {16} | {17} | {18} | {19} | {20} | {21} | {22} | {23}", CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, toAS400, noteTrim), tipoLog.INFO); + logger.lg.scriviLog(string.Format("NUOVO cartellino da postazione: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} | {14} | {15} | {16} | {17} | {18} | {19} | {20} | {21} | {22}", CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, noteTrim), tipoLog.INFO); } catch { } @@ -558,11 +557,6 @@ namespace GMW_data } catch { } - // se NON richiesto di generare movimento a magazzino crea rettifica in tab batch - if (!toAS400) - { - DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); - } return answ; } /// diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_440_POST Installazione_SP.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_440_POST Installazione_SP.sql new file mode 100644 index 00000000..586fa310 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_440_POST Installazione_SP.sql @@ -0,0 +1,243 @@ + + +-- Aggiorno le relazioni UDC mancanti con la data creazione UDC_child +UPDATE RelazUDC +SET dataMod = el.CreateDate +FROM RelazUDC As Rl +INNER JOIN ElencoCartellini AS el ON Rl.UDC_child = el.UDC +WHERE rl.dataMod = '2012-01-01' + + +-- Inserisco Evento di ripristino dell' UDC Finito +INSERT [dbo].[TabTranPosizEventi] +VALUES('UDC_CONS',-4,4,0,1) + +-- Metto anche questo anche se non serve visto che non fa scarico AS400 +INSERT [dbo].[TabTranPosizEventi] +VALUES('UDC_CONS',-6,6,0,0) + + + +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +/*************************************** +* STORED stp_selDestListePrelByConditio +* +* Ottiene i destinatari delle liste di prelievo data la condizione indicata +* +* Steamware, S.E.L. +* mod: 2010.11.02 +* +****************************************/ +ALTER PROCEDURE [dbo].[stp_selDestListePrelByConditio] +( + @conditio NVARCHAR(20) +) +AS + +IF (@conditio='01-PreFus') +BEGIN + SELECT CAST('*' AS NVARCHAR(6)) AS value, CAST('*' AS NVARCHAR(50)) AS label, '01-PreFus' AS conditio +END + +ELSE IF (@conditio='01-PreAnim') +BEGIN + SELECT CAST(CodCliente AS NVARCHAR(6)) AS value, CAST(CodCliente AS NVARCHAR(6)) +'- ' +CAST(RagSociale AS NVARCHAR(50)) AS label, '01-PreAnim' AS conditio + FROM RilPro.AnagClienti + ORDER BY label +END + +ELSE IF (@conditio='02-PreCli') +BEGIN + SELECT CAST(CodCliente AS NVARCHAR(6)) AS value, CAST(CodCliente AS NVARCHAR(6)) +'- ' +CAST(RagSociale AS NVARCHAR(50)) AS label, '02-PreCli' AS conditio + FROM RilPro.AnagClienti + ORDER BY label +END + +ELSE IF (@conditio='04-OdetSP') +BEGIN + SELECT CAST(CodCliente AS NVARCHAR(6)) AS value, CAST(CodCliente AS NVARCHAR(6)) +'- ' +CAST(RagSociale AS NVARCHAR(50)) AS label, '04-OdetSP' AS conditio + FROM RilPro.AnagClienti + ORDER BY label +END + +ELSE IF (@conditio='05-TerAn') +BEGIN + SELECT CAST(CodTerzista AS NVARCHAR(6)) AS value, CAST(CodTerzista AS NVARCHAR(6))+ '- '+CAST(DescTerzista AS NVARCHAR(50)) AS label, '05-TerAn' AS conditio + FROM RilPro.AnagDepositi + ORDER BY label +END + +ELSE IF (@conditio='03-TerWip') +BEGIN + SELECT CAST(CodTerzista AS NVARCHAR(6)) AS value, CAST(CodTerzista AS NVARCHAR(6))+ '- '+CAST(DescTerzista AS NVARCHAR(50)) AS label, '03-TerWip' AS conditio + FROM RilPro.AnagDepositi + ORDER BY label +END + +ELSE -- Se non configurata prendo elenco destinatari esterni +BEGIN + SELECT CAST(CodTerzista AS NVARCHAR(6)) AS value, CAST(CodTerzista AS NVARCHAR(6))+ '- '+CAST(DescTerzista AS NVARCHAR(50)) AS label, '99-Terzis' AS conditio + FROM RilPro.AnagDepositi + ORDER BY label +END + +RETURN + +GO + + + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + + + +-- ============================================= +-- Author: Samuele E. Locatelli +-- Create date: 2009-09-20 mod. 2012-03-14 +-- Description: trigger x inserimento movimenti +-- nella coda di trasferimento batch +-- verso AS400 x UPDATE UDC +-- ============================================= +ALTER TRIGGER [dbo].[trg_updMovAS] + ON [dbo].[ElencoCartellini] + AFTER UPDATE +AS +BEGIN + + -- setup variabili e verbosità + SET NOCOUNT ON; + DECLARE @partOk AS BIT + DECLARE @currUdc AS NVARCHAR(50) + DECLARE @IdxPosFrom AS INT + DECLARE @IdxPosTo AS INT + DECLARE @magFrom AS NVARCHAR(50) + DECLARE @magTo AS NVARCHAR(50) + DECLARE @qta AS DECIMAL(10,2) + DECLARE @qtaOld AS DECIMAL(10,2) + DECLARE @IdxPosizioneComp INT + DECLARE @toAs400 BIT + + -- e se modificano il codice UDC ??? o + di uno ? + -- ciclo solo solo se è cambiata la posizione o la quantità + DECLARE cursore CURSOR FOR + SELECT CASE WHEN ISNULL(i.Particolare,'n.d.') = 'n.d.' THEN 0 ELSE 1 END, i.UDC + FROM inserted AS i + INNER JOIN deleted AS d ON i.UDC = d.UDC + WHERE ( (i.IdxPosizione <> d.IdxPosizione) OR (i.Qta <> d.Qta) ) + AND i.Particolare IS NOT NULL + + OPEN cursore + FETCH NEXT FROM cursore INTO @partOk, @currUdc + + WHILE @@FETCH_STATUS = 0 + BEGIN + -- controllo che CI SIA il particolare (altrimenti non eseguo) + IF(@partOk = 1) + -- Prendo la idxposizione e qta precedente + SELECT @qtaOld = Qta , @IdxPosFrom = IdxPosizione FROM deleted WHERE UDC = @currUdc + -- Prendo la idxposizione e qta nuova + SELECT @qta = Qta , @IdxPosTo = IdxPosizione FROM inserted WHERE UDC = @currUdc + + -- se c'è stata modifica di quantità inizio a rettificare quella + IF ( (UPDATE(Qta)) AND (@qta <> @qtaOld) ) + BEGIN + -- registro il VERO movimento se previsto verso AS400 + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_MOD', Particolare, UDC, + CAST(IdxPosizione AS NVARCHAR(50)), @qta - Qta + FROM deleted + WHERE UDC = @currUdc AND CAST(IdxPosizione AS NVARCHAR(50)) IN + (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + -- controllo: se il magazzino di destinazione richiede una compensazione registro il 2° movimento di compensazione + -- calcolo il mag di compensazione + SET @IdxPosizioneComp = ISNULL( (SELECT CAST(ISNULL(CodMagAS_compensaz,0) AS INT) FROM AS400_MagCont + WHERE (Attivo = 1) AND (CodMagAS = CAST(@IdxPosFrom AS NVARCHAR(50))) + ),0) + -- Se il Magazzino compensazione non è 0 ed esiste compenso + IF (@IdxPosizioneComp > 0) + BEGIN + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_COMP', Particolare, UDC, + CAST(@IdxPosizioneComp AS NVARCHAR(50)), Qta - @qta + FROM deleted + WHERE UDC = @currUdc + -- AND CAST(IdxPosizione AS NVARCHAR(50)) IN (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + END + END + + -- controllo se devo fare rettifiche quantità in base a IdxPosizioneTo ... + SET @toAs400 = ( SELECT TOP 1 toAs400 as valore + FROM TabTranPosizEventi + WHERE IdxPosizione = @IdxPosFrom AND IdxPosizioneTo = @IdxPosTo AND CodEvento = 'UDC_CONS' ) -- NON E' CORRETTO!!!! DOVEVA ESSERE MAX !!! + + -- controllo poi se sia cambiato il magazzino logico (IdxPosizione) e si richieda update verso AS400, altrimenti non lo inserisco + IF (UPDATE(IdxPosizione) AND @IdxPosFrom <> @IdxPosTo AND @toAs400 = 1) + BEGIN + -- Le trasformo nelle equivalenti stringhe del codMag SE attive + SET @magFrom = ( SELECT CodMagAS FROM AS400_MagCont + WHERE Attivo = 1 AND CodMagAs = CAST(@IdxPosFrom AS NVARCHAR(50))) + SET @magTo = ( SELECT CodMagAS FROM AS400_MagCont + WHERE Attivo = 1 AND CodMagAs = CAST(@IdxPosTo AS NVARCHAR(50))) + + -- inserisco un movimento di deposito verso mag nuovo (SE attivo) + IF @magFrom IS NOT NULL + BEGIN + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_MOV', Particolare, UDC, + CAST(IdxPosizione AS NVARCHAR(50)), -@qta + FROM deleted + WHERE UDC = @currUdc AND CAST(IdxPosizione AS NVARCHAR(50)) IN + (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + END + -- inserisco un movimento di prelievo verso mag vecchio (SE attivo) + IF @magTo IS NOT NULL + BEGIN + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_MOV', Particolare, UDC, + CAST(IdxPosizione AS NVARCHAR(50)), @qta + FROM inserted + WHERE UDC = @currUdc AND CAST(IdxPosizione AS NVARCHAR(50)) IN + (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + END + END + FETCH NEXT FROM cursore INTO @partOk, @currUdc + END + + CLOSE cursore + DEALLOCATE cursore + +END + + + + + + + + +-- Lemma mancante +Print 'Da Fare su VOCABOLARIO' + +USE SP_Vocabolario +EXEC dbo.stp_insNewLemma @lemma = N'05-TerAn', @traduzione = N'Anime Terzista' + +Print 'Da Fare su VOCABOLARIO' + + diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_440_POST Installazione_TK.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_440_POST Installazione_TK.sql new file mode 100644 index 00000000..93c2ce75 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_440_POST Installazione_TK.sql @@ -0,0 +1,254 @@ + + +-- Aggiorno le relazioni UDC mancanti con la data creazione UDC_child +UPDATE RelazUDC +SET dataMod = el.CreateDate +FROM RelazUDC As Rl +INNER JOIN ElencoCartellini AS el ON Rl.UDC_child = el.UDC +WHERE rl.dataMod = '2012-01-01' + + +-- Sistemo CodStato x cartellini Anime vecchi con stato 'Fin' +UPDATE dbo.ElencoCartellini +SET CodStato = 'Anim' +WHERE IdxPosizione = 2 OR IdxPosizione = -2 + + +-- Disattivo Lista Prelievo Anime Terzista perchè effettua cmq scarico +UPDATE dbo.TipoListaPrelievo +SET enabled = 0 +WHERE CodTipoLista = '05-TerAn' + +-- Inserisco Evento di ripristino dell' UDC Anime +INSERT [dbo].[TabTranPosizEventi] +VALUES('UDC_CONS',-2,2,0,1) + +-- Metto anche questo anche se non serve visto che non fa scarico AS400 +INSERT [dbo].[TabTranPosizEventi] +VALUES('UDC_CONS',-6,6,0,0) + + + +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +/*************************************** +* STORED stp_selDestListePrelByConditio +* +* Ottiene i destinatari delle liste di prelievo data la condizione indicata +* +* Steamware, S.E.L. +* mod: 2010.11.02 +* +****************************************/ +ALTER PROCEDURE [dbo].[stp_selDestListePrelByConditio] +( + @conditio NVARCHAR(20) +) +AS + +IF (@conditio='01-PreFus') +BEGIN + SELECT CAST('*' AS NVARCHAR(6)) AS value, CAST('*' AS NVARCHAR(50)) AS label, '01-PreFus' AS conditio +END + +ELSE IF (@conditio='01-PreAnim') +BEGIN + SELECT CAST(CodCliente AS NVARCHAR(6)) AS value, CAST(CodCliente AS NVARCHAR(6)) +'- ' +CAST(RagSociale AS NVARCHAR(50)) AS label, '01-PreAnim' AS conditio + FROM RilPro.AnagClienti + ORDER BY label +END + +ELSE IF (@conditio='02-PreCli') +BEGIN + SELECT CAST(CodCliente AS NVARCHAR(6)) AS value, CAST(CodCliente AS NVARCHAR(6)) +'- ' +CAST(RagSociale AS NVARCHAR(50)) AS label, '02-PreCli' AS conditio + FROM RilPro.AnagClienti + ORDER BY label +END + +ELSE IF (@conditio='04-OdetSP') +BEGIN + SELECT CAST(CodCliente AS NVARCHAR(6)) AS value, CAST(CodCliente AS NVARCHAR(6)) +'- ' +CAST(RagSociale AS NVARCHAR(50)) AS label, '04-OdetSP' AS conditio + FROM RilPro.AnagClienti + ORDER BY label +END + +ELSE IF (@conditio='05-TerAn') +BEGIN + SELECT CAST(CodTerzista AS NVARCHAR(6)) AS value, CAST(CodTerzista AS NVARCHAR(6))+ '- '+CAST(DescTerzista AS NVARCHAR(50)) AS label, '05-TerAn' AS conditio + FROM RilPro.AnagDepositi + ORDER BY label +END + +ELSE IF (@conditio='03-TerWip') +BEGIN + SELECT CAST(CodTerzista AS NVARCHAR(6)) AS value, CAST(CodTerzista AS NVARCHAR(6))+ '- '+CAST(DescTerzista AS NVARCHAR(50)) AS label, '03-TerWip' AS conditio + FROM RilPro.AnagDepositi + ORDER BY label +END + +ELSE -- Se non configurata prendo elenco destinatari esterni +BEGIN + SELECT CAST(CodTerzista AS NVARCHAR(6)) AS value, CAST(CodTerzista AS NVARCHAR(6))+ '- '+CAST(DescTerzista AS NVARCHAR(50)) AS label, '99-Terzis' AS conditio + FROM RilPro.AnagDepositi + ORDER BY label +END + +RETURN + +GO + + + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + + + +-- ============================================= +-- Author: Samuele E. Locatelli +-- Create date: 2009-09-20 mod. 2012-03-14 +-- Description: trigger x inserimento movimenti +-- nella coda di trasferimento batch +-- verso AS400 x UPDATE UDC +-- ============================================= +ALTER TRIGGER [dbo].[trg_updMovAS] + ON [dbo].[ElencoCartellini] + AFTER UPDATE +AS +BEGIN + + -- setup variabili e verbosità + SET NOCOUNT ON; + DECLARE @partOk AS BIT + DECLARE @currUdc AS NVARCHAR(50) + DECLARE @IdxPosFrom AS INT + DECLARE @IdxPosTo AS INT + DECLARE @magFrom AS NVARCHAR(50) + DECLARE @magTo AS NVARCHAR(50) + DECLARE @qta AS DECIMAL(10,2) + DECLARE @qtaOld AS DECIMAL(10,2) + DECLARE @IdxPosizioneComp INT + DECLARE @toAs400 BIT + + -- e se modificano il codice UDC ??? o + di uno ? + -- ciclo solo solo se è cambiata la posizione o la quantità + DECLARE cursore CURSOR FOR + SELECT CASE WHEN ISNULL(i.Particolare,'n.d.') = 'n.d.' THEN 0 ELSE 1 END, i.UDC + FROM inserted AS i + INNER JOIN deleted AS d ON i.UDC = d.UDC + WHERE ( (i.IdxPosizione <> d.IdxPosizione) OR (i.Qta <> d.Qta) ) + AND i.Particolare IS NOT NULL + + OPEN cursore + FETCH NEXT FROM cursore INTO @partOk, @currUdc + + WHILE @@FETCH_STATUS = 0 + BEGIN + -- controllo che CI SIA il particolare (altrimenti non eseguo) + IF(@partOk = 1) + -- Prendo la idxposizione e qta precedente + SELECT @qtaOld = Qta , @IdxPosFrom = IdxPosizione FROM deleted WHERE UDC = @currUdc + -- Prendo la idxposizione e qta nuova + SELECT @qta = Qta , @IdxPosTo = IdxPosizione FROM inserted WHERE UDC = @currUdc + + -- se c'è stata modifica di quantità inizio a rettificare quella + IF ( (UPDATE(Qta)) AND (@qta <> @qtaOld) ) + BEGIN + -- registro il VERO movimento se previsto verso AS400 + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_MOD', Particolare, UDC, + CAST(IdxPosizione AS NVARCHAR(50)), @qta - Qta + FROM deleted + WHERE UDC = @currUdc AND CAST(IdxPosizione AS NVARCHAR(50)) IN + (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + -- controllo: se il magazzino di destinazione richiede una compensazione registro il 2° movimento di compensazione + -- calcolo il mag di compensazione + SET @IdxPosizioneComp = ISNULL( (SELECT CAST(ISNULL(CodMagAS_compensaz,0) AS INT) FROM AS400_MagCont + WHERE (Attivo = 1) AND (CodMagAS = CAST(@IdxPosFrom AS NVARCHAR(50))) + ),0) + -- Se il Magazzino compensazione non è 0 ed esiste compenso + IF (@IdxPosizioneComp > 0) + BEGIN + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_COMP', Particolare, UDC, + CAST(@IdxPosizioneComp AS NVARCHAR(50)), Qta - @qta + FROM deleted + WHERE UDC = @currUdc + -- AND CAST(IdxPosizione AS NVARCHAR(50)) IN (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + END + END + + -- controllo se devo fare rettifiche quantità in base a IdxPosizioneTo ... + SET @toAs400 = ( SELECT TOP 1 toAs400 as valore + FROM TabTranPosizEventi + WHERE IdxPosizione = @IdxPosFrom AND IdxPosizioneTo = @IdxPosTo AND CodEvento = 'UDC_CONS' ) -- NON E' CORRETTO!!!! DOVEVA ESSERE MAX !!! + + -- controllo poi se sia cambiato il magazzino logico (IdxPosizione) e si richieda update verso AS400, altrimenti non lo inserisco + IF (UPDATE(IdxPosizione) AND @IdxPosFrom <> @IdxPosTo AND @toAs400 = 1) + BEGIN + -- Le trasformo nelle equivalenti stringhe del codMag SE attive + SET @magFrom = ( SELECT CodMagAS FROM AS400_MagCont + WHERE Attivo = 1 AND CodMagAs = CAST(@IdxPosFrom AS NVARCHAR(50))) + SET @magTo = ( SELECT CodMagAS FROM AS400_MagCont + WHERE Attivo = 1 AND CodMagAs = CAST(@IdxPosTo AS NVARCHAR(50))) + + -- inserisco un movimento di deposito verso mag nuovo (SE attivo) + IF @magFrom IS NOT NULL + BEGIN + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_MOV', Particolare, UDC, + CAST(IdxPosizione AS NVARCHAR(50)), -@qta + FROM deleted + WHERE UDC = @currUdc AND CAST(IdxPosizione AS NVARCHAR(50)) IN + (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + END + -- inserisco un movimento di prelievo verso mag vecchio (SE attivo) + IF @magTo IS NOT NULL + BEGIN + INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita) + ( + SELECT GETDATE(), 'UDC_MOV', Particolare, UDC, + CAST(IdxPosizione AS NVARCHAR(50)), @qta + FROM inserted + WHERE UDC = @currUdc AND CAST(IdxPosizione AS NVARCHAR(50)) IN + (SELECT CodMagAS FROM AS400_MagCont WHERE Attivo = 1) + ) + END + END + FETCH NEXT FROM cursore INTO @partOk, @currUdc + END + + CLOSE cursore + DEALLOCATE cursore + +END + + + + + + + + +-- Lemma mancante +Print 'Da Fare su VOCABOLARIO' + +USE TK_Vocabolario +EXEC dbo.stp_insNewLemma @lemma = N'05-TerAn', @traduzione = N'Anime Terzista' + +Print 'Da Fare su VOCABOLARIO' + + diff --git a/GMW/GMW_data/SqlScripts/V2.0/GMW_00449_struttura.sql b/GMW/GMW_data/SqlScripts/V2.0/GMW_00449_struttura.sql new file mode 100644 index 00000000..3681bd3e --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V2.0/GMW_00449_struttura.sql @@ -0,0 +1,443 @@ +set xact_abort on +go + +begin transaction +go + +alter table AS400_BatchMovimenti drop + constraint FK_AS400_BatchMovimenti_AS400_MagCont , + constraint FK_AS400_BatchMovimenti_AnagTipoEvento +go + +exec sp_rename 'PK_AS400_BatchMovimenti', 'tmp__PK_AS400_BatchMovimenti', 'OBJECT' +go + +exec sp_rename 'AS400_BatchMovimenti', 'tmp__AS400_BatchMovimenti_0', 'OBJECT' +go + +create table AS400_BatchMovimenti( + IdxBatch int not null identity constraint PK_AS400_BatchMovimenti primary key, + DataIns datetime not null, + numOp int, + CodEvento nvarchar(10) not null, + Particolare nvarchar(15) not null, + UDC nvarchar(50) not null, + CodMagAS nvarchar(50) not null, + Quantita decimal(10,2) not null, + DataBatch datetime, + DataVerifica datetime +) +go + +alter table AS400_BatchMovimenti add + constraint FK_AS400_BatchMovimenti_AnagTipoEvento foreign key(CodEvento) references AnagTipoEvento(CodEvento) on update cascade, + constraint FK_AS400_BatchMovimenti_AS400_MagCont foreign key(CodMagAS) references AS400_MagCont(CodMagAS) on update cascade +go + +exec sp_addextendedproperty 'MS_Description', 'dataora inserimento in coda caricamento', 'SCHEMA', 'dbo', 'TABLE', 'AS400_BatchMovimenti', 'COLUMN', 'DataIns' +go + +exec sp_addextendedproperty 'MS_Description', 'NON MODIFICARE: nel codice si usano questi campi x chiamate...', 'SCHEMA', 'dbo', 'TABLE', 'AS400_BatchMovimenti', 'COLUMN', 'CodEvento' +go + +exec sp_addextendedproperty 'MS_Description', 'dataora di caricamento batch verso AS', 'SCHEMA', 'dbo', 'TABLE', 'AS400_BatchMovimenti', 'COLUMN', 'DataBatch' +go + +exec sp_addextendedproperty 'MS_Description', N'dataora in cui è stato verificato il caricamento su AS', 'SCHEMA', 'dbo', 'TABLE', 'AS400_BatchMovimenti', 'COLUMN', 'DataVerifica' +go + +set identity_insert AS400_BatchMovimenti on +go + +insert into AS400_BatchMovimenti(IdxBatch,DataIns,CodEvento,Particolare,UDC,CodMagAS,Quantita,DataBatch,DataVerifica) select IdxBatch,DataIns,CodEvento,Particolare,UDC,CodMagAS,Quantita,DataBatch,DataVerifica from tmp__AS400_BatchMovimenti_0 +go + +set identity_insert AS400_BatchMovimenti off +go + +drop table tmp__AS400_BatchMovimenti_0 +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +create table GiornaleMagazzino( + numOp int not null identity constraint PK_GiornaleMagazzino primary key, + OP nchar(1) not null, + DataOra datetime not null, + UDC nvarchar(50) not null, + Particolare nvarchar(15) not null, + CodStatoFrom nvarchar(50) not null, + CodStatoTo nvarchar(50) not null, + IdxPosizioneFrom int not null, + IdxPosizioneTo int not null, + QtaFrom decimal(10,2) not null, + QtaTo decimal(10,2) not null, + DataOraProc datetime +) +go + +exec sp_addextendedproperty 'MS_Description', 'tipo operazione I(nsert), U(pdate), D(elete)', 'SCHEMA', 'dbo', 'TABLE', 'GiornaleMagazzino', 'COLUMN', 'OP' +go + +commit +go + + +alter table AS400_MagCont drop + column Attivo, + constraint DF_AS400_MagCont_CodMagAS_compensaz , + column CodMagAS_compensaz +go + + +set xact_abort on +go + +begin transaction +go + +create table TabSyncMovMag( + CodCS nchar(2) not null, + CodStatoFrom nvarchar(50) not null, + CodStatoTo nvarchar(50) not null, + IdxPosizioneFrom int not null, + IdxPosizioneTo int not null, + toExt bit not null constraint DF_TabSyncMovMag_toAs400 default (1), + codMagExtFrom nvarchar(50), + codMagExtTo nvarchar(50), + codMagExtComp nvarchar(50), + note nvarchar(500), + + constraint PK_TabSyncMovMag primary key(CodCS,CodStatoFrom,CodStatoTo,IdxPosizioneFrom,IdxPosizioneTo) +) +go + +exec sp_addextendedproperty 'MS_Description', 'posizione (stato) logica di partenza', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'IdxPosizioneFrom' +go + +exec sp_addextendedproperty 'MS_Description', 'posizione (stato) logica di arrivo', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'IdxPosizioneTo' +go + +exec sp_addextendedproperty 'MS_Description', 'determina se inviare l''informazione al sistema esterno', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'toExt' +go + +exec sp_addextendedproperty 'MS_Description', 'cod magazzino from, NULL significa non valido e non utilizzato', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'codMagExtFrom' +go + +exec sp_addextendedproperty 'MS_Description', 'cod magazzino from, NULL significa non valido e non utilizzato', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'codMagExtTo' +go + +exec sp_addextendedproperty 'MS_Description', 'cod magazzino from, 0 o null significa non valido', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'codMagExtComp' +go + +exec sp_addextendedproperty 'MS_Description', 'descrizione della regola', 'SCHEMA', 'dbo', 'TABLE', 'TabSyncMovMag', 'COLUMN', 'note' +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +alter table TabTranPosizEventi add + CodStatoTo nvarchar(50), + Note nvarchar(500) +go + +exec sp_addextendedproperty 'MS_Description', 'descrizione della regola', 'SCHEMA', 'dbo', 'TABLE', 'TabTranPosizEventi', 'COLUMN', 'Note' +go + +alter table TabTranPosizEventi drop + constraint DF_TabTranPosizEventi_toAs400 , + column toAs400 +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +-- ============================================= +-- Author: Samuele E. Locatelli +-- Create date: 2009-09-20 +-- Mod Date: 2012-05-25 +-- Description: trigger x movimenti di inserimento +-- nella tab GiornaleMagazzino +-- ============================================= +alter TRIGGER trg_InsMovAS + ON ElencoCartellini + AFTER INSERT +AS +BEGIN + + -- setup variabili e verbosità + SET NOCOUNT ON; + -- metto in Giornale Magazzino i record inseriti + INSERT INTO GiornaleMagazzino(OP, DataOra, UDC, Particolare, CodStatoFrom, CodStatoTo, IdxPosizioneFrom, IdxPosizioneTo, QtaFrom, QtaTo) + ( + SELECT 'I', GETDATE(), UDC, ISNULL(Particolare,''), 'NEW', CodStato, 0, IdxPosizione, 0, Qta + FROM inserted + ) + +END +go + +-- ============================================= +-- Author: Samuele E. Locatelli +-- Create date: 2009-09-20 +-- Mod Date: 2012-05-25 +-- Description: trigger x movimenti di cancellazione +-- nella tab GiornaleMagazzino +-- ============================================= +alter TRIGGER trg_DelMovAS + ON ElencoCartellini + AFTER DELETE +AS +BEGIN + + -- setup variabili e verbosità + SET NOCOUNT ON; + -- inserisco movimenti AS + INSERT INTO GiornaleMagazzino(OP, DataOra, UDC, Particolare, CodStatoFrom, CodStatoTo, IdxPosizioneFrom, IdxPosizioneTo, QtaFrom, QtaTo) + ( + SELECT 'D', GETDATE(), UDC, ISNULL(Particolare,''), CodStato, 'DEL', IdxPosizione, 0, Qta, 0 + FROM deleted + ) + +END +go + +-- ============================================= +-- Author: Samuele E. Locatelli +-- Create date: 2009-09-20 mod. 2012-03-14 +-- Description: trigger x inserimento movimenti +-- nella tab GiornaleMagazzino +-- ============================================= +alter TRIGGER trg_updMovAS + ON ElencoCartellini + AFTER UPDATE +AS +BEGIN + + + /******************************************************************************* + * Gestione UPDATE ElencoCartellini --> GiornaleMagazzino + * + * regola1: si fanno registrazioni solo se varia ALMENO UNO tra + * - quantità + * - idxPosizione + * - codStato + * + * regola 2: + * - Particolare deve essere valorizzato ALMENO a '' (blank) + * + * regola3: in caso di update SIA di quantità che di posizione/stato + * - si genera UN PRIMO RECORD di modifica quantità a posizione e stato FISSI + * - si genera UN SECONDO RECORD con variazione posizione/stato + * + *******************************************************************************/ + + -- setup variabili e verbosità + SET NOCOUNT ON; + DECLARE @dataOra AS DATETIME + SET @dataOra = GETDATE() + + -- PRIMO STEP: quantità! + IF( UPDATE(Qta) ) + BEGIN + + INSERT INTO GiornaleMagazzino(OP, DataOra, UDC, Particolare, CodStatoFrom, CodStatoTo, IdxPosizioneFrom, IdxPosizioneTo, QtaFrom, QtaTo) + ( + SELECT 'U', @dataOra, i.UDC, ISNULL(d.Particolare,''), d.CodStato, d.CodStato, d.IdxPosizione, d.IdxPosizione, d.Qta, i.Qta + FROM inserted AS i + INNER JOIN deleted AS d ON i.UDC = d.UDC + WHERE ( (i.Qta <> d.Qta) ) + ) + + END + + -- ora controllo in caso di modifica di stato o posizione + IF(UPDATE(CodStato) OR UPDATE(IdxPosizione)) + BEGIN + + INSERT INTO GiornaleMagazzino(OP, DataOra, UDC, Particolare, CodStatoFrom, CodStatoTo, IdxPosizioneFrom, IdxPosizioneTo, QtaFrom, QtaTo) + ( + SELECT 'U', @dataOra, i.UDC, ISNULL(d.Particolare,''), d.CodStato, i.CodStato, d.IdxPosizione, i.IdxPosizione, i.Qta, i.Qta + FROM inserted AS i + INNER JOIN deleted AS d ON i.UDC = d.UDC + WHERE ( ( i.IdxPosizione <> d.IdxPosizione) OR (i.CodStato <> d.CodStato) ) + ) + + END + +END +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/***************************************** +* STORED stp_processaGiornaleMagazzino +* +* processa il giornale del magazzino, in modo da controlalre tutte le righe non processate (o eventualmente solo quelle nuove) +* e spostare nella coda di trasferimento con AS400 SOLO i movimenti che soddisfano i criteri specificati nella tabella +* "TabSyncMovMag" +* +* Steamware, S.E.L. +* mod: 2012.05.25 +* +****************************************/ +create PROCEDURE BatchQueue.stp_processaGiornaleMagazzino +( + @CodCS NCHAR(2), + @lastInsDate DATETIME -- data-ora da cui cercare i record, se non viene passata è l'ultimo movimento registrato +) +AS + +BEGIN TRAN + + /********************************************************************************** + * + * PROCEDURA in 4 step: + * - STEP 1: registro rettifiche QUANTITA' in FROM + * - STEP 2: registro prelievi da mag ext "from" (cambio mag) + * - STEP 3: registro depositi a mag ext "to" (cambio mag) + * - STEP 4: registro compensazioni: se from e to corrispondono e mag comp è NON NULLO metto in comp! + **********************************************************************************/ + + -- in primis: se è nulla la data calcolo l'ultim data di processing... + IF ( @lastInsDate IS NULL ) + BEGIN + SET @lastInsDate = ( SELECT ISNULL(MAX(DataOra), '19000101') FROM GiornaleMagazzino WHERE NOT (DataOraProc IS NULL) ) + END + + -- ATTENZIONE!!! DEVE ESSERCI UN PARTICOLARE NON NULLO e != "n.d." + + -- ora prendo tutte le righe che mi interessano e cerco match sulla tab TabSyncMovMag e le inserisco in batch... + + -- STEP 1: rettifico quantità! + INSERT INTO AS400_BatchMovimenti(DataIns, numOp, CodEvento, Particolare, UDC, CodMagAS, Quantita) + SELECT DataOra, numOp, 'UDC_MOD', gm.Particolare, gm.UDC, tsmm.codMagExtFrom , gm.QtaTo - gm.QtaFrom + FROM GiornaleMagazzino gm + INNER JOIN TabSyncMovMag tsmm ON + tsmm.CodCS = @CodCS AND + gm.CodStatoFrom = tsmm.CodStatoFrom AND + gm.CodStatoTo = tsmm.CodStatoTo AND + gm.IdxPosizioneFrom = tsmm.IdxPosizioneFrom AND + gm.IdxPosizioneTo = tsmm.IdxPosizioneTo + WHERE (gm.DataOra >= @lastInsDate) + AND (gm.DataOraProc IS NULL) + AND (tsmm.toExt = 1) + AND gm.Particolare <> '' -- particolare deve essere disponibile!!!! + AND (tsmm.codMagExtFrom = codMagExtTo)-- NON VARIA MAG ESTERNO... + + -- STEP 2: genero ora casi con 2 mag ext che cambiano: tolgo da FROM + INSERT INTO AS400_BatchMovimenti(DataIns, numOp, CodEvento, Particolare, UDC, CodMagAS, Quantita) + SELECT DataOra, numOp, 'UDC_MOV', gm.Particolare, gm.UDC, tsmm.codMagExtFrom , - gm.QtaTo + FROM GiornaleMagazzino gm + INNER JOIN TabSyncMovMag tsmm ON + tsmm.CodCS = @CodCS AND + gm.CodStatoFrom = tsmm.CodStatoFrom AND + gm.CodStatoTo = tsmm.CodStatoTo AND + gm.IdxPosizioneFrom = tsmm.IdxPosizioneFrom AND + gm.IdxPosizioneTo = tsmm.IdxPosizioneTo + WHERE (gm.DataOra >= @lastInsDate) + AND (gm.DataOraProc IS NULL) + AND (tsmm.toExt = 1) + AND gm.Particolare <> '' -- particolare deve essere disponibile!!!! + AND (tsmm.codMagExtFrom <> codMagExtTo)-- VARIA MAG ESTERNO... + AND (tsmm.codMagExtFrom IS NOT NULL ) -- magazzino non nullo + AND (tsmm.codMagExtTo IS NOT NULL ) -- magazzino non nullo + + -- STEP 3: genero ora casi con 2 mag ext che cambiano: metto in TO + INSERT INTO AS400_BatchMovimenti(DataIns, numOp, CodEvento, Particolare, UDC, CodMagAS, Quantita) + SELECT DataOra, numOp, 'UDC_MOV', gm.Particolare, gm.UDC, tsmm.codMagExtTo , gm.QtaTo + FROM GiornaleMagazzino gm INNER JOIN TabSyncMovMag tsmm ON + tsmm.CodCS = @CodCS AND + gm.CodStatoFrom = tsmm.CodStatoFrom AND + gm.CodStatoTo = tsmm.CodStatoTo AND + gm.IdxPosizioneFrom = tsmm.IdxPosizioneFrom AND + gm.IdxPosizioneTo = tsmm.IdxPosizioneTo + WHERE (gm.DataOra >= @lastInsDate) + AND (gm.DataOraProc IS NULL) + AND (tsmm.toExt = 1) + AND gm.Particolare <> '' -- particolare deve essere disponibile!!!! + AND (tsmm.codMagExtFrom <> codMagExtTo)-- VARIA MAG ESTERNO... + AND (tsmm.codMagExtFrom IS NOT NULL ) -- magazzino non nullo + AND (tsmm.codMagExtTo IS NOT NULL ) -- magazzino non nullo + + + -- STEP 4: cerco prima casi con magazzini ext origine = destinazione e compensazioni + INSERT INTO AS400_BatchMovimenti(DataIns, numOp, CodEvento, Particolare, UDC, CodMagAS, Quantita) + SELECT DataOra, numOp, 'UDC_COMP', gm.Particolare, gm.UDC, tsmm.codMagExtComp, gm.QtaFrom - gm.QtaTo + FROM GiornaleMagazzino gm + INNER JOIN TabSyncMovMag tsmm ON + tsmm.CodCS = @CodCS AND + gm.CodStatoFrom = tsmm.CodStatoFrom AND + gm.CodStatoTo = tsmm.CodStatoTo AND + gm.IdxPosizioneFrom = tsmm.IdxPosizioneFrom AND + gm.IdxPosizioneTo = tsmm.IdxPosizioneTo + WHERE (gm.DataOra >= @lastInsDate) + AND (gm.DataOraProc IS NULL) + AND (tsmm.toExt = 1) + AND gm.Particolare <> '' -- particolare deve essere disponibile!!!! + AND (tsmm.codMagExtComp IS NOT NULL) -- HO compensazioni!!! + AND (tsmm.codMagExtFrom = codMagExtTo)-- E NON VARIA MAG ESTERNO... + + -- ora aggiorno le stesse righe riportate indicando la data ora di processing... + UPDATE gm + SET DataOraProc = GETDATE() + FROM GiornaleMagazzino gm INNER JOIN AS400_BatchMovimenti abm ON + CAST(gm.numOp AS NVARCHAR(10)) = abm.CodEvento + WHERE (gm.DataOra >= @lastInsDate) + AND (gm.DataOraProc IS NULL) + +COMMIT TRAN + +RETURN +go + +commit +go + + +drop procedure stp_rettMovAs400 +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(449, GETDATE()) +GO diff --git a/GMW/GMW_data/SqlScripts/V2.0/GMW_00450_dati.sql b/GMW/GMW_data/SqlScripts/V2.0/GMW_00450_dati.sql new file mode 100644 index 00000000..f996de6f --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V2.0/GMW_00450_dati.sql @@ -0,0 +1,98 @@ +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinGBox', N'DEL', 4, 0, 1, N'4', NULL, NULL, N'ELIMINO e riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinGBox', N'FinGBox', -4, 4, 0, NULL, NULL, NULL, N'ANNULLO consumo un UDC da DataMatrix NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinGBox', N'FinGBox', 4, -4, 0, NULL, NULL, NULL, N'consumo un UDC da DataMatrix NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinGBox', N'FinGBox', 4, 4, 1, N'4', N'4', NULL, N'registro modifiche quantità') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinGBox', N'FinGBox', 4, 200, 0, NULL, NULL, NULL, N'prelevato da LDP ODETTE ??? - scarico fatto da bolla') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinGBox', N'FinGBox', 200, 4, 0, NULL, NULL, NULL, N'ANNULLO prelievo da LDP ODETTE ??? - scarico fatto da bolla') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinLiq', N'DEL', 4, 0, 1, N'4', NULL, NULL, N'ELIMINO e riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinLiq', N'FinGBox', -4, 4, 1, N'4', N'4', NULL, N'ANNULLO consumo un UDC Liquidi riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinLiq', N'FinGBox', 4, -4, 1, N'4', N'4', NULL, N'consumo un UDC Liquidi riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinLiq', N'FinLiq', 4, 4, 1, N'4', N'4', NULL, N'registro modifiche quantità') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinLiq', N'FinLiq', 4, 200, 0, NULL, NULL, NULL, N'consumo da LDP ODETTE ??? - scarico fatto da bolla') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'FinLiq', N'FinLiq', 200, 4, 0, NULL, NULL, NULL, N'consumo da LDP ODETTE ??? - scarico fatto da bolla') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'MP', N'MP', -6, 6, 0, NULL, NULL, NULL, N'ANNULLO consumo MP NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'MP', N'MP', 6, -6, 0, NULL, NULL, NULL, N'consumo MP NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'NEW', N'FinGBox', 0, 4, 0, NULL, N'4', NULL, N'creo un UDC da DataMatrix NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'NEW', N'FinLiq', 0, 4, 1, NULL, N'4', NULL, N'creo un UDC da Liquidi riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'SP', N'NEW', N'MP', 0, 6, 0, NULL, N'6', NULL, N'carico MP NON riporto a sistema ext') +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.TabSyncMovMag + VALUES (N'AM', N'WIP', N'WIP', 88, 88, 1, N'88', N'88', N'84', N'Gestione con compensazione AMBIVERE') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'Anim', N'Anim', -2, 2, 1, N'2', N'2', NULL, N'ANNULLO consumo UDC interno un anima riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'Anim', N'Anim', 2, -2, 1, N'2', N'2', NULL, N'consumo da LDP interno un anima riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'Anim', N'Anim', 2, 2, 1, N'2', N'2', NULL, N'registro modifiche quantità') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'Anim', N'DEL', 2, 0, 1, N'2', NULL, NULL, N'ELIMINO e riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'AnimExt', N'AnimExt', -2, 2, 0, N'2', N'2', NULL, N'ANNULLO consumo UDC interno un anima esterna riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'AnimExt', N'AnimExt', 2, -2, 0, N'2', N'2', NULL, N'consumo da LDP interno un anima esterna riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'AnimExt', N'AnimExt', 2, 2, 0, N'2', N'2', NULL, N'registro modifiche quantità: NO perchè carico da bolla') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'AnimExt', N'AnimExt', 2222, 2, 0, NULL, N'2', NULL, N'ANNULLO consumo UDC ESTERNO un anima esterna riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'AnimExt', N'DEL', 2, 0, 0, NULL, NULL, NULL, N'ELIMINO un anima esterna NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'AnimExt', N'DEL', 2222, 0, 0, NULL, NULL, NULL, N'cancello un anima ESTERNA- vecchio giro') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'MP', N'MP', -6, 6, 0, NULL, NULL, NULL, N'consumo MP NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'MP', N'MP', 6, -6, 0, NULL, NULL, NULL, N'consumo MP NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'NEW', N'Anim', 0, 2, 1, NULL, N'2', NULL, N'creo un anima riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'NEW', N'AnimExt', 0, 2, 0, NULL, N'2', NULL, N'creo un anima ESTERNA NON riporto a sistema ext') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'NEW', N'AnimExt', 0, 2222, 0, NULL, NULL, NULL, N'creo un anima ESTERNA- vecchio giro') +INSERT INTO dbo.TabSyncMovMag + VALUES (N'TK', N'NEW', N'MP', 0, 6, 0, NULL, N'6', NULL, N'carico MP NON riporto a sistema ext') +go + +commit transaction +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(450, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index f2d38e8e..89404b41 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 35ac286f..f6d0c3fd 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index f2d38e8e..89404b41 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 2dcad6c6..3af587ed 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/obj/Debug/TempPE/DS_SM.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_SM.Designer.cs.dll index 2bbfd32f..81550c55 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_SM.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_SM.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 35ac286f..f6d0c3fd 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/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index bc62d492..9238069c 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll index ceac8641..aba66c11 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll differ diff --git a/GMW/GMW_deploy/InstallerSP/GMW.csproj b/GMW/GMW_deploy/InstallerSP/GMW.csproj index e942f45d..66ed35ef 100644 --- a/GMW/GMW_deploy/InstallerSP/GMW.csproj +++ b/GMW/GMW_deploy/InstallerSP/GMW.csproj @@ -1039,6 +1039,8 @@ + + diff --git a/GMW/GMW_deploy/InstallerSP/Web.config.SP_test b/GMW/GMW_deploy/InstallerSP/Web.config.SP_test new file mode 100644 index 00000000..bea270f5 --- /dev/null +++ b/GMW/GMW_deploy/InstallerSP/Web.config.SP_test @@ -0,0 +1,267 @@ + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_deploy/InstallerSP/Web.config.TK_test b/GMW/GMW_deploy/InstallerSP/Web.config.TK_test new file mode 100644 index 00000000..71921fe6 --- /dev/null +++ b/GMW/GMW_deploy/InstallerSP/Web.config.TK_test @@ -0,0 +1,266 @@ + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_deploy/Source/Web.config.SP_test b/GMW/GMW_deploy/Source/Web.config.SP_test new file mode 100644 index 00000000..bea270f5 --- /dev/null +++ b/GMW/GMW_deploy/Source/Web.config.SP_test @@ -0,0 +1,267 @@ + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_deploy/Source/Web.config.TK_test b/GMW/GMW_deploy/Source/Web.config.TK_test new file mode 100644 index 00000000..71921fe6 --- /dev/null +++ b/GMW/GMW_deploy/Source/Web.config.TK_test @@ -0,0 +1,266 @@ + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_deploy/Source/obj/Release/build.force b/GMW/GMW_deploy/Source/obj/Release/build.force new file mode 100644 index 00000000..e69de29b diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj index dff94629..f2aeecde 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -375,14 +375,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" - "ProductCode" = "8:{A157A9F8-D6CC-47D5-B06C-3CF0D7B01E42}" - "PackageCode" = "8:{3530464A-7659-4007-B1B8-D05D84C6F87D}" + "ProductCode" = "8:{6E02F7CA-ED99-40CD-8B38-8EF23BC9A6C2}" + "PackageCode" = "8:{9D9A1142-6DCB-4F1E-92B6-340F74A97E74}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.439" + "ProductVersion" = "8:2.0.450" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -827,7 +827,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_110D6612090D4EDA92F772F593B23D78" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\InstallerTK\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D" @@ -855,7 +855,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_179F2C709A0749C4A5EBA956FADE7EE3" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\InstallerTK\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D" diff --git a/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi b/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi index 00de2801..016bf0ec 100644 Binary files a/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi and b/GMW/GMW_test_installer/InstallerSP/GMW_test_installer.msi differ