diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index b8d19b78..b14539e0 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 6e418bf0..2e98f5c5 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index b8d19b78..b14539e0 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 c9910a7a..11cc85f4 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs
index acdd8ce3..55c3c76d 100644
--- a/GMW/GMW_WS/bilance.asmx.cs
+++ b/GMW/GMW_WS/bilance.asmx.cs
@@ -1112,6 +1112,33 @@ namespace GMW_WS
return answ;
}
+ ///
+ /// Processa tutti gli UDC terzisti, sia deliberati che non, avanzandoli come spedizione
+ ///
+ /// parola chiave x effettuare lo sblocco
+ ///
+ [WebMethod(Description = "Processa tutti gli UDC terzisti, sia deliberati che non, avanzandoli come spedizione")]
+ public bool UdcCall_processUdcTerzisti(string passkey)
+ {
+ // init
+ bool answ = false;
+ // controllo la passkey
+ string passkeyTrim = passkey.Trim();
+ string passkeyOk = memLayer.ML.confReadString("passkey");
+ if (passkeyOk == passkeyTrim)
+ {
+ try
+ {
+ utils.obj.taSTP.stp_processaSpedizTerz();
+ answ = true;
+ }
+ catch
+ { }
+ }
+ return answ;
+ }
+
+
#region area rettifiche e scarti
///
diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll
index 7c67756f..b14539e0 100644
Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ
diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll
index d2648051..bf4118da 100644
Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll
index fff7efe4..2e98f5c5 100644
Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ
diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll
index d2648051..bf4118da 100644
Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ
diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache
index dbf38b58..838febfd 100644
Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/DS_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs
index e5f30db3..f58d4acd 100644
--- a/GMW/GMW_data/DS_Utility.Designer.cs
+++ b/GMW/GMW_data/DS_Utility.Designer.cs
@@ -6217,7 +6217,7 @@ namespace GMW_data.DS_UtilityTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[12];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[13];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "dbo.stp_dummy";
@@ -6304,13 +6304,18 @@ namespace GMW_data.DS_UtilityTableAdapters {
this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DeltaCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_delibera";
+ this._commandCollection[11].CommandText = "dbo.stp_processaSpedizTerz";
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("@CodTipoDelibera", global::System.Data.SqlDbType.NVarChar, 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", global::System.Data.SqlDbType.NVarChar, 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("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 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("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[12].Connection = this.Connection;
+ this._commandCollection[12].CommandText = "dbo.stp_UDC_delibera";
+ this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[12].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[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDelibera", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[12].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[12].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[12].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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6769,8 +6774,29 @@ namespace GMW_data.DS_UtilityTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual int stp_UDC_delibera(string CodTipoDelibera, string UDC, string CodSoggetto, string CodCS) {
+ public virtual int stp_processaSpedizTerz() {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11];
+ 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_UDC_delibera(string CodTipoDelibera, string UDC, string CodSoggetto, string CodCS) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12];
if ((CodTipoDelibera == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd
index 30602051..c4b9b097 100644
--- a/GMW/GMW_data/DS_Utility.xsd
+++ b/GMW/GMW_data/DS_Utility.xsd
@@ -287,6 +287,16 @@ WHERE (value = @value)
+
+
+
+ dbo.stp_processaSpedizTerz
+
+
+
+
+
+
@@ -517,21 +527,21 @@ where value = @value
-
+
-
+
-
+
@@ -544,22 +554,22 @@ where value = @value
-
-
+
+
-
+
-
+
@@ -572,35 +582,15 @@ where value = @value
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -614,21 +604,41 @@ where value = @value
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -641,29 +651,29 @@ where value = @value
-
-
+
+
-
+
-
+
-
+
@@ -676,8 +686,8 @@ where value = @value
-
-
+
+
@@ -690,14 +700,14 @@ where value = @value
-
+
-
+
@@ -710,21 +720,21 @@ where value = @value
-
+
-
+
-
+
@@ -737,14 +747,14 @@ where value = @value
-
+
-
+
@@ -757,21 +767,21 @@ where value = @value
-
+
-
+
-
+
@@ -784,21 +794,21 @@ where value = @value
-
+
-
+
-
+
diff --git a/GMW/GMW_data/SqlScripts/GMW_00315.sql b/GMW/GMW_data/SqlScripts/GMW_00315.sql
index 8d4ecc77..422d5485 100644
--- a/GMW/GMW_data/SqlScripts/GMW_00315.sql
+++ b/GMW/GMW_data/SqlScripts/GMW_00315.sql
@@ -22,7 +22,322 @@ go
+set xact_abort on
+go
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_anagFullParticolare
+*
+* ottiene il dettaglio delle specifiche di un particolare dato il suo codice A PARTIRE DALL'ANAGRAFICA COMPLETA
+*
+* Steamware, S.E.L.
+* mod: 2010.11.17
+*
+****************************************/
+create PROCEDURE stp_anagFullParticolare
+(
+ @Particolare NVARCHAR(15)
+)
+AS
+
+SELECT *
+FROM dbo.v_AnagDatiParticolari
+WHERE Particolare=@Particolare
+
+
+RETURN
+go
+
+commit
+go
+
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_rettMovAs400
+*
+* inserisce nella tabella per i trasferimenti batch verso magazzino AS una quantitą di rettifica (con segno - )per UDC eventualmente gią scaricati a sistema
+*
+* Steamware, S.E.L.
+* mod: 2010.11.02
+*
+****************************************/
+alter PROCEDURE stp_rettMovAs400
+(
+ @Particolare NVARCHAR(50),
+ @UDC NVARCHAR(20),
+ @CodMagAS NVARCHAR(50),
+ @Qta DECIMAL(10,2),
+ @CodEvento NVARCHAR(10)
+)
+AS
+
+BEGIN
+
+ INSERT INTO AS400_BatchMovimenti(DataIns, CodEvento, Particolare, UDC, CodMagAS, Quantita)
+ VALUES (GETDATE(), @CodEvento, @Particolare, @UDC, @CodMagAS, -@Qta)
+
+END
+
+RETURN
+go
+
+commit
+go
+
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_UDC_getByTipoDelibera
+*
+* elenco cartellini che possono essere oggetto della delibera indicata
+*
+* Steamware, S.E.L.
+* mod: 2010.07.29
+*
+****************************************/
+alter PROCEDURE stp_UDC_getByTipoDelibera
+(
+ @CodTipoDelibera NVARCHAR(50),
+ @DataFrom DATETIME,
+ @DataTo DATETIME
+)
+AS
+
+SELECT *
+FROM ElencoCartellini
+WHERE IdxPosizione IN (
+ SELECT TabTranPosizEventi.IdxPosizione
+ FROM TabTranPosizEventi INNER JOIN AnagTipoEvento ON TabTranPosizEventi.CodEvento = AnagTipoEvento.CodEvento
+ INNER JOIN AnagTipoDelibere ON AnagTipoEvento.CodEvento = AnagTipoDelibere.CodEvento
+ WHERE (AnagTipoDelibere.CodTipoDelibera = @CodTipoDelibera)
+ ) -- vincolo su posizioni accettabili
+ AND DataFus BETWEEN @DataFrom AND @DataTo -- vincolo data
+ AND UDC NOT IN (SELECT DISTINCT UDC FROM PosizioneUdcCorrente puc INNER JOIN Celle c on puc.IdxCella=c.IdxCella INNER JOIN TipoCella tc ON c.IdxTipoCella=tc.IdxTipoCella WHERE tc.CodMag = 'OVAS')
+ORDER BY UDC DESC
+
+RETURN
+go
+
+commit
+go
+
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+alter VIEW v_AnagDatiParticolari
+AS
+SELECT DISTINCT
+ ISNULL(part.CodCliente, N'') AS CodCliente, ISNULL(Cli.RagSociale, N'') AS RagSociale, part.Particolare, part.DescParticolare, ISNULL(part.DisegnoGrezzo, N'')
+ AS DisegnoGrezzo, ISNULL(Espo.Esponente, N'') AS Esponente, ISNULL(Stamp.CodStampo, N'') AS CodStampo, ISNULL(Fig.Figura, N'') AS Figura
+FROM RilPro.AnagParticolari AS part LEFT OUTER JOIN
+ RilPro.StampoArticolo AS Stamp ON part.Particolare = Stamp.Particolare LEFT OUTER JOIN
+ RilPro.StampoEsponente AS Espo ON Stamp.CodStampo = Espo.CodStampo LEFT OUTER JOIN
+ RilPro.StampoFigure AS Fig ON Stamp.CodStampo = Fig.CodStampo LEFT OUTER JOIN
+ RilPro.AnagClienti AS Cli ON part.CodCliente = Cli.CodCliente
+go
+
+exec sp_addextendedproperty 'MS_DiagramPane1', '[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 = "part"
+ Begin Extent =
+ Top = 6
+ Left = 38
+ Bottom = 135
+ Right = 208
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ Begin Table = "Stamp"
+ Begin Extent =
+ Top = 6
+ Left = 246
+ Bottom = 135
+ Right = 421
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ Begin Table = "Espo"
+ Begin Extent =
+ Top = 138
+ Left = 38
+ Bottom = 267
+ Right = 208
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ Begin Table = "Fig"
+ Begin Extent =
+ Top = 138
+ Left = 246
+ Bottom = 250
+ Right = 416
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ Begin Table = "Cli"
+ Begin Extent =
+ Top = 252
+ Left = 246
+ Bottom = 347
+ Right = 416
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ End
+ End
+ Begin SQLPane =
+ End
+ Begin DataPane =
+ Begin ParameterDefaults = ""
+ End
+ Begin ColumnWidths = 9
+ Width = 284
+ 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
+ ', 'SCHEMA', 'dbo', 'VIEW', 'v_AnagDatiParticolari'
+go
+
+exec sp_addextendedproperty 'MS_DiagramPane2', ' Output = 720
+ Append = 1400
+ NewValue = 1170
+ SortType = 1350
+ SortOrder = 1410
+ GroupBy = 1350
+ Filter = 1350
+ Or = 1350
+ Or = 1350
+ Or = 1350
+ End
+ End
+End
+', 'SCHEMA', 'dbo', 'VIEW', 'v_AnagDatiParticolari'
+go
+
+exec sp_addextendedproperty 'MS_DiagramPaneCount', 2, 'SCHEMA', 'dbo', 'VIEW', 'v_AnagDatiParticolari'
+go
+
+commit
+go
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index ff16f1da..2e98f5c5 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/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index ff16f1da..2e98f5c5 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 2dd817e4..6bdafa1e 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