diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs
index 8aa6d30e..9eda44e9 100644
--- a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs
@@ -240,11 +240,27 @@ namespace GMW.WebUserControls
private void consumaUdc(string UDC)
{
// turno: per ora è semplicemente sempre calcolato coi 3 turni 1-2-3
- string turno = (1 + Math.Floor(Convert.ToDouble((DateTime.Now.AddHours(-6).TimeOfDay.Hours) / 8))).ToString();
+ int turnoInt = Convert.ToInt32(1 + Math.Floor(Convert.ToDouble((DateTime.Now.AddHours(-6).TimeOfDay.Hours) / 8)));
+ string turno = "";
+ switch (turnoInt)
+ {
+ case 1:
+ turno = "P";
+ break;
+ case 2:
+ turno = "S";
+ break;
+ case 3:
+ turno = "N";
+ break;
+ default:
+ turno = "P";
+ break;
+ }
string codTerz = "";
try
{
- if (rbl.SelectedValue == "Ext")
+ if (rbl.SelectedValue == "T01")
{
codTerz = txtExt.Text.Trim();
}
@@ -255,7 +271,7 @@ namespace GMW.WebUserControls
{
utils.obj.taSTP.stp_accodaConsumoUdcMP(UDC, DateTime.Now, turno, rbl.SelectedValue, codTerz);
}
- catch(Exception e)
+ catch (Exception e)
{
logger.lg.scriviLog(string.Format("Errore tentando di consumare UDC di MP cod {0}: {1}{2}", UDC, Environment.NewLine, e), tipoLog.EXCEPTION);
}
@@ -268,7 +284,7 @@ namespace GMW.WebUserControls
protected void rbl_SelectedIndexChanged(object sender, EventArgs e)
{
// constrollo se è ext mostro testo ext...
- if (rbl.SelectedValue == "Ext")
+ if (rbl.SelectedValue == "T01")
{
txtExt.Visible = true;
}
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 5450ace0..927a5d3c 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 cb4ae089..beef4648 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 1852629b..60b17896 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index e0102eed..8a6a8e35 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 53ccc6d5..954cc9c8 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 5450ace0..927a5d3c 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 af1a1c2e..d97b5b43 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config
index 7c158013..bbd2b4c5 100644
--- a/GMW/GMW_Term/Web.config
+++ b/GMW/GMW_Term/Web.config
@@ -121,17 +121,16 @@
-
-
-
+
+
+
-
-
-
+
+
diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config
index b2356b93..a1b4306b 100644
--- a/GMW/GMW_WS/Web.config
+++ b/GMW/GMW_WS/Web.config
@@ -158,16 +158,16 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/GMW/GMW_data/DS_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs
index 6919bc36..b1e894bd 100644
--- a/GMW/GMW_data/DS_Utility.Designer.cs
+++ b/GMW/GMW_data/DS_Utility.Designer.cs
@@ -6180,7 +6180,7 @@ namespace GMW_data.DS_UtilityTableAdapters {
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataPrelFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TurnoPrelFus", global::System.Data.SqlDbType.Char, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestLega", global::System.Data.SqlDbType.Char, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestTerz", global::System.Data.SqlDbType.Char, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DestTerz", global::System.Data.SqlDbType.Char, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = "BatchQueue.stp_batch_RapQual_S01";
diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd
index d91a70eb..6999048a 100644
--- a/GMW/GMW_data/DS_Utility.xsd
+++ b/GMW/GMW_data/DS_Utility.xsd
@@ -158,7 +158,7 @@ WHERE (value = @value)
-
+
dbo.stp_accodaConsumoUdcMP
@@ -168,12 +168,12 @@ WHERE (value = @value)
-
+
-
+
BatchQueue.stp_batch_RapQual_S01
@@ -184,7 +184,7 @@ WHERE (value = @value)
-
+
BatchQueue.stp_batch_RapQual_S02
@@ -194,7 +194,7 @@ WHERE (value = @value)
-
+
dbo.stp_celleCreaMancantiBlocco
@@ -208,7 +208,7 @@ WHERE (value = @value)
-
+
dbo.stp_ContaCelle4Blocchi
@@ -221,7 +221,7 @@ WHERE (value = @value)
-
+
dbo.stp_ContaCelle4Tipo
@@ -234,7 +234,7 @@ WHERE (value = @value)
-
+
dbo.stp_ContaCelleBlocco
@@ -249,7 +249,7 @@ WHERE (value = @value)
-
+
dbo.stp_ContaCelleCapa
@@ -262,7 +262,7 @@ WHERE (value = @value)
-
+
dbo.stp_ContaCelleCreate
@@ -275,7 +275,7 @@ WHERE (value = @value)
-
+
dbo.stp_ContaDeltaCelleBlocco
@@ -287,7 +287,7 @@ WHERE (value = @value)
-
+
dbo.stp_UDC_delibera
@@ -504,21 +504,21 @@ WHERE (conditio = @conditio)
-
+
-
+
-
+
@@ -531,22 +531,22 @@ WHERE (conditio = @conditio)
-
-
+
+
-
+
-
+
@@ -559,35 +559,15 @@ WHERE (conditio = @conditio)
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -601,21 +581,41 @@ WHERE (conditio = @conditio)
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -628,29 +628,29 @@ WHERE (conditio = @conditio)
-
-
+
+
-
+
-
+
-
+
@@ -663,8 +663,8 @@ WHERE (conditio = @conditio)
-
-
+
+
@@ -677,14 +677,14 @@ WHERE (conditio = @conditio)
-
+
-
+
@@ -697,21 +697,21 @@ WHERE (conditio = @conditio)
-
+
-
+
-
+
@@ -724,14 +724,14 @@ WHERE (conditio = @conditio)
-
+
-
+
@@ -744,7 +744,7 @@ WHERE (conditio = @conditio)
-
+
@@ -757,21 +757,21 @@ WHERE (conditio = @conditio)
-
+
-
+
-
+
@@ -784,21 +784,21 @@ WHERE (conditio = @conditio)
-
+
-
+
-
+
diff --git a/GMW/GMW_data/DS_Utility.xss b/GMW/GMW_data/DS_Utility.xss
index 1cd67a06..c9d32882 100644
--- a/GMW/GMW_data/DS_Utility.xss
+++ b/GMW/GMW_data/DS_Utility.xss
@@ -4,13 +4,13 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
+
-
+
@@ -18,7 +18,7 @@
-
+
\ No newline at end of file
diff --git a/GMW/GMW_data/SqlScripts/GMW_00280.sql b/GMW/GMW_data/SqlScripts/GMW_00280.sql
new file mode 100644
index 00000000..52f9833a
--- /dev/null
+++ b/GMW/GMW_data/SqlScripts/GMW_00280.sql
@@ -0,0 +1,253 @@
+create index i_UDC on AS400_BatchConsumoMP(UDC)
+go
+
+
+create index i_UDC on RilPro.RapQual(UDC)
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_consumaMP
+*
+* Salva il movimento di consumo dell'UDC di MP indicato
+*
+* Steamware, S.E.L.
+* mod: 2010.10.12
+*
+****************************************/
+alter PROCEDURE BatchQueue.stp_consumaMP
+(
+ @XRPQLN INT, --è il num rap qualità
+ @XNRETI NVARCHAR(10), -- è il numUdc prog
+ @XDTPRO INT, -- data 8 cifre aaaammgg
+ @XTRPRO NVARCHAR(5), -- turno
+ @XDESMT NVARCHAR(3), -- destinatario int/terzista
+ @XCDTER NVARCHAR(6) -- cod terzista
+)
+AS
+ -- BOZZA DA VERIFICARE E COMPLETARE A CURA MAZZUCCONI!!!
+
+ DECLARE @SQL AS NVARCHAR(1000)
+
+ -- Faccio chiamata su AS400
+
+ SET @SQL = N' OPENQUERY( P65220DC, ''UPDATE MAZZT_DTV3.XOGIX00F'
+ SET @SQL = @SQL + 'SET XDTPRO = ' + @XDTPRO + ', XTRPRO = ' + @XTRPRO
+ SET @SQL = @SQL + ', XDESMT = ''' + @XDESMT +''', XMATSC=''S'' , XCDTER = ''' + @XCDTER + ''' '
+ SET @SQL = @SQL + 'WHERE XRPQLN =' + @XRPQLN + ' AND XNRETI = ' + @XNRETI + ''' )'
+
+ EXEC sp_executesql @SQL
+
+RETURN
+go
+
+commit
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_processaCodaConsumoMP
+*
+* Processa la coda dei consumo di UDC di MP e chiaam procedura x salvataggio dato su AS400
+*
+* Steamware, S.E.L.
+* mod: 2010.10.12
+*
+****************************************/
+create PROCEDURE BatchQueue.stp_processaCodaConsumoMP
+AS
+ -- BOZZA DA VERIFICARE E COMPLETARE A CURA MAZZUCCONI!!!
+
+ -- faccio una query con un cursore x processare tutte le righe da inviare ad AS400..
+ DECLARE @UDC NVARCHAR(50)
+ DECLARE @XRPQLN INT
+ DECLARE @XNRETI NVARCHAR(10)
+ DECLARE @XDTPRO INT
+ DECLARE @XTRPRO NVARCHAR(5)
+ DECLARE @XDESMT NVARCHAR(3)
+ DECLARE @XCDTER NVARCHAR(6)
+
+ DECLARE @SqlCode NVARCHAR(1000)
+
+ DECLARE UdcMpList CURSOR FOR
+ SELECT UDC FROM AS400_BatchConsumoMP WHERE DataInvioAs IS NULL
+ OPEN UdcMpList
+ FETCH NEXT FROM UdcMpList
+ INTO @UDC
+ WHILE @@FETCH_STATUS = 0
+ BEGIN
+ -- controllo ci sia la riga
+ IF (SELECT COUNT(UDC) FROM AS400_BatchConsumoMP WHERE UDC=@UDC) > 0
+ BEGIN
+ -- carico valori che mi servono
+ SELECT @XRPQLN=rq.nRapQual, @XNRETI=rq.ProgUDC, @XDTPRO=bcu.DataPrelFus, @XTRPRO=bcu.TurnoPrelFus,
+ @XDESMT=bcu.DestLega, @XCDTER=bcu.DestTerz
+ FROM AS400_BatchConsumoMP as bcu INNER JOIN RilPro.RapQual as rq ON bcu.UDC = rq.UDC
+ WHERE bcu.UDC=@UDC
+ -- compongo testo x exec
+ SET @SqlCode = N'EXEC BatchQueue.stp_consumaMP ' + CAST(@XRPQLN AS NVARCHAR(50)) + ' ' + @XNRETI + ' ' + CAST(@XDTPRO AS NVARCHAR(8)) + ' ' + LTRIM(RTRIM(@XTRPRO)) + ' ' + LTRIM(RTRIM(@XDESMT)) + ' ' + LTRIM(RTRIM(@XCDTER))
+ -- lo mostro
+ print '%' + LTRIM(RTRIM(@SqlCode)) + '%'
+
+ -- chiamo la stored ed eseguo invio
+ --EXEC sp_executesql @SqlCode -- decommentare se va bene...
+ FETCH NEXT FROM UdcMpList INTO @UDC
+ END
+ END
+ CLOSE UdcMpList
+ DEALLOCATE UdcMpList
+
+
+RETURN
+go
+
+commit
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_processaCodaConsumoMP
+*
+* Processa la coda dei consumo di UDC di MP e chiaam procedura x salvataggio dato su AS400
+*
+* Steamware, S.E.L.
+* mod: 2010.10.12
+*
+****************************************/
+create PROCEDURE BatchQueue.stp_processaCodaConsumoMP
+AS
+ -- BOZZA DA VERIFICARE E COMPLETARE A CURA MAZZUCCONI!!!
+
+ -- faccio una query con un cursore x processare tutte le righe da inviare ad AS400..
+ DECLARE @UDC NVARCHAR(50)
+ DECLARE @XRPQLN INT
+ DECLARE @XNRETI NVARCHAR(10)
+ DECLARE @XDTPRO INT
+ DECLARE @XTRPRO NVARCHAR(5)
+ DECLARE @XDESMT NVARCHAR(3)
+ DECLARE @XCDTER NVARCHAR(6)
+
+ DECLARE @SqlCode NVARCHAR(1000)
+
+ DECLARE UdcMpList CURSOR FOR
+ SELECT UDC FROM AS400_BatchConsumoMP WHERE DataInvioAs IS NULL
+ OPEN UdcMpList
+ FETCH NEXT FROM UdcMpList
+ INTO @UDC
+ WHILE @@FETCH_STATUS = 0
+ BEGIN
+ -- controllo ci sia la riga
+ IF (SELECT COUNT(UDC) FROM AS400_BatchConsumoMP WHERE UDC=@UDC) > 0
+ BEGIN
+ -- carico valori che mi servono
+ SELECT @XRPQLN=rq.nRapQual, @XNRETI=rq.ProgUDC, @XDTPRO=bcu.DataPrelFus, @XTRPRO=bcu.TurnoPrelFus,
+ @XDESMT=bcu.DestLega, @XCDTER=bcu.DestTerz
+ FROM AS400_BatchConsumoMP as bcu INNER JOIN RilPro.RapQual as rq ON bcu.UDC = rq.UDC
+ WHERE bcu.UDC=@UDC
+ -- compongo testo x exec
+ SET @SqlCode = N'EXEC BatchQueue.stp_consumaMP ' + CAST(@XRPQLN AS NVARCHAR(50)) + ' ' + @XNRETI + ' ' + CAST(@XDTPRO AS NVARCHAR(8)) + ' ' + LTRIM(RTRIM(@XTRPRO)) + ' ' + LTRIM(RTRIM(@XDESMT)) + ' ' + LTRIM(RTRIM(@XCDTER))
+ -- lo mostro
+ print '%' + LTRIM(RTRIM(@SqlCode)) + '%'
+
+ -- chiamo la stored ed eseguo invio
+ --EXEC sp_executesql @SqlCode -- decommentare se va bene...
+ FETCH NEXT FROM UdcMpList INTO @UDC
+ END
+ END
+ CLOSE UdcMpList
+ DEALLOCATE UdcMpList
+
+
+RETURN
+go
+
+commit
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_accodaConsumoUdcMP
+*
+* Accoda alla tab Batch il consumo di un UDC
+*
+* Steamware, S.E.L.
+* mod: 2010.10.10
+*
+****************************************/
+alter PROCEDURE stp_accodaConsumoUdcMP
+(
+ @UDC NVARCHAR(50),
+ @DataPrelFus DATETIME,
+ @TurnoPrelFus CHAR(5),
+ @DestLega CHAR(3),
+ @DestTerz CHAR(6)
+)
+AS
+
+BEGIN TRAN
+
+ -- registro movimento da riconciliare
+ INSERT INTO AS400_BatchConsumoMP(ProgUDC, UDC, DataPrelFus, TurnoPrelFus, DestLega, DestTerz)
+ SELECT ProgUdc, UDC, dbo.dateToAsFormat(@DataPrelFus), @TurnoPrelFus, @DestLega, @DestTerz FROM RilPro.RapQual WHERE UDC = @UDC
+
+ -- aggiorno con data e turno di prelievo su tab RilPro (locale)
+ UPDATE RilPro.RapQual
+ SET DataPrelFus = dbo.dateToAsFormat(@DataPrelFus), TurnoPrelFus = @TurnoPrelFus
+ WHERE UDC = @UDC
+
+COMMIT TRAN
+
+RETURN
+go
+
+commit
+go
+
+
+
+
+
+
+
+
+
+
+-- registro versione...
+INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(280, GETDATE())
+GO
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 5294e4ed..79a1b299 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 cb4ae089..beef4648 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 5294e4ed..79a1b299 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_Utility.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll
index fd32cb1f..4f61cc4b 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Utility.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 cb4ae089..beef4648 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_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 8c47f240..1bc45f9c 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
- "ProductCode" = "8:{E73656DE-8AAF-4D16-8E4E-1DF8762E92D9}"
- "PackageCode" = "8:{FA05BF88-D592-4BAF-A789-E114537C50D8}"
+ "ProductCode" = "8:{26E048FD-FB45-405E-8C0D-B2ED3AEFD572}"
+ "PackageCode" = "8:{295A827B-F741-4DA4-8856-E31444A14A2B}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.280"
+ "ProductVersion" = "8:1.0.281"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 2e2b0d83..404b45e3 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ