diff --git a/Projects/GimDB/LiveDb2File.scmp b/Projects/GimDB/LiveDb2File.scmp index b9c27ac..a07b12a 100644 --- a/Projects/GimDB/LiveDb2File.scmp +++ b/Projects/GimDB/LiveDb2File.scmp @@ -320,10 +320,46 @@ AllowDropBlockingAssemblies False + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseOptions + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlErrorMessage + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLogin + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerRoleMembership + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServer + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServerLogin + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlFile + ExcludedType + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerDdlTrigger ExcludedType + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlMasterKey + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlCredential + ExcludedType + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlRoute ExcludedType @@ -336,34 +372,6 @@ Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEndpoint ExcludedType - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlErrorMessage - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlFile - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLogin - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServer - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlCredential - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseEncryptionKey - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlMasterKey - ExcludedType - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseAuditSpecification ExcludedType @@ -381,7 +389,7 @@ ExcludedType - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlUserDefinedServerRole + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseEncryptionKey ExcludedType @@ -389,15 +397,7 @@ ExcludedType - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseOptions - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServerLogin - ExcludedType - - - Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerRoleMembership + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlUserDefinedServerRole ExcludedType @@ -411,16 +411,4 @@ 100 Equals_Objects,Not_Supported_Deploy - - - - - - db_owner - - - - steamware - - \ No newline at end of file diff --git a/Projects/GimDB/Security/RoleMemberships.sql b/Projects/GimDB/Security/RoleMemberships.sql new file mode 100644 index 0000000..49bf978 --- /dev/null +++ b/Projects/GimDB/Security/RoleMemberships.sql @@ -0,0 +1,6 @@ +ALTER ROLE [db_owner] ADD MEMBER [steamware]; + + + + + diff --git a/Projects/GimDB/Security/import.sql b/Projects/GimDB/Security/import.sql new file mode 100644 index 0000000..086d504 --- /dev/null +++ b/Projects/GimDB/Security/import.sql @@ -0,0 +1,5 @@ +CREATE SCHEMA [import] + AUTHORIZATION [dbo]; + + + diff --git a/Projects/GimDB/Security/som_ita.sql b/Projects/GimDB/Security/som_ita.sql index 6a814ad..d55f653 100644 --- a/Projects/GimDB/Security/som_ita.sql +++ b/Projects/GimDB/Security/som_ita.sql @@ -1,3 +1,7 @@ CREATE SCHEMA [som_ita] AUTHORIZATION [dbo]; + + + + diff --git a/Projects/GimDB/Security/steamware.sql b/Projects/GimDB/Security/steamware.sql new file mode 100644 index 0000000..ccc0bcd --- /dev/null +++ b/Projects/GimDB/Security/steamware.sql @@ -0,0 +1,2 @@ +CREATE USER [steamware]; + diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AM_getByTag.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AM_getByTag.sql new file mode 100644 index 0000000..7d144b4 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AM_getByTag.sql @@ -0,0 +1,21 @@ +-- ============================================= +-- Author: S.E.L. +-- Create date: 2015.11.24 +-- Description: Recupero +-- ============================================= +CREATE PROCEDURE stp_AM_getByTag +( + @TagCode NVARCHAR(50) +) +AS + +BEGIN tran + SET NOCOUNT ON; + + -- Insert statements for procedure here + SELECT am.* + FROM AnagMacchine am + INNER JOIN Tag2Macc t2m ON t2m.idxMacchina = am.idxMacchina + WHERE t2m.TagCode=@TagCode + +COMMIT tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnItems_getByTag.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnItems_getByTag.sql new file mode 100644 index 0000000..c7dcc39 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnItems_getByTag.sql @@ -0,0 +1,20 @@ +/************************************* +* STORED PROCEDURE stp_AnItems_getByTag +* +* tag - items da tag +* +* mod : 24/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_AnItems_getByTag +( + @TagCode nvarchar(50) +) +AS + +SET NOCOUNT ON; + +SELECT ai.* +FROM AnagItems ai + INNER JOIN Tag2Item t2i ON ai.idxItem=t2i.idxItem +WHERE t2i.TagCode = @TagCode \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_insertQuery.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_insertQuery.sql index 7d081a1..bb1a39b 100644 --- a/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_insertQuery.sql +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_insertQuery.sql @@ -1,4 +1,12 @@ -CREATE PROCEDURE [dbo].stp_AnLoc_insertQuery +/************************************* +* STORED PROCEDURE stp_AnLoc_insertQuery +* +* inserisce record +* +* mod : 19/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_AnLoc_insertQuery] ( @CodLocazione nvarchar(50), @Descrizione nvarchar(50) diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_updateQuery.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_updateQuery.sql index 47b5ae4..e3a1a45 100644 --- a/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_updateQuery.sql +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnLoc_updateQuery.sql @@ -1,4 +1,12 @@ -CREATE PROCEDURE [dbo].stp_AnLoc_updateQuery +/************************************* +* STORED PROCEDURE stp_AnLoc_updateQuery +* +* update record +* +* mod : 19/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_AnLoc_updateQuery] ( @CodLocazione nvarchar(50), @Descrizione nvarchar(50), diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_avail4Item.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_avail4Item.sql new file mode 100644 index 0000000..14a45f7 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_avail4Item.sql @@ -0,0 +1,25 @@ +/************************************* +* STORED PROCEDURE stp_AnTag_avail4Item +* +* elenco tags x item (non assegnati di già...) +* +* mod : 23/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_AnTag_avail4Item ( + @idxItem INT + ) +AS +SET NOCOUNT OFF; +BEGIN tran + + SELECT at.* + FROM AnagTags at + WHERE TagCode NOT IN + ( + SELECT TagCode + FROM Tag2Item t2i + WHERE t2i.idxItem = @idxItem + ) + +COMMIT tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_deleteQuery.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_deleteQuery.sql new file mode 100644 index 0000000..022d06e --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_deleteQuery.sql @@ -0,0 +1,39 @@ +/************************************* +* STORED PROCEDURE stp_AnTag_deleteQuery +* +* elimina record +* +* mod : 19/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_AnTag_deleteQuery] +( + @Original_TagCode nvarchar(50) +) +AS +SET NOCOUNT OFF; + +BEGIN tran + + -- elimino connessione a item + DELETE + FROM Tag2Item + WHERE TagCode = @Original_TagCode + + -- elimino connessione a macchine + DELETE + FROM Tag2Macc + WHERE TagCode = @Original_TagCode + + -- elimino connessione sinonimi + DELETE + FROM SinonimiTag + WHERE TagCode = @Original_TagCode + OR TagCodeOrig = @Original_TagCode + + -- elimino tag + DELETE + FROM AnagTags + WHERE TagCode = @Original_TagCode + +COMMIT tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_getByKey.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_getByKey.sql new file mode 100644 index 0000000..8e153f2 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_getByKey.sql @@ -0,0 +1,19 @@ + +/************************************* +* STORED PROCEDURE stp_AnTag_getByKey +* +* recupero record da key +* +* mod : 26/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_AnTag_getByKey ( + @TagCode NVARCHAR(50) + ) +AS +SET NOCOUNT OFF; + +-- aggiorno VERO tag... +SELECT * +FROM AnagTags +WHERE TagCode = @TagCode \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_insertQuery.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_insertQuery.sql new file mode 100644 index 0000000..ea01c77 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_insertQuery.sql @@ -0,0 +1,27 @@ + +/************************************* +* STORED PROCEDURE stp_AnTag_insertQuery +* +* inserisce record +* +* mod : 19/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_AnTag_insertQuery] ( + @TagCode NVARCHAR(50) + ,@Class NVARCHAR(50) + ,@TagDescr NVARCHAR(50) + ) +AS +SET NOCOUNT OFF; + +BEGIN tran + -- inserisco etichette + INSERT INTO AnagTags (TagCode,Class,TagDescr) + VALUES (@TagCode,@Class,@TagDescr) + + --inserisco sinonimo "loop" sul termine + INSERT INTO SinonimiTag(TagCodeOrig, TagCode) + VALUES (@TagCode, @TagCode) + +COMMIT tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_updateQuery.sql b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_updateQuery.sql new file mode 100644 index 0000000..0a9fb60 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_AnTag_updateQuery.sql @@ -0,0 +1,45 @@ + +/************************************* +* STORED PROCEDURE stp_AnTag_updateQuery +* +* update record +* +* mod : 19/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_AnTag_updateQuery] ( + @TagCode NVARCHAR(50) + ,@Class NVARCHAR(50) + ,@TagDescr NVARCHAR(50) + ,@Original_TagCode NVARCHAR(50) + ) +AS +SET NOCOUNT OFF; +BEGIN tran + -- per sicurezza se nulli i valori li rendo vuoti... + SELECT @TagCode = ISNULL(@TagCode, @Original_TagCode) + SELECT @Class = ISNULL(@Class, '') + SELECT @TagDescr = ISNULL(@TagDescr, '') + + -- aggiorno "in cascata" la ricodifica dei tags SE modificato tag... + IF(@TagCode <> @Original_TagCode) + BEGIN + -- aggiorno DESTINAZIONI + UPDATE SinonimiTag + SET TagCode = @TagCode + WHERE TagCode = @Original_TagCode + + -- aggiorno ORIGINI + UPDATE SinonimiTag + SET TagCodeOrig = @TagCode + WHERE TagCodeOrig = @Original_TagCode + END + + -- aggiorno VERO tag... + UPDATE AnagTags + SET TagCode = @TagCode + ,Class = @Class + ,TagDescr = @TagDescr + WHERE TagCode = @Original_TagCode + +COMMIT tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_delete.sql b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_delete.sql new file mode 100644 index 0000000..8ca9e7e --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_delete.sql @@ -0,0 +1,24 @@ +/************************************* +* STORED PROCEDURE stp_MovMag_update +* +* elimina record movimenti magazzino (SE non scaricato) +* +* mod : 27/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_MovMag_delete +( + @Original_idxItem INT = 0 + , @Original_numIntMtz INT + , @Original_dtMov DATETIME +) +AS + +DELETE +FROM MovMagRic +WHERE idxItem = @Original_idxItem + AND numIntMtz = @Original_numIntMtz + AND dtMov = @Original_dtMov + + +RETURN \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_getByNumInt.sql b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_getByNumInt.sql new file mode 100644 index 0000000..5db2345 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_getByNumInt.sql @@ -0,0 +1,21 @@ +/************************************* +* STORED PROCEDURE stp_MovMag_getByNumInt +* +* update record movimenti magazzino +* +* mod : 27/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_MovMag_getByNumInt] +( + @numIntMtz INT +) +AS + +-- cerco da intervento +SELECT * +FROM v_MovMagExpl vmm +WHERE numIntMtz = @numIntMtz + + +RETURN \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_insert.sql b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_insert.sql new file mode 100644 index 0000000..87fff49 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_insert.sql @@ -0,0 +1,29 @@ +/************************************* +* STORED PROCEDURE stp_MovMag_insert +* +* insert record movimenti magazzino +* +* mod : 27/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_MovMag_insert] +( + @idxItem INT = 0 + , @numIntMtz INT + , @Qta INT +) +AS + +BEGIN tran + -- calcolo macchina... + DECLARE @idxMacchina INT = 0 + + SELECT @idxMacchina = idxMacchina + FROM InterventiMtz + WHERE numIntMtz = @numIntMtz + + INSERT INTO MovMagRic(idxItem,numIntMtz,dtMov,Qta,idxMacchina) + VALUES(@idxItem,@numIntMtz,GETDATE(),@Qta,@idxMacchina) + +COMMIT tran +RETURN \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_update.sql b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_update.sql new file mode 100644 index 0000000..d8a9e62 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_MovMag_update.sql @@ -0,0 +1,25 @@ +/************************************* +* STORED PROCEDURE stp_MovMag_update +* +* update record movimenti magazzino +* +* mod : 27/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_MovMag_update] +( + @Original_idxItem INT = 0 + , @Original_numIntMtz INT + , @Original_dtMov DATETIME + , @Qta INT +) +AS + +UPDATE MovMagRic + SET Qta = ISNULL(@Qta,0) +WHERE idxItem = @Original_idxItem + AND numIntMtz = @Original_numIntMtz + AND dtMov = @Original_dtMov + + +RETURN \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_SinTag_UpdateQuery.sql b/Projects/GimDB/dbo/Stored Procedures/stp_SinTag_UpdateQuery.sql new file mode 100644 index 0000000..dd2e0b3 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_SinTag_UpdateQuery.sql @@ -0,0 +1,49 @@ +/************************************* +* STORED PROCEDURE stp_SinTag_UpdateQuery +* +* update recordmerge come sinonimo del TagCordOrig (che sparisce) verso TagCode +* +* - ricodifica associazione verso item +* - ricodifica associazione verso macchine +* - crea record in tab sinonimi +* - elimina record in tab item +* +* mod : 23/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_SinTag_UpdateQuery] +( + @Original_TagCodeOrig nvarchar(50), + @TagCode nvarchar(50) +) +AS + SET NOCOUNT OFF; + + + +BEGIN tran + + -- step 1: ricodifica associazione verso ITEMS + UPDATE Tag2Item + SET TagCode = @TagCode + WHERE TagCode = @Original_TagCodeOrig + + + -- step 2: ricodifica associazione verso MACCHINE + UPDATE Tag2Macc + SET TagCode = @TagCode + WHERE TagCode = @Original_TagCodeOrig + -- step 3: creo record sinonimi (FARE CON MERGE?!?) + UPDATE SinonimiTag + SET TagCode = @TagCode + WHERE ((TagCodeOrig = @Original_TagCodeOrig)) OR ((TagCode = @Original_TagCodeOrig)) + + --INSERT INTO SinonimiTag (TagCodeOrig, TagCode) + --VALUES (@Original_TagCodeOrig, @TagCode) + + -- step 4: elimino ITEMS + DELETE + FROM AnagTags + WHERE TagCode = @Original_TagCodeOrig + +COMMIT Tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_getByDescr.sql b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_getByDescr.sql new file mode 100644 index 0000000..7c4b128 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_getByDescr.sql @@ -0,0 +1,20 @@ +/************************************* +* STORED PROCEDURE stp_StatoMag_getByDescr +* +* recupera record data descrizione +* +* mod : 19/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE [dbo].[stp_StatoMag_getByDescr] +( + @Descrizione NVARCHAR(250) +) +AS + +-- cerco da descrizione +SELECT * +FROM v_StatoMag +WHERE Descrizione = @Descrizione + +RETURN \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_getByIdxMacchina.sql b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_getByIdxMacchina.sql new file mode 100644 index 0000000..2d9b02e --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_getByIdxMacchina.sql @@ -0,0 +1,23 @@ +/************************************* +* STORED PROCEDURE stp_StatoMag_getByIdxMacchina +* +* recupera record items assegnati alla macchina +* +* mod : 27/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_StatoMag_getByIdxMacchina +( + @idxMacchina INT +) +AS + +-- cerco da idxMacchina -> etichette -> items +SELECT vsm.* +FROM Tag2Item t2i + INNER JOIN Tag2Macc t2m ON t2i.TagCode = t2m.TagCode + INNER JOIN v_statoMag vsm ON vsm.idxItem = t2i.idxItem +WHERE t2m.idxMacchina = @idxMacchina + + +RETURN \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_insert.sql b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_insert.sql index dda539b..c948f56 100644 --- a/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_insert.sql +++ b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_insert.sql @@ -11,7 +11,7 @@ CREATE PROCEDURE [dbo].[stp_StatoMag_insert] @Descrizione NVARCHAR(250) , @NomeCostruttore NVARCHAR(250) , @CodCostruttore NVARCHAR(250) - , @CodSomaschini NVARCHAR(50) + , @CodInterno NVARCHAR(50) , @QtaMin INT , @QtaLotto INT , @Valore DECIMAL(18, 6) @@ -26,8 +26,8 @@ BEGIN tran DECLARE @idxItem INT = 0 -- creo nuovo ITEM - INSERT INTO dbo.AnagItems (Descrizione, NomeCostruttore, CodCostruttore, CodSomaschini, QtaMin, QtaLotto, Valore) - VALUES (@Descrizione, @NomeCostruttore, @CodCostruttore, @CodSomaschini, @QtaMin, @QtaLotto, @Valore) + INSERT INTO dbo.AnagItems (Descrizione, NomeCostruttore, CodCostruttore, CodInterno, QtaMin, QtaLotto, Valore) + VALUES (@Descrizione, @NomeCostruttore, @CodCostruttore, @CodInterno, @QtaMin, @QtaLotto, @Valore) -- recupero IDX SELECT @idxItem = SCOPE_IDENTITY() diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_update.sql b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_update.sql index 51e202e..46bc479 100644 --- a/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_update.sql +++ b/Projects/GimDB/dbo/Stored Procedures/stp_StatoMag_update.sql @@ -6,13 +6,14 @@ * mod : 19/11/2015 * aut : S.E. Locatelli **************************************/ -CREATE PROCEDURE stp_StatoMag_update +CREATE PROCEDURE [dbo].[stp_StatoMag_update] ( @Original_idxItem INT = 0 + , @Famiglia NVARCHAR(250) , @Descrizione NVARCHAR(250) , @NomeCostruttore NVARCHAR(250) , @CodCostruttore NVARCHAR(250) - , @CodSomaschini NVARCHAR(50) + , @CodInterno NVARCHAR(50) , @QtaMin INT , @QtaLotto INT , @Valore DECIMAL(18, 6) @@ -24,24 +25,26 @@ AS BEGIN tran + -- update ITEM UPDATE AnagItems - SET Descrizione = @Descrizione - ,NomeCostruttore = @NomeCostruttore - ,CodCostruttore = @CodCostruttore - ,CodSomaschini = @CodSomaschini - ,QtaMin = @QtaMin - ,QtaLotto = @QtaLotto - ,Valore = @Valore + SET Famiglia = ISNULL(@Famiglia,'') + ,Descrizione = ISNULL(@Descrizione,'') + ,NomeCostruttore = ISNULL(@NomeCostruttore,'') + ,CodCostruttore = ISNULL(@CodCostruttore,'') + ,CodInterno = ISNULL(@CodInterno,'') + ,QtaMin = ISNULL(@QtaMin,'') + ,QtaLotto = ISNULL(@QtaLotto,'') + ,Valore = ISNULL(@Valore,'') WHERE idxItem = @Original_idxItem - INSERT INTO dbo.AnagItems (Descrizione, NomeCostruttore, CodCostruttore, CodSomaschini, QtaMin, QtaLotto, Valore) - VALUES (@Descrizione, @NomeCostruttore, @CodCostruttore, @CodSomaschini, @QtaMin, @QtaLotto, @Valore) + INSERT INTO dbo.AnagItems (Descrizione, NomeCostruttore, CodCostruttore, CodInterno, QtaMin, QtaLotto, Valore) + VALUES (@Descrizione, @NomeCostruttore, @CodCostruttore, @CodInterno, @QtaMin, @QtaLotto, @Valore) -- update record giacenza UPDATE dbo.MagRic - SET CodLocazione = @CodLocazione - ,Note = @Note + SET CodLocazione = ISNULL(@CodLocazione,'') + ,Note = ISNULL(@Note,'') ,dtLastUpd = GETDATE() WHERE idxItem = @Original_idxItem diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_T2I_getByIdxItem.sql b/Projects/GimDB/dbo/Stored Procedures/stp_T2I_getByIdxItem.sql new file mode 100644 index 0000000..1ea8d1a --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_T2I_getByIdxItem.sql @@ -0,0 +1,17 @@ + +/************************************* +* STORED PROCEDURE stp_T2I_getByIdxItem +* +* tag da items +* +* mod : 24/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_T2I_getByIdxItem +( + @idxItem INT +) +AS + SET NOCOUNT ON; +SELECT idxItem, TagCode FROM dbo.Tag2Item +WHERE idxItem=@idxItem \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_T2I_getByTag.sql b/Projects/GimDB/dbo/Stored Procedures/stp_T2I_getByTag.sql new file mode 100644 index 0000000..1784d35 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_T2I_getByTag.sql @@ -0,0 +1,16 @@ +/************************************* +* STORED PROCEDURE stp_T2I_getByTag +* +* tag - items da tag +* +* mod : 24/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_T2I_getByTag +( + @TagCode nvarchar(50) +) +AS + SET NOCOUNT ON; +SELECT idxItem, TagCode FROM dbo.Tag2Item +WHERE TagCode=@TagCode \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_T2M_deleteByTag.sql b/Projects/GimDB/dbo/Stored Procedures/stp_T2M_deleteByTag.sql new file mode 100644 index 0000000..bb6b429 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_T2M_deleteByTag.sql @@ -0,0 +1,19 @@ +/************************************* +* STORED PROCEDURE stp_T2M_deleteByTag +* +* elimina record macchine2tags +* +* mod : 24/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_T2M_deleteByTag +( + @Original_TagCode NVARCHAR(50) + ,@Original_idxMacchina INT +) +AS +SET NOCOUNT ON; +DELETE +FROM Tag2Macc +WHERE TagCode = @Original_TagCode + AND idxMacchina = @Original_idxMacchina \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_T2M_getByTag.sql b/Projects/GimDB/dbo/Stored Procedures/stp_T2M_getByTag.sql new file mode 100644 index 0000000..ef22b59 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_T2M_getByTag.sql @@ -0,0 +1,16 @@ +/************************************* +* STORED PROCEDURE stp_T2I_getByIdxItem +* +* tag macchine da tags +* +* mod : 24/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_T2M_getByTag +( + @TagCode nvarchar(50) +) +AS + SET NOCOUNT ON; +SELECT TagCode, idxMacchina FROM dbo.Tag2Macc +WHERE TagCode=@TagCode \ No newline at end of file diff --git a/Projects/GimDB/dbo/Stored Procedures/stp_VSM_avail4Tag.sql b/Projects/GimDB/dbo/Stored Procedures/stp_VSM_avail4Tag.sql new file mode 100644 index 0000000..0f47876 --- /dev/null +++ b/Projects/GimDB/dbo/Stored Procedures/stp_VSM_avail4Tag.sql @@ -0,0 +1,26 @@ +/************************************* +* STORED PROCEDURE stp_VSM_avail4Tag +* +* elenco macchine associabili x TAG (non assegnate di già...) +* +* mod : 24/11/2015 +* aut : S.E. Locatelli +**************************************/ +CREATE PROCEDURE stp_VSM_avail4Tag +( + @TagCode nvarchar(50) +) +AS +SET NOCOUNT OFF; +BEGIN tran + + SELECT am.* + FROM v_selMacchine am + WHERE value NOT IN + ( + SELECT idxMacchina + FROM Tag2Macc t2m + WHERE t2m.TagCode = @TagCode + ) + +COMMIT tran \ No newline at end of file diff --git a/Projects/GimDB/dbo/Tables/AnagItems.sql b/Projects/GimDB/dbo/Tables/AnagItems.sql index bc5e899..1a5a674 100644 --- a/Projects/GimDB/dbo/Tables/AnagItems.sql +++ b/Projects/GimDB/dbo/Tables/AnagItems.sql @@ -1,9 +1,10 @@ CREATE TABLE [dbo].[AnagItems] ( - [idxItem] INT NOT NULL, + [idxItem] INT IDENTITY (1, 1) NOT NULL, + [Famiglia] NVARCHAR (50) CONSTRAINT [DF_AnagItems_Famiglia] DEFAULT ('') NOT NULL, [Descrizione] NVARCHAR (250) CONSTRAINT [DF_AnagItems_Descrizione] DEFAULT ('') NOT NULL, [NomeCostruttore] NVARCHAR (250) CONSTRAINT [DF_AnagItems_NomeCostruttore] DEFAULT ('') NOT NULL, [CodCostruttore] NVARCHAR (250) CONSTRAINT [DF_AnagItems_CodCostruttore] DEFAULT ('') NOT NULL, - [CodSomaschini] NVARCHAR (50) CONSTRAINT [DF_AnagItems_CodSomaschini] DEFAULT ('') NOT NULL, + [CodInterno] NVARCHAR (50) CONSTRAINT [DF_AnagItems_CodInterno] DEFAULT ('') NOT NULL, [QtaMin] INT CONSTRAINT [DF_AnagItems_QtaMin] DEFAULT ((0)) NOT NULL, [QtaLotto] INT CONSTRAINT [DF_AnagItems_QtaLotto] DEFAULT ((1)) NOT NULL, [Valore] DECIMAL (18, 6) CONSTRAINT [DF_AnagItems_Valore] DEFAULT ((0)) NOT NULL, @@ -15,6 +16,8 @@ + + GO EXECUTE sp_addextendedproperty @name = N'MS_Description', @value = N'valore unitario item', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'AnagItems', @level2type = N'COLUMN', @level2name = N'Valore'; diff --git a/Projects/GimDB/dbo/Tables/AnagTags.sql b/Projects/GimDB/dbo/Tables/AnagTags.sql new file mode 100644 index 0000000..a7bbcec --- /dev/null +++ b/Projects/GimDB/dbo/Tables/AnagTags.sql @@ -0,0 +1,15 @@ +CREATE TABLE [dbo].[AnagTags] ( + [TagCode] NVARCHAR (50) NOT NULL, + [Class] NVARCHAR (50) CONSTRAINT [DF_AnagTag_Class] DEFAULT ('') NOT NULL, + [TagDescr] NVARCHAR (50) CONSTRAINT [DF_AnagTag_TagDescr] DEFAULT ('') NOT NULL, + CONSTRAINT [PK_AnagTag] PRIMARY KEY CLUSTERED ([TagCode] ASC) +); + + +GO +EXECUTE sp_addextendedproperty @name = N'MS_Description', @value = N'Descrizioen dell''etichetta', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'AnagTags', @level2type = N'COLUMN', @level2name = N'TagDescr'; + + +GO +EXECUTE sp_addextendedproperty @name = N'MS_Description', @value = N'classe delle etichette (es FM = fam macchine)', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'AnagTags', @level2type = N'COLUMN', @level2name = N'Class'; + diff --git a/Projects/GimDB/dbo/Tables/Item2FamMacchine.sql b/Projects/GimDB/dbo/Tables/Item2FamMacchine.sql deleted file mode 100644 index 929a893..0000000 --- a/Projects/GimDB/dbo/Tables/Item2FamMacchine.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TABLE [dbo].[Item2FamMacchine] ( - [idxItem] INT NOT NULL, - [idxFamMacchine] INT NOT NULL, - CONSTRAINT [PK_Item2FamMacchine] PRIMARY KEY CLUSTERED ([idxItem] ASC, [idxFamMacchine] ASC), - CONSTRAINT [FK_Item2FamMacchine_AnagFamMacchine] FOREIGN KEY ([idxFamMacchine]) REFERENCES [dbo].[AnagFamMacchine] ([idxFamMacchine]) ON UPDATE CASCADE, - CONSTRAINT [FK_Item2FamMacchine_AnagItems] FOREIGN KEY ([idxItem]) REFERENCES [dbo].[AnagItems] ([idxItem]) ON UPDATE CASCADE -); - diff --git a/Projects/GimDB/dbo/Tables/Item2Macchine.sql b/Projects/GimDB/dbo/Tables/Item2Macchine.sql deleted file mode 100644 index 9706b71..0000000 --- a/Projects/GimDB/dbo/Tables/Item2Macchine.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TABLE [dbo].[Item2Macchine] ( - [idxItem] INT NOT NULL, - [idxMacchina] INT NOT NULL, - CONSTRAINT [PK_Item2Macchine] PRIMARY KEY CLUSTERED ([idxItem] ASC, [idxMacchina] ASC), - CONSTRAINT [FK_Item2Macchine_AnagItems] FOREIGN KEY ([idxItem]) REFERENCES [dbo].[AnagItems] ([idxItem]) ON UPDATE CASCADE, - CONSTRAINT [FK_Item2Macchine_AnagMacchine] FOREIGN KEY ([idxMacchina]) REFERENCES [dbo].[AnagMacchine] ([idxMacchina]) ON UPDATE CASCADE -); - diff --git a/Projects/GimDB/dbo/Tables/MovMagRic.sql b/Projects/GimDB/dbo/Tables/MovMagRic.sql index e9dfd24..e1bfd4b 100644 --- a/Projects/GimDB/dbo/Tables/MovMagRic.sql +++ b/Projects/GimDB/dbo/Tables/MovMagRic.sql @@ -1,14 +1,18 @@ CREATE TABLE [dbo].[MovMagRic] ( [idxItem] INT NOT NULL, + [numIntMtz] INT NOT NULL, [dtMov] DATETIME NOT NULL, [Qta] INT CONSTRAINT [DF_MovMagRic_Qta] DEFAULT ((0)) NOT NULL, [idxMacchina] INT NOT NULL, [dtExport] DATETIME NULL, - CONSTRAINT [PK_MovMagRic] PRIMARY KEY CLUSTERED ([idxItem] ASC, [dtMov] ASC), - CONSTRAINT [FK_MovMagRic_AnagItems] FOREIGN KEY ([idxItem]) REFERENCES [dbo].[AnagItems] ([idxItem]) ON UPDATE CASCADE + CONSTRAINT [PK_MovMagRic] PRIMARY KEY CLUSTERED ([idxItem] ASC, [numIntMtz] ASC, [dtMov] ASC), + CONSTRAINT [FK_MovMagRic_AnagItems] FOREIGN KEY ([idxItem]) REFERENCES [dbo].[AnagItems] ([idxItem]) ON UPDATE CASCADE, + CONSTRAINT [FK_MovMagRic_InterventiMtz] FOREIGN KEY ([numIntMtz]) REFERENCES [dbo].[InterventiMtz] ([numIntMtz]) ON UPDATE CASCADE ); + + GO EXECUTE sp_addextendedproperty @name = N'MS_Description', @value = N'data export verso ERP', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'MovMagRic', @level2type = N'COLUMN', @level2name = N'dtExport'; diff --git a/Projects/GimDB/dbo/Tables/SinonimiTag.sql b/Projects/GimDB/dbo/Tables/SinonimiTag.sql new file mode 100644 index 0000000..cf6e142 --- /dev/null +++ b/Projects/GimDB/dbo/Tables/SinonimiTag.sql @@ -0,0 +1,6 @@ +CREATE TABLE [dbo].[SinonimiTag] ( + [TagCodeOrig] NVARCHAR (50) NOT NULL, + [TagCode] NVARCHAR (50) NOT NULL, + CONSTRAINT [PK_SinonimiTag] PRIMARY KEY CLUSTERED ([TagCodeOrig] ASC) +); + diff --git a/Projects/GimDB/dbo/Tables/Tag2Item.sql b/Projects/GimDB/dbo/Tables/Tag2Item.sql new file mode 100644 index 0000000..39ee470 --- /dev/null +++ b/Projects/GimDB/dbo/Tables/Tag2Item.sql @@ -0,0 +1,8 @@ +CREATE TABLE [dbo].[Tag2Item] ( + [idxItem] INT NOT NULL, + [TagCode] NVARCHAR (50) NOT NULL, + CONSTRAINT [PK_Tag2Item] PRIMARY KEY CLUSTERED ([idxItem] ASC, [TagCode] ASC), + CONSTRAINT [FK_Tag2Item_AnagItems] FOREIGN KEY ([idxItem]) REFERENCES [dbo].[AnagItems] ([idxItem]) ON UPDATE CASCADE, + CONSTRAINT [FK_Tag2Item_AnagTag] FOREIGN KEY ([TagCode]) REFERENCES [dbo].[AnagTags] ([TagCode]) ON UPDATE CASCADE +); + diff --git a/Projects/GimDB/dbo/Tables/Tag2Macc.sql b/Projects/GimDB/dbo/Tables/Tag2Macc.sql new file mode 100644 index 0000000..cf622bc --- /dev/null +++ b/Projects/GimDB/dbo/Tables/Tag2Macc.sql @@ -0,0 +1,8 @@ +CREATE TABLE [dbo].[Tag2Macc] ( + [TagCode] NVARCHAR (50) NOT NULL, + [idxMacchina] INT NOT NULL, + CONSTRAINT [PK_Tag2Macc] PRIMARY KEY CLUSTERED ([TagCode] ASC, [idxMacchina] ASC), + CONSTRAINT [FK_Tag2Macc_AnagMacchine] FOREIGN KEY ([idxMacchina]) REFERENCES [dbo].[AnagMacchine] ([idxMacchina]) ON UPDATE CASCADE, + CONSTRAINT [FK_Tag2Macc_AnagTag] FOREIGN KEY ([TagCode]) REFERENCES [dbo].[AnagTags] ([TagCode]) ON UPDATE CASCADE +); + diff --git a/Projects/GimDB/dbo/Views/v_MovMagExpl.sql b/Projects/GimDB/dbo/Views/v_MovMagExpl.sql new file mode 100644 index 0000000..a9201ba --- /dev/null +++ b/Projects/GimDB/dbo/Views/v_MovMagExpl.sql @@ -0,0 +1,176 @@ +CREATE VIEW dbo.v_MovMagExpl +AS +SELECT dbo.MovMagRic.idxItem, dbo.MovMagRic.numIntMtz, dbo.MovMagRic.dtMov, dbo.MovMagRic.Qta, dbo.AnagItems.Famiglia, dbo.AnagItems.Descrizione, dbo.AnagItems.NomeCostruttore, + dbo.AnagItems.CodCostruttore, dbo.AnagItems.CodInterno, dbo.AnagItems.QtaMin, dbo.AnagItems.QtaLotto, dbo.AnagItems.Valore, dbo.MagRic.Note, dbo.MagRic.dtLastUpd, dbo.MagRic.CodLocazione, + dbo.AnagLocazioni.Descrizione AS DescrLocazione, dbo.MovMagRic.idxMacchina, dbo.MovMagRic.dtExport +FROM dbo.MovMagRic INNER JOIN + dbo.AnagItems ON dbo.MovMagRic.idxItem = dbo.AnagItems.idxItem INNER JOIN + dbo.MagRic ON dbo.AnagItems.idxItem = dbo.MagRic.idxItem LEFT OUTER JOIN + dbo.AnagLocazioni ON dbo.MagRic.CodLocazione = dbo.AnagLocazioni.CodLocazione +GO +EXECUTE sp_addextendedproperty @name = N'MS_DiagramPaneCount', @value = 2, @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'VIEW', @level1name = N'v_MovMagExpl'; + + +GO +EXECUTE sp_addextendedproperty @name = N'MS_DiagramPane2', @value = N' NewValue = 1170 + SortType = 1350 + SortOrder = 1410 + GroupBy = 1350 + Filter = 1350 + Or = 1350 + Or = 1350 + Or = 1350 + End + End +End +', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'VIEW', @level1name = N'v_MovMagExpl'; + + +GO +EXECUTE sp_addextendedproperty @name = N'MS_DiagramPane1', @value = N'[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00] +Begin DesignProperties = + Begin PaneConfigurations = + Begin PaneConfiguration = 0 + NumPanes = 4 + Configuration = "(H (1[40] 4[20] 2[20] 3) )" + End + Begin PaneConfiguration = 1 + NumPanes = 3 + Configuration = "(H (1 [50] 4 [25] 3))" + End + Begin PaneConfiguration = 2 + NumPanes = 3 + Configuration = "(H (1 [50] 2 [25] 3))" + End + Begin PaneConfiguration = 3 + NumPanes = 3 + Configuration = "(H (4 [30] 2 [40] 3))" + End + Begin PaneConfiguration = 4 + NumPanes = 2 + Configuration = "(H (1 [56] 3))" + End + Begin PaneConfiguration = 5 + NumPanes = 2 + Configuration = "(H (2 [66] 3))" + End + Begin PaneConfiguration = 6 + NumPanes = 2 + Configuration = "(H (4 [50] 3))" + End + Begin PaneConfiguration = 7 + NumPanes = 1 + Configuration = "(V (3))" + End + Begin PaneConfiguration = 8 + NumPanes = 3 + Configuration = "(H (1[56] 4[18] 2) )" + End + Begin PaneConfiguration = 9 + NumPanes = 2 + Configuration = "(H (1 [75] 4))" + End + Begin PaneConfiguration = 10 + NumPanes = 2 + Configuration = "(H (1[66] 2) )" + End + Begin PaneConfiguration = 11 + NumPanes = 2 + Configuration = "(H (4 [60] 2))" + End + Begin PaneConfiguration = 12 + NumPanes = 1 + Configuration = "(H (1) )" + End + Begin PaneConfiguration = 13 + NumPanes = 1 + Configuration = "(V (4))" + End + Begin PaneConfiguration = 14 + NumPanes = 1 + Configuration = "(V (2))" + End + ActivePaneConfig = 0 + End + Begin DiagramPane = + Begin Origin = + Top = 0 + Left = 0 + End + Begin Tables = + Begin Table = "MovMagRic" + Begin Extent = + Top = 133 + Left = 124 + Bottom = 299 + Right = 294 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "AnagItems" + Begin Extent = + Top = 134 + Left = 397 + Bottom = 354 + Right = 579 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "MagRic" + Begin Extent = + Top = 133 + Left = 660 + Bottom = 290 + Right = 830 + End + DisplayFlags = 280 + TopColumn = 0 + End + Begin Table = "AnagLocazioni" + Begin Extent = + Top = 150 + Left = 908 + Bottom = 246 + Right = 1078 + End + DisplayFlags = 280 + TopColumn = 0 + End + End + End + Begin SQLPane = + End + Begin DataPane = + Begin ParameterDefaults = "" + End + Begin ColumnWidths = 17 + Width = 284 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + End + End + Begin CriteriaPane = + Begin ColumnWidths = 11 + Column = 1440 + Alias = 900 + Table = 1170 + Output = 720 + Append = 1400 +', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'VIEW', @level1name = N'v_MovMagExpl'; + diff --git a/Projects/GimDB/dbo/Views/v_StatoMag.sql b/Projects/GimDB/dbo/Views/v_StatoMag.sql index 8ec89fd..6142d8f 100644 --- a/Projects/GimDB/dbo/Views/v_StatoMag.sql +++ b/Projects/GimDB/dbo/Views/v_StatoMag.sql @@ -1,8 +1,8 @@ CREATE VIEW dbo.v_StatoMag AS -SELECT dbo.AnagItems.idxItem, dbo.AnagItems.Descrizione, dbo.AnagItems.NomeCostruttore, dbo.AnagItems.CodCostruttore, dbo.AnagItems.CodSomaschini, dbo.AnagItems.QtaMin, dbo.AnagItems.QtaLotto, - dbo.AnagItems.Valore, dbo.MagRic.Giacenza + dbo.v_movMagPend.TotQtaMov AS Giacenza, dbo.AnagLocazioni.CodLocazione, dbo.AnagLocazioni.Descrizione AS DescrLocazione, dbo.MagRic.Note, - dbo.MagRic.dtLastUpd +SELECT dbo.AnagItems.idxItem, dbo.AnagItems.Famiglia, dbo.AnagItems.Descrizione, dbo.AnagItems.NomeCostruttore, dbo.AnagItems.CodCostruttore, dbo.AnagItems.CodInterno, dbo.AnagItems.QtaMin, + dbo.AnagItems.QtaLotto, dbo.AnagItems.Valore, ISNULL(dbo.MagRic.Giacenza, 0) + ISNULL(dbo.v_movMagPend.TotQtaMov, 0) AS Giacenza, dbo.AnagLocazioni.CodLocazione, + dbo.AnagLocazioni.Descrizione AS DescrLocazione, dbo.MagRic.Note, dbo.MagRic.dtLastUpd FROM dbo.AnagItems INNER JOIN dbo.MagRic ON dbo.AnagItems.idxItem = dbo.MagRic.idxItem LEFT OUTER JOIN dbo.v_movMagPend ON dbo.MagRic.idxItem = dbo.v_movMagPend.idxItem LEFT OUTER JOIN @@ -12,7 +12,8 @@ EXECUTE sp_addextendedproperty @name = N'MS_DiagramPaneCount', @value = 2, @leve GO -EXECUTE sp_addextendedproperty @name = N'MS_DiagramPane2', @value = N'y = 1350 +EXECUTE sp_addextendedproperty @name = N'MS_DiagramPane2', @value = N'= 1410 + GroupBy = 1350 Filter = 1350 Or = 1350 Or = 1350 @@ -23,6 +24,8 @@ End ', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'VIEW', @level1name = N'v_StatoMag'; + + GO EXECUTE sp_addextendedproperty @name = N'MS_DiagramPane1', @value = N'[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00] Begin DesignProperties = @@ -95,12 +98,12 @@ Begin DesignProperties = Left = 0 End Begin Tables = - Begin Table = "AnagLocazioni" + Begin Table = "AnagItems" Begin Extent = - Top = 230 - Left = 662 - Bottom = 326 - Right = 832 + Top = 35 + Left = 95 + Bottom = 260 + Right = 277 End DisplayFlags = 280 TopColumn = 0 @@ -125,12 +128,12 @@ Begin DesignProperties = DisplayFlags = 280 TopColumn = 0 End - Begin Table = "AnagItems" + Begin Table = "AnagLocazioni" Begin Extent = - Top = 35 - Left = 95 - Bottom = 260 - Right = 277 + Top = 230 + Left = 662 + Bottom = 326 + Right = 832 End DisplayFlags = 280 TopColumn = 0 @@ -142,7 +145,7 @@ Begin DesignProperties = Begin DataPane = Begin ParameterDefaults = "" End - Begin ColumnWidths = 13 + Begin ColumnWidths = 14 Width = 284 Width = 1500 Width = 1500 @@ -156,6 +159,7 @@ Begin DesignProperties = Width = 1500 Width = 1500 Width = 1500 + Width = 1500 End End Begin CriteriaPane = @@ -167,6 +171,7 @@ Begin DesignProperties = Append = 1400 NewValue = 1170 SortType = 1350 - SortOrder = 1410 - GroupB', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'VIEW', @level1name = N'v_StatoMag'; + SortOrder ', @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'VIEW', @level1name = N'v_StatoMag'; + + diff --git a/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step1.sql b/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step1.sql new file mode 100644 index 0000000..402ace0 --- /dev/null +++ b/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step1.sql @@ -0,0 +1,62 @@ + +-- ============================================= +-- Author: GAR +-- Create date: 2015.11.20 +-- Description: Import iniziale dati: Items +-- ============================================= +CREATE PROCEDURE [import].[stp_importMagRic_step1] +AS +BEGIN + +SET NOCOUNT ON; + +-- SELECT * FROM [som_ita].[tmp_ImportRic_A] +DECLARE @Test BIT = 0; -- se 1 fa il rollback +DECLARE @SummaryOfChanges TABLE (Change VARCHAR(10)); + +BEGIN TRANSACTION; + -- CARICO I NUOVI ITEM + ;WITH cteImportRicA + AS ( + SELECT DISTINCT + LTRIM(RTRIM(UPPER(Gruppo))) AS Famiglia, + LTRIM(RTRIM(UPPER(REPLACE(CASE WHEN ISNULL([Descrizione], '') <> '' + THEN [Descrizione] + ELSE [CodCostruttore] + END, '"', '')))) AS Descrizione + ,LTRIM(RTRIM(UPPER(NomeCostruttore))) AS NomeCostruttore + ,LTRIM(RTRIM(UPPER(CodCostruttore))) AS CodCostruttore + ,LTRIM(RTRIM(UPPER(CodSomaschini))) AS CodInterno + FROM [som_ita].[tmp_ImportRic_A] + ) + MERGE INTO dbo.AnagItems AS Target + USING ( SELECT DISTINCT * FROM cteImportRicA ) AS Source + ON Target.Famiglia = Source.Famiglia AND Target.Descrizione = Source.Descrizione AND Target.NomeCostruttore = Source.NomeCostruttore AND Target.CodCostruttore = Source.CodCostruttore AND Target.CodInterno = Source.CodInterno + + WHEN NOT MATCHED BY TARGET + THEN + INSERT ( Famiglia,Descrizione,NomeCostruttore,CodCostruttore,CodInterno) + VALUES ( Famiglia,Descrizione,NomeCostruttore,CodCostruttore,CodInterno) + --WHEN MATCHED -- AND Target.TranspCost <> Source.TranspCost AND @flgUpdate = 1 + -- THEN + -- UPDATE SET Descrizione = Source.Descrizione + --WHEN NOT MATCHED BY SOURCE THEN + -- DELETE + OUTPUT $ACTION INTO @SummaryOfChanges;-- carico i cambiamenti in tabella + + SELECT * FROM dbo.AnagItems + +IF @test = 1 ROLLBACK + ELSE COMMIT; + +-- Carico le modifiche fatte in variabile Testo +SELECT Change + ' : ' + CONVERT(VARCHAR(10), COUNT(*)) +FROM @SummaryOfChanges +GROUP BY Change; + +/* reset dbo.AnagItems +DELETE dbo.AnagItems +DBCC CHECKIDENT ('dbo.AnagItems', reseed, 0) -- reset idx tabella dopo delete +*/ + +END \ No newline at end of file diff --git a/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step2.sql b/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step2.sql new file mode 100644 index 0000000..95a0355 --- /dev/null +++ b/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step2.sql @@ -0,0 +1,72 @@ + + +-- ============================================= +-- Author: GAR +-- Create date: 2015.11.20 +-- Description: Import iniziale dati: Giacenze +-- ============================================= +CREATE PROCEDURE [import].[stp_importMagRic_step2] +AS +BEGIN + +SET NOCOUNT ON; + +--SELECT * FROM [som_ita].[tmp_ImportRic_A] WHERE Descrizione = '' +--SELECT * FROM MagRic +--SELECT * FROM AnagLocazioni + +DECLARE @Test BIT = 0; -- se 1 fa il rollback +DECLARE @DataImp AS SMALLDATETIME = GETDATE(); +DECLARE @SummaryOfChanges TABLE (Change VARCHAR(10)); + +BEGIN TRANSACTION;; + + WITH cteImportRicA + AS ( + SELECT LTRIM(RTRIM(UPPER(Gruppo))) AS Famiglia + ,LTRIM(RTRIM(UPPER(REPLACE(CASE WHEN ISNULL([Descrizione], '') <> '' + THEN [Descrizione] + ELSE [CodCostruttore] + END, '"', '')))) AS Descrizione -- tolgo eventuali " + ,LTRIM(RTRIM(UPPER(NomeCostruttore))) AS NomeCostruttore + ,LTRIM(RTRIM(UPPER(CodCostruttore))) AS CodCostruttore + ,LTRIM(RTRIM(UPPER(CodSomaschini))) AS CodInterno + ,Giacenza + FROM [som_ita].[tmp_ImportRic_A] + ) + ,cteBis AS ( + SELECT ai.* + ,'MAG00' AS CodLocazione + ,tmp.Giacenza + FROM cteImportRicA AS tmp + INNER JOIN dbo.AnagItems AS ai + ON tmp.Famiglia = ai.Famiglia AND tmp.Descrizione = ai.Descrizione AND tmp.NomeCostruttore = ai.NomeCostruttore AND tmp.CodCostruttore = ai.CodCostruttore AND tmp.CodInterno = ai.CodInterno + ) + -- SELECT idxItem, 'MAG00' AS CodLocazione , Giacenza FROM cteBis WHERE idxItem = 1310 + MERGE INTO dbo.MagRic AS Target + USING ( + SELECT idxItem,CodLocazione,SUM(Giacenza) AS Giacenza FROM cteBis + GROUP BY idxItem ,CodLocazione + ) AS Source + ON Target.idxItem = Source.idxItem AND Target.CodLocazione = Source.CodLocazione + WHEN NOT MATCHED BY TARGET THEN + INSERT (idxItem,CodLocazione,Giacenza,dtLastUpd) + VALUES (idxItem,CodLocazione,Giacenza,@DataImp) + WHEN MATCHED THEN + UPDATE + SET Giacenza = Source.Giacenza ,dtLastUpd = @DataImp + --WHEN NOT MATCHED BY SOURCE THEN DELETE + OUTPUT $ACTION INTO @SummaryOfChanges;-- carico i cambiamenti in tabella + + SELECT * FROM dbo.MagRic + +IF @Test = 1 + ROLLBACK +ELSE COMMIT; + +-- Carico le modifiche fatte in variabile Testo +SELECT Change + ' : ' + CONVERT(VARCHAR(10), COUNT(*)) +FROM @SummaryOfChanges +GROUP BY Change; + +END \ No newline at end of file diff --git a/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step3.sql b/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step3.sql new file mode 100644 index 0000000..7955230 --- /dev/null +++ b/Projects/GimDB/import/Stored Procedures/stp_importMagRic_step3.sql @@ -0,0 +1,108 @@ + +-- ============================================= +-- Author: GAR +-- Create date: 2015.11.20 +-- Description: Import iniziale dati: Tags +-- ============================================= +CREATE PROCEDURE [import].[stp_importMagRic_step3] +AS +BEGIN + +SET NOCOUNT ON; + +/* +* NOTA: fare in modo che lo esegua in modo "becero" creando TUTTI i tags DISTINCT DESTINAZIONE che esistono (fatto salvo trim e TOP-UPPER x non creare sinonimi solo di errata scrittura), POI da sw farò "il merge" dei tags x riunificarli da WebGIM +* +* per farlo c'è la tabella di "sinonimi" per cui ad un certo Tag --> corrisponde il tag "merge" finale +* QUESTO SIGNIFICA che dopo primo import (becero) nei successivi deve guardare la tabella SinonimiTag, ho creato alcuni esempi +* +* vedi step procedura abbozzati sotto +* +*/ + +--SELECT * FROM [som_ita].[tmp_ImportRic_A] WHERE Descrizione = '' +--SELECT * FROM dbo.SinonimiTag -- delete FROM dbo.SinonimiTag +--SELECT * FROM dbo.AnagTags -- delete FROM dbo.AnagTags +--SELECT * FROM dbo.Tag2Item -- DELETE FROM dbo.Tag2Item + +DECLARE @Test BIT = 0; -- se 1 fa il rollback +DECLARE @DataImp AS SMALLDATETIME = GETDATE(); +DECLARE @SummaryOfChanges TABLE (Change VARCHAR(50)); + +BEGIN TRANSACTION;; + + -- ========================================================== + -- NUOVI SINONIMI - se ho sinonimi mancanti li carico in modalità 1=1 TagCodeOrig=TagCode + -- ========================================================== + WITH cteImportRicA + AS ( + SELECT DISTINCT LTRIM(RTRIM(UPPER(Destinazione))) + '#' + + LTRIM(RTRIM(UPPER(Gruppo))) AS TagCodeOrig -- TagCodeOrig + FROM [som_ita].[tmp_ImportRic_A] + WHERE Destinazione <> '' OR GRUPPO <> '' + ) + INSERT dbo.SinonimiTag + SELECT cte.TagCodeOrig, cte.TagCodeOrig + FROM cteImportRicA AS cte + LEFT JOIN dbo.SinonimiTag AS st ON cte.TagCodeOrig = st.TagCodeOrig + WHERE cte.TagCodeOrig <> '' AND + st.TagCode IS NULL -- solo nuovi + + SELECT 'NEW SinonimiTag: ' + CAST ( @@ROWCOUNT AS VARCHAR(10) ) + -- ========================================================== + -- INSERT TAGS NUOVI + -- ========================================================== + INSERT dbo.AnagTags + SELECT DISTINCT st.TagCode,'','' FROM dbo.SinonimiTag AS st + LEFT JOIN dbo.AnagTags AS at ON st.TagCode = at.TagCode + WHERE st.TagCode <> '' AND + at.TagCode IS NULL -- solo nuovi + + SELECT 'NEW AnagTags: ' + CAST ( @@ROWCOUNT AS VARCHAR(10) ) + + -- ========================================================== + -- INSERIMENTO NEW Item-TagCode + -- ========================================================== + ;WITH cteImportRicA -- normalizzo campi in ingresso + AS ( + SELECT LTRIM(RTRIM(UPPER(Gruppo))) AS Famiglia + ,LTRIM(RTRIM(UPPER(REPLACE(CASE WHEN ISNULL([Descrizione], '') <> '' + THEN [Descrizione] + ELSE [CodCostruttore] + END, '"', '')))) AS Descrizione -- tolgo eventuali " + ,LTRIM(RTRIM(UPPER(NomeCostruttore))) AS NomeCostruttore + ,LTRIM(RTRIM(UPPER(CodCostruttore))) AS CodCostruttore + ,LTRIM(RTRIM(UPPER(CodSomaschini))) AS CodInterno + ,LTRIM(RTRIM(UPPER(Destinazione))) + '#' + + LTRIM(RTRIM(UPPER(Gruppo))) AS TagCodeOrig -- TagCodeOrig + FROM [som_ita].[tmp_ImportRic_A] + ) + ,cteNew AS -- ricavo idxItem e TagCode effettivo + ( + SELECT DISTINCT ai.idxItem, st.TagCode + FROM cteImportRicA AS tmp + INNER JOIN dbo.AnagItems AS ai + ON tmp.Famiglia = ai.Famiglia AND tmp.Descrizione = ai.Descrizione AND tmp.NomeCostruttore = ai.NomeCostruttore AND tmp.CodCostruttore = ai.CodCostruttore AND tmp.CodInterno = ai.CodInterno + INNER JOIN dbo.SinonimiTag AS st ON tmp.TagCodeOrig = st.TagCodeOrig + ) + --SELECT idxItem, TagCode FROM cteNew + -- inserisco new Item-TagCode + MERGE INTO dbo.Tag2Item AS Target + USING ( SELECT * FROM cteNew ) AS Source + ON Target.idxItem = Source.idxItem AND Target.TagCode = Source.TagCode + WHEN NOT MATCHED BY TARGET THEN + INSERT (idxItem,TagCode) VALUES (idxItem,TagCode) + -- WHEN MATCHED THEN UPDATE SET Giacenza = Source.Giacenza ,dtLastUpd = GETDATE() + -- WHEN NOT MATCHED BY SOURCE THEN DELETE + OUTPUT $ACTION INTO @SummaryOfChanges;-- carico i cambiamenti in tabella + +IF @Test = 1 + ROLLBACK +ELSE COMMIT; + +-- Carico le modifiche fatte in variabile Testo +SELECT Change + ' Tag2Item: ' + CONVERT(VARCHAR(10), COUNT(*)) +FROM @SummaryOfChanges +GROUP BY Change; + +END \ No newline at end of file diff --git a/Projects/GimDB/som_ita/Tables/tmp_ImportRic_A.sql b/Projects/GimDB/som_ita/Tables/tmp_ImportRic_A.sql index 689a9dc..af07f40 100644 --- a/Projects/GimDB/som_ita/Tables/tmp_ImportRic_A.sql +++ b/Projects/GimDB/som_ita/Tables/tmp_ImportRic_A.sql @@ -4,6 +4,9 @@ [CodCostruttore] NVARCHAR (250) CONSTRAINT [DF_tmp_ImportRic_A_CodCostruttore] DEFAULT ('') NOT NULL, [Destinazione] NVARCHAR (250) CONSTRAINT [DF_tmp_ImportRic_A_CodCostruttore1] DEFAULT ('') NOT NULL, [CodSomaschini] NVARCHAR (50) CONSTRAINT [DF_tmp_ImportRic_A_CodSomaschini] DEFAULT ('') NOT NULL, - [Giacenza] INT CONSTRAINT [DF_tmp_ImportRic_A_Giacenza] DEFAULT ((0)) NOT NULL + [Giacenza] INT CONSTRAINT [DF_tmp_ImportRic_A_Giacenza] DEFAULT ((0)) NOT NULL, + [Gruppo] NVARCHAR (250) CONSTRAINT [DF_tmp_ImportRic_A_Gruppo] DEFAULT ('') NOT NULL ); + + diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml index 75795f1..0f1977e 100644 --- a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml +++ b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip index 081ca48..03d39b4 100644 Binary files a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 2055ccb..80c2f28 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 6f48ee8..b03388c 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj.user b/Projects/WebGIM/GIM_site/GIM_site.csproj.user index 0567b37..6f76b3c 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj.user +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - Ufficio-ITA %28IIS01%29 + Somaschini-ITA diff --git a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml index a1fc702..3fec4fd 100644 --- a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml +++ b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml @@ -11,7 +11,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True True - C:\Users\samuele\Documents\Visual Studio 2012\Projects\WebGIM\Projects\ReleaseClienti\Somaschini ITA\GIM_site.zip + C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\WebGIM\Projects\ReleaseClienti\Somaschini ITA\GIM_site.zip true Default Web Site/WebGIM diff --git a/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc index d9ff266..c2b7f91 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc index 352b65f..4e73438 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc index d574675..53651d7 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc @@ -17,7 +17,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc index 8c089fa..a2531e3 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc index d8fad51..5f43847 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc index 05937cc..497efc0 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc index 080eafd..dc74144 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc @@ -17,7 +17,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc index fd3c05f..875c90e 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/logo.png b/Projects/WebGIM/GIM_site/Reports/logo.png index 131b722..7daf8a5 100644 Binary files a/Projects/WebGIM/GIM_site/Reports/logo.png and b/Projects/WebGIM/GIM_site/Reports/logo.png differ diff --git a/Projects/WebGIM/GIM_site/Web.Somaschini.config b/Projects/WebGIM/GIM_site/Web.Somaschini.config index f37e726..711ce7e 100644 --- a/Projects/WebGIM/GIM_site/Web.Somaschini.config +++ b/Projects/WebGIM/GIM_site/Web.Somaschini.config @@ -17,7 +17,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 2055ccb..80c2f28 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 5b98ac4..db319b2 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 6f48ee8..b03388c 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index 1184e0d..f415acb 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml index 05f891d..5ef06a2 100644 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml +++ b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml @@ -1,9 +1,9 @@  - + - + \ No newline at end of file diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll index e10469d..f415acb 100644 Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ