diff --git a/GMW/GMW.suo b/GMW/GMW.suo
index 8ae0cda1..734135ff 100644
Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 09a52171..ea5d31ca 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 fb9d2755..efd68f93 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 09a52171..ea5d31ca 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 1d1f6080..8299ae94 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs
index c2ed384a..9fd657e0 100644
--- a/GMW/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW/GMW_data/DS_magazzino.Designer.cs
@@ -11855,9 +11855,10 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella =
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
-            this._commandCollection[4].CommandText = "SELECT *\r\nFROM dbo.PosizioneUdcCorrente\r\nwhere UDC = @UDC";
-            this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "UDC", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].CommandText = "dbo.stp_getPosizioneByUdc";
+            this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[4].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[4].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[5] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[5].Connection = this.Connection;
             this._commandCollection[5].CommandText = "dbo.stp_spostaUdc";
@@ -11951,10 +11952,10 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella =
         public virtual DS_magazzino.PosizioneUdcCorrenteDataTable getByUDC(string UDC) {
             this.Adapter.SelectCommand = this.CommandCollection[4];
             if ((UDC == null)) {
-                throw new global::System.ArgumentNullException("UDC");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(UDC));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC));
             }
             DS_magazzino.PosizioneUdcCorrenteDataTable dataTable = new DS_magazzino.PosizioneUdcCorrenteDataTable();
             this.Adapter.Fill(dataTable);
@@ -16463,11 +16464,10 @@ SELECT CodLista, CodTipoLista, CodCS, DataCreaz, CodCliente, RagSociale, CodSogg
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = "SELECT CodCS, CodCliente, CodImballo, CodLista, CodSoggetto, CodTipoLista, Comple" +
-                "tata, DataCreaz, DescParticolare, DisegnoGrezzo, Esponente, Iniziata, Particolar" +
-                "e, QtaTot, RagSociale FROM ElencoListePrelievo WHERE (CodLista = @CodLista)";
-            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, "CodLista", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].CommandText = "dbo.stp_getElencoListaByCodLista";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, 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 = "dbo.stp_creaListaPrelievo";
@@ -16529,10 +16529,10 @@ SELECT CodLista, CodTipoLista, CodCS, DataCreaz, CodCliente, RagSociale, CodSogg
         public virtual DS_magazzino.ElencoListePrelievoDataTable getByCodLista(string CodLista) {
             this.Adapter.SelectCommand = this.CommandCollection[1];
             if ((CodLista == null)) {
-                throw new global::System.ArgumentNullException("CodLista");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodLista));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodLista));
             }
             DS_magazzino.ElencoListePrelievoDataTable dataTable = new DS_magazzino.ElencoListePrelievoDataTable();
             this.Adapter.Fill(dataTable);
@@ -17293,9 +17293,10 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella FROM TipoListaPrelievo W
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = "SELECT *\r\nFROM dbo.TipoListaPrelievo\r\nwhere CodTipoLista = @CodTipoLista";
-            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "CodTipoLista", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].CommandText = "dbo.stp_getTipoListaByCodTipoLista";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17326,10 +17327,10 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella FROM TipoListaPrelievo W
         public virtual DS_magazzino.TipoListaPrelievoDataTable getByCodTipoLista(string CodTipoLista) {
             this.Adapter.SelectCommand = this.CommandCollection[1];
             if ((CodTipoLista == null)) {
-                throw new global::System.ArgumentNullException("CodTipoLista");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodTipoLista));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodTipoLista));
             }
             DS_magazzino.TipoListaPrelievoDataTable dataTable = new DS_magazzino.TipoListaPrelievoDataTable();
             this.Adapter.Fill(dataTable);
@@ -17702,16 +17703,24 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM dbo.RigheListePrelievo";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = "SELECT *\r\nFROM dbo.RigheListePrelievo\r\nwhere CodLista = @CodLista";
-            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, "CodLista", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].CommandText = "dbo.stp_getRigaPrelievoByCodLista";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, 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 = "dbo.stp_setAnnullaUdcPrelevato";
+            this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLista", global::System.Data.SqlDbType.NVarChar, 12, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].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, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17742,10 +17751,32 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
         public virtual DS_magazzino.RigheListePrelievoDataTable getByCodLista(string CodLista) {
             this.Adapter.SelectCommand = this.CommandCollection[1];
             if ((CodLista == null)) {
-                throw new global::System.ArgumentNullException("CodLista");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(CodLista));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodLista));
+            }
+            DS_magazzino.RigheListePrelievoDataTable dataTable = new DS_magazzino.RigheListePrelievoDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_magazzino.RigheListePrelievoDataTable setAnnullaUdcPrelevato(string CodLista, string UDC) {
+            this.Adapter.SelectCommand = this.CommandCollection[2];
+            if ((CodLista == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodLista));
+            }
+            if ((UDC == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(UDC));
             }
             DS_magazzino.RigheListePrelievoDataTable dataTable = new DS_magazzino.RigheListePrelievoDataTable();
             this.Adapter.Fill(dataTable);
diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd
index 258de4a8..83d94f5d 100644
--- a/GMW/GMW_data/DS_magazzino.xsd
+++ b/GMW/GMW_data/DS_magazzino.xsd
@@ -446,14 +446,13 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.PosizioneUdcCorrente" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByUDC" GetMethodModifier="Public" GetMethodName="getByUDC" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByUDC" UserSourceName="getByUDC">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_getPosizioneByUdc" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByUDC" GetMethodModifier="Public" GetMethodName="getByUDC" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByUDC" UserSourceName="getByUDC">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT *
-FROM dbo.PosizioneUdcCorrente
-where UDC = @UDC</CommandText>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_getPosizioneByUdc</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="UDC" ColumnName="UDC" DataSourceName="GMW.dbo.PosizioneUdcCorrente" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@UDC" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="UDC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UDC" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1471,12 +1470,13 @@ SELECT CodLista, CodTipoLista, CodCS, DataCreaz, CodCliente, RagSociale, CodSogg
               <Mapping SourceColumn="Completata" DataSetColumn="Completata" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.ElencoListePrelievo" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCodLista" GeneratorSourceName="FillBy" GetMethodModifier="Public" GetMethodName="getByCodLista" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCodLista" UserSourceName="getByCodLista">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_getElencoListaByCodLista" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCodLista" GeneratorSourceName="FillBy" GetMethodModifier="Public" GetMethodName="getByCodLista" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCodLista" UserSourceName="getByCodLista">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT CodCS, CodCliente, CodImballo, CodLista, CodSoggetto, CodTipoLista, Completata, DataCreaz, DescParticolare, DisegnoGrezzo, Esponente, Iniziata, Particolare, QtaTot, RagSociale FROM ElencoListePrelievo WHERE (CodLista = @CodLista)</CommandText>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_getElencoListaByCodLista</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CodLista" ColumnName="CodLista" DataSourceName="GMW.dbo.ElencoListePrelievo" DataTypeServer="nvarchar(12)" DbType="String" Direction="Input" ParameterName="@CodLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="12" SourceColumn="CodLista" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="12" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1590,14 +1590,13 @@ SELECT CodTipoLista, DescrLista, IdxPosizione, CodCella FROM TipoListaPrelievo W
               <Mapping SourceColumn="CodCella" DataSetColumn="CodCella" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.TipoListaPrelievo" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCodTipoLista" GetMethodModifier="Public" GetMethodName="getByCodTipoLista" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCodTipoLista" UserSourceName="getByCodTipoLista">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_getTipoListaByCodTipoLista" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCodTipoLista" GetMethodModifier="Public" GetMethodName="getByCodTipoLista" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCodTipoLista" UserSourceName="getByCodTipoLista">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT *
-FROM dbo.TipoListaPrelievo
-where CodTipoLista = @CodTipoLista</CommandText>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_getTipoListaByCodTipoLista</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CodTipoLista" ColumnName="CodTipoLista" DataSourceName="GMW.dbo.TipoListaPrelievo" DataTypeServer="nvarchar(10)" DbType="String" Direction="Input" ParameterName="@CodTipoLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="10" SourceColumn="CodTipoLista" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodTipoLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="10" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1670,14 +1669,25 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
               <Mapping SourceColumn="Prelevato" DataSetColumn="Prelevato" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.RigheListePrelievo" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCodLista" GeneratorSourceName="FillBy" GetMethodModifier="Public" GetMethodName="getByCodLista" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCodLista" UserSourceName="getByCodLista">
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_getRigaPrelievoByCodLista" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCodLista" GetMethodModifier="Public" GetMethodName="getByCodLista" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCodLista" UserSourceName="getByCodLista">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT *
-FROM dbo.RigheListePrelievo
-where CodLista = @CodLista</CommandText>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_getRigaPrelievoByCodLista</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CodLista" ColumnName="CodLista" DataSourceName="GMW.dbo.RigheListePrelievo" DataTypeServer="nvarchar(12)" DbType="String" Direction="Input" ParameterName="@CodLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="12" SourceColumn="CodLista" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="12" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="GMWConnectionString (Settings)" DbObjectName="GMW.dbo.stp_setAnnullaUdcPrelevato" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="setAnnullaUdcPrelevato" GetMethodModifier="Public" GetMethodName="setAnnullaUdcPrelevato" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="setAnnullaUdcPrelevato" UserSourceName="setAnnullaUdcPrelevato">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_setAnnullaUdcPrelevato</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodLista" Precision="0" ProviderType="NVarChar" Scale="0" Size="12" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UDC" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss
index 05250962..561db68e 100644
--- a/GMW/GMW_data/DS_magazzino.xss
+++ b/GMW/GMW_data/DS_magazzino.xss
@@ -4,11 +4,11 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="779" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="307" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:ElencoCartellini" ZOrder="24" X="68" Y="333" Height="449" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
     <Shape ID="DesignTable:AnagMag" ZOrder="23" X="1014" Y="372" Height="210" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:PosizioneUdcCorrente" ZOrder="4" X="409" Y="544" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:PosizioneUdcCorrente" ZOrder="1" X="409" Y="544" Height="251" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:PosizioneUdcStorico" ZOrder="21" X="387" Y="322" Height="172" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:Blocchi" ZOrder="14" X="1014" Y="652" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:Celle" ZOrder="13" X="693" Y="532" Height="343" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
@@ -18,9 +18,9 @@
     <Shape ID="DesignTable:V_ParticolariOverview" ZOrder="10" X="95" Y="1162" Height="210" Width="275" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:V_MagazziniOverview" ZOrder="9" X="659" Y="1045" Height="343" Width="271" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:V_DettMagPart" ZOrder="8" X="993" Y="985" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ElencoListePrelievo" ZOrder="7" X="335" Y="820" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="228" />
-    <Shape ID="DesignTable:TipoListaPrelievo" ZOrder="6" X="697" Y="906" Height="156" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" />
-    <Shape ID="DesignTable:RigheListePrelievo" ZOrder="3" X="59" Y="901" Height="173" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" />
+    <Shape ID="DesignTable:ElencoListePrelievo" ZOrder="3" X="335" Y="820" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="228" />
+    <Shape ID="DesignTable:TipoListaPrelievo" ZOrder="2" X="697" Y="906" Height="156" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" />
+    <Shape ID="DesignTable:RigheListePrelievo" ZOrder="6" X="59" Y="901" Height="190" Width="258" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_PosizioneUdcCorrente_ElencoCartellini" ZOrder="22" LineWidth="11">
@@ -63,15 +63,15 @@
       <RoutePoints>
         <Point>
           <X>693</X>
-          <Y>800</Y>
+          <Y>803</Y>
         </Point>
         <Point>
           <X>676</X>
-          <Y>800</Y>
+          <Y>803</Y>
         </Point>
         <Point>
           <X>676</X>
-          <Y>773</Y>
+          <Y>795</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -99,7 +99,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ElencoListePrelievo_TipoListaPrelievo1" ZOrder="5" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ElencoListePrelievo_TipoListaPrelievo1" ZOrder="7" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>697</X>
@@ -111,7 +111,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_RigheListePrelievo_ElencoCartellini" ZOrder="2" LineWidth="11">
+    <Connector ID="DesignRelation:FK_RigheListePrelievo_ElencoCartellini" ZOrder="5" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>109</X>
@@ -123,7 +123,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_RigheListePrelievo_ElencoListePrelievo1" ZOrder="1" LineWidth="11">
+    <Connector ID="DesignRelation:FK_RigheListePrelievo_ElencoListePrelievo1" ZOrder="4" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>335</X>
diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs
index 2012c033..3c97044e 100644
--- a/GMW/GMW_data/MagClass.cs
+++ b/GMW/GMW_data/MagClass.cs
@@ -389,9 +389,9 @@ namespace GMW_data
         /// <param name="CodLista">codice della lista di prelievo</param>
         /// <param name="UDC">Codice UDC</param>
         /// <returns>esito comando</returns>
-        public bool annullaUdcPrelevatoPerLista(string CodCS, string CodLista, string UDC)
+        public esitoOperazione annullaUdcPrelevatoPerLista(string CodCS, string CodLista, string UDC)
         {
-            bool answ = false;
+            esitoOperazione answ = esitoOperazione.errore_mismatch;
 
             /*
              * Questa funzione va chiamata da web o da terminalino ogni volta che si fa un annullamento di avvenuto prelievo, ovvero il carrellista ha ANNULLATO un prelievo di un UDC associato ad una lista
@@ -405,6 +405,21 @@ namespace GMW_data
              * 
              * */
 
+            // ricavo dati
+            DS_magazzino.RigheListePrelievoDataTable tabella = taRigheListePrelievo.getByCodLista(CodLista);
+            DS_magazzino.RigheListePrelievoRow riga = tabella[0];
+
+            // se i dati esistono procedo - eseguo stored che setta non prelevato = false per la riga selezionata
+            if (tabella.Rows.Count > 0)
+            {
+                taRigheListePrelievo.setAnnullaUdcPrelevato(CodLista, UDC);
+                answ = esitoOperazione.ok;
+            }
+
+            else
+            {
+                answ = esitoOperazione.errore_mismatch;
+            }
 
             return answ;
         }
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index fb9d2755..efd68f93 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 fb9d2755..efd68f93 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_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll
index fc11393a..38dcdc05 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ