Merge branch 'develop' of keyhammer.ath.cx:C2P into develop

Conflicts:
	C2P_Project/C2P_DB.dbmdl
This commit is contained in:
Samuele E. Locatelli
2014-04-16 18:51:49 +02:00
7 changed files with 91 additions and 22 deletions
+1
View File
@@ -83,3 +83,4 @@ C2P_Project/C2P_Project.dbmdl
#############################################
/VersGen/obj/*
/VersGen/bin/*
/C2P_Project/*.dbmdl
+3
View File
@@ -204,6 +204,9 @@
<Build Include="dbo\Stored Procedures\dbo.stp_QLF_UpdHead.sql" />
<Build Include="dbo\Stored Procedures\dbo.stp_QLF_UpdCosts.sql" />
<Build Include="dbo\Stored Procedures\dbo.stp_insNewLemma.sql" />
<Build Include="dbo\Tables\dbo.Permessi2Funzione.sql" />
<Build Include="dbo\Tables\dbo.Permessi.sql" />
<Build Include="dbo\Stored Procedures\dbo.stp_QLF_UpdQState.sql" />
</ItemGroup>
<ItemGroup>
<None Include="C2P_compare_dev2prod.scmp" />
@@ -0,0 +1,43 @@
-- =============================================
-- Author: Steamware - S.E.L.
-- Create date: 2014.04.16
-- Description: update di un record in QL (Full) e poi aggiorna a cascata
-- =============================================
create PROCEDURE [dbo].[stp_QLF_UpdQState]
(
@Original_QuoteType CHAR(1) = 'Q',
@Original_CodQuote BIGINT = 0,
@Original_QuoteRev INT = 0,
@IdxQState INT
)
AS
BEGIN TRAN
-- aggiorno valori QuoteList!
UPDATE QuoteList
SET IdxQState = @IdxQState
WHERE QuoteType = @Original_QuoteType
AND CodQuote = @Original_CodQuote
AND QuoteRev = @Original_QuoteRev
-- update dei valori calcolati!
EXEC stp_QL_fullDataUpdate @Original_QuoteType
,@Original_CodQuote
,@Original_QuoteRev
,'Y'
COMMIT TRAN
-- seleziono intera riga!
SELECT *
FROM v_QuoteFull_Q
WHERE QuoteType = @Original_QuoteType
AND CodQuote = @Original_CodQuote
AND QuoteRev = @Original_QuoteRev
RETURN
@@ -1,5 +1,8 @@
CREATE PROCEDURE stp_test
CREATE PROCEDURE [dbo].[stp_test]
AS
-- Test per funzionamento temp table
SELECT TOP 1 * INTO #QuoteParam FROM dbo.ClientDet
EXEC stp_QL_update 'Q', 1312130001, 0 --WITH RECOMPILE
SELECT * FROM #QuoteParam
@@ -1,4 +1,5 @@
-- =============================================
-- =============================================
-- Author: Steamware
-- Create date: 2014.01.22
-- Description: aggiorna le tabelle QuoteList con i dati selezionati dalla TabProdSc
@@ -89,13 +90,13 @@ BEGIN
CREATE TABLE #Quoteparam
(
Quotetype CHAR( 1 ) NOT NULL,
Quotetype CHAR( 1 ) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
Codquote BIGINT NOT NULL,
Quoterev INT NOT NULL,
Nump INT IDENTITY( 1,1 ) NOT NULL,
Processnum NVARCHAR( 50 ) NOT NULL,
Descr NVARCHAR( 50 ) NOT NULL,
Parameter NVARCHAR( 100 ) NOT NULL,
Processnum NVARCHAR( 50 ) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
Descr NVARCHAR( 50 ) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
Parameter NVARCHAR( 100 ) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
--PRIMARY KEY
-- ( NumP ASC, QuoteType ASC, CodQuote ASC, QuoteRev ASC ) WITH (PAD_INDEX = ON, FILLFACTOR = 90 )
);
@@ -106,17 +107,17 @@ BEGIN
CREATE TABLE #QuoteWorkInt
(
QuoteType CHAR(1) NOT NULL,
QuoteType CHAR(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
CodQuote BIGINT NOT NULL,
QuoteRev INT NOT NULL,
NumWI INT IDENTITY(1,1) NOT NULL,
ProcessNum NVARCHAR(50) NOT NULL,
CodPlant NVARCHAR(50) NOT NULL,
Class01 NVARCHAR(50) NOT NULL DEFAULT (''),
Class02 NVARCHAR(50) NOT NULL DEFAULT (''),
Class03 NVARCHAR(50) NOT NULL DEFAULT (''),
Class04 NVARCHAR(50) NOT NULL DEFAULT (''),
Class05 NVARCHAR(50) NOT NULL DEFAULT (''),
ProcessNum NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
CodPlant NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
Class01 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class02 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class03 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class04 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class05 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
NetProd DECIMAL(9, 3) NOT NULL DEFAULT ((0)),
WSR DECIMAL(9, 8) NOT NULL DEFAULT ((0)),
MSR DECIMAL(9, 8) NOT NULL DEFAULT ((0)),
@@ -141,17 +142,17 @@ BEGIN
CREATE TABLE #QuoteOC
(
QuoteType CHAR(1) NOT NULL,
QuoteType CHAR(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
CodQuote BIGINT NOT NULL,
QuoteRev INT NOT NULL,
NumEx INT IDENTITY(1,1) NOT NULL,
ProcessNum NVARCHAR(50) NOT NULL,
CodPlant NVARCHAR(50) NOT NULL,
Class01 NVARCHAR(50) NOT NULL DEFAULT (''),
Class02 NVARCHAR(50) NOT NULL DEFAULT (''),
Class03 NVARCHAR(50) NOT NULL DEFAULT (''),
Class04 NVARCHAR(50) NOT NULL DEFAULT (''),
Class05 NVARCHAR(50) NOT NULL DEFAULT (''),
ProcessNum NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
CodPlant NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
Class01 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class02 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class03 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class04 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
Class05 NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL DEFAULT (''),
TotQty DECIMAL(18, 6) NOT NULL DEFAULT ((1)),
TotCost DECIMAL(18, 6) NOT NULL DEFAULT ((0)),
Quota DECIMAL(18, 6) NOT NULL DEFAULT ((1)),
+10
View File
@@ -0,0 +1,10 @@
CREATE TABLE [dbo].[Permessi] (
[COD_PERMESSO] VARCHAR (50) NOT NULL,
[URL] VARCHAR (250) NOT NULL,
[GRUPPO] INT NULL,
[NUMERO] INT NULL,
[NOME] VARCHAR (50) NULL,
[DESCRIZIONE] VARCHAR (50) NULL,
CONSTRAINT [PK_Permessi] PRIMARY KEY CLUSTERED ([COD_PERMESSO] ASC)
);
@@ -0,0 +1,8 @@
CREATE TABLE [dbo].[Permessi2Funzione] (
[COD_PERMESSO] VARCHAR (50) NOT NULL,
[COD_FUNZIONE] NVARCHAR (31) NOT NULL,
[READWRITE] CHAR (1) NULL,
CONSTRAINT [PK_Permessi2Funzione] PRIMARY KEY CLUSTERED ([COD_PERMESSO] ASC, [COD_FUNZIONE] ASC),
CONSTRAINT [FK_Permessi2Funzione_Permessi] FOREIGN KEY ([COD_PERMESSO]) REFERENCES [dbo].[Permessi] ([COD_PERMESSO]) ON UPDATE CASCADE
);