diff --git a/GMW/GMW.suo b/GMW/GMW.suo
index ea2bfcb4..c10ce0db 100644
Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ
diff --git a/GMW/GMW/WebUserControls/mod_anagBlocchi.ascx.cs b/GMW/GMW/WebUserControls/mod_anagBlocchi.ascx.cs
index 4e0f1507..a2c13d75 100644
--- a/GMW/GMW/WebUserControls/mod_anagBlocchi.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_anagBlocchi.ascx.cs
@@ -102,7 +102,7 @@ namespace GMW.WebUserControls
e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue;
break;
case "checkBox":
- e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).Checked;
+ e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked;
break;
case "selAjax":
e.InputParameters[nomeCol] = ((mod_selettore_ajax)grView.FooterRow.FindControl(string.Format("selAjax_{0}", nomeCol))).valore;
diff --git a/GMW/GMW/WebUserControls/mod_anagCelle.ascx b/GMW/GMW/WebUserControls/mod_anagCelle.ascx
index e5a2ce96..753dc172 100644
--- a/GMW/GMW/WebUserControls/mod_anagCelle.ascx
+++ b/GMW/GMW/WebUserControls/mod_anagCelle.ascx
@@ -3,7 +3,8 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
diff --git a/GMW/GMW/WebUserControls/mod_confMag.ascx.cs b/GMW/GMW/WebUserControls/mod_confMag.ascx.cs
index d042ff03..94507064 100644
--- a/GMW/GMW/WebUserControls/mod_confMag.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_confMag.ascx.cs
@@ -31,6 +31,7 @@ namespace GMW.WebUserControls
{
lblTotaleImpieghi.Text = traduci("lblTotaleImpieghi");
lblTotCelleDaTipo.Text = traduci("lblTotCelleDaTipo");
+ lblTotCapacita.Text = traduci("lblTotCapacita");
lblTotCelleCreate.Text = traduci("lblTotCelleCreate");
lblTotCelleDaBlocchi.Text = traduci("lblTotCelleDaBlocchi");
lblDettImpieghiBlocchi.Text = traduci("lblDettImpieghiBlocchi");
@@ -52,7 +53,7 @@ namespace GMW.WebUserControls
int? celleAttiveAss = 0;
utils.obj.taSTP.stp_ContaCelleBlocco(memLayer.ML.confReadString("CodCS"), memLayer.ML.StringSessionObj("CodMag_sel"), true, true, ref celleAttiveAss);
if (!celleAttiveAss.HasValue) celleAttiveAss = 0;
- // calcolo valori: attive assegnate
+ // calcolo valori: attive NON assegnate
int? celleAttiveNonAss = 0;
utils.obj.taSTP.stp_ContaCelleBlocco(memLayer.ML.confReadString("CodCS"), memLayer.ML.StringSessionObj("CodMag_sel"), true, false, ref celleAttiveNonAss);
if (!celleAttiveNonAss.HasValue) celleAttiveNonAss = 0;
@@ -75,6 +76,9 @@ namespace GMW.WebUserControls
private void showImpieghiTotali()
{
// calcolo valori
+ int? totCapa = 0;
+ utils.obj.taSTP.stp_ContaCelleCapa(memLayer.ML.confReadString("CodCS"), memLayer.ML.StringSessionObj("CodMag_sel"), ref totCapa);
+ if (!totCapa.HasValue) totCapa = 0;
int? totCelleTipo = 0;
utils.obj.taSTP.stp_ContaCelle4Tipo(memLayer.ML.confReadString("CodCS"), memLayer.ML.StringSessionObj("CodMag_sel"), ref totCelleTipo);
if (!totCelleTipo.HasValue) totCelleTipo = 0;
@@ -99,6 +103,7 @@ namespace GMW.WebUserControls
lblNumCelleDaBlocchi.ApplyStyle(ctrlStyle);
lblNumCelleCreate.ApplyStyle(ctrlStyle);
// inserisco valori
+ lblNumCapacita.Text = totCapa.ToString();
lblNumCelleDaTipo.Text = totCelleTipo.ToString();
lblNumCelleDaBlocchi.Text = totCelleBlocchi.ToString();
lblNumCelleCreate.Text = totCelleCreate.ToString();
diff --git a/GMW/GMW/WebUserControls/mod_confMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_confMag.ascx.designer.cs
index 8138b2d2..1147f0c7 100644
--- a/GMW/GMW/WebUserControls/mod_confMag.ascx.designer.cs
+++ b/GMW/GMW/WebUserControls/mod_confMag.ascx.designer.cs
@@ -22,6 +22,24 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.Label lblTotaleImpieghi;
+ ///
+ /// lblTotCapacita control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblTotCapacita;
+
+ ///
+ /// lblNumCapacita control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblNumCapacita;
+
///
/// lblTotCelleDaTipo control.
///
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
index 257197df..fcfe6dad 100644
--- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
@@ -102,7 +102,7 @@ namespace GMW.WebUserControls
e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue;
break;
case "checkBox":
- e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).Checked;
+ e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked;
break;
case "selAjax":
e.InputParameters[nomeCol] = ((mod_selettore_ajax)grView.FooterRow.FindControl(string.Format("selAjax_{0}", nomeCol))).valore;
diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx b/GMW/GMW/WebUserControls/mod_statoMag.ascx
index a33cb7c9..a6caf5de 100644
--- a/GMW/GMW/WebUserControls/mod_statoMag.ascx
+++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx
@@ -47,7 +47,7 @@
-
+
/
@@ -57,7 +57,7 @@
-
+
diff --git a/GMW/GMW/WebUserControls/mod_tipoCella.ascx b/GMW/GMW/WebUserControls/mod_tipoCella.ascx
index c597339c..cc5f39ba 100644
--- a/GMW/GMW/WebUserControls/mod_tipoCella.ascx
+++ b/GMW/GMW/WebUserControls/mod_tipoCella.ascx
@@ -21,6 +21,17 @@
Visible='<%# isWritable() %>' />
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -130,8 +144,8 @@
+ CommandArgument='<%# Eval("IdxTipoCella") %>' ToolTip='<%# traduci("Delete") %>'
+ Visible='<%# delEnabled(Eval("IdxTipoCella")) %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.small) %>' />
@@ -152,11 +166,10 @@
-
+ OnInserting="recuperaFooter" OnInserted="ods_Updated" OnUpdated="ods_Updated"
+ DeleteMethod="DeleteQuery" UpdateMethod="UpdateQuery" InsertMethod="Insert">
@@ -176,6 +189,17 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GMW/GMW/WebUserControls/mod_tipoCella.ascx.cs b/GMW/GMW/WebUserControls/mod_tipoCella.ascx.cs
index 2152330e..2f20a42e 100644
--- a/GMW/GMW/WebUserControls/mod_tipoCella.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_tipoCella.ascx.cs
@@ -101,7 +101,7 @@ namespace GMW.WebUserControls
e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue;
break;
case "checkBox":
- e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).Checked;
+ e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked;
break;
case "selAjax":
e.InputParameters[nomeCol] = ((mod_selettore_ajax)grView.FooterRow.FindControl(string.Format("selAjax_{0}", nomeCol))).valore;
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 424716d5..77e2e3d4 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 db05fac7..56910c51 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 424716d5..77e2e3d4 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 d3d867bb..5ae770d6 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_Utility.Designer.cs b/GMW/GMW_data/DS_Utility.Designer.cs
index 4eb82757..6f6f5339 100644
--- a/GMW/GMW_data/DS_Utility.Designer.cs
+++ b/GMW/GMW_data/DS_Utility.Designer.cs
@@ -4661,7 +4661,7 @@ namespace GMW_data.DS_UtilityTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "dbo.stp_dummy";
@@ -4703,7 +4703,7 @@ namespace GMW_data.DS_UtilityTableAdapters {
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 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_ContaCelleCreate";
+ this._commandCollection[5].CommandText = "dbo.stp_ContaCelleCapa";
this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[5].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[5].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, "", "", ""));
@@ -4711,11 +4711,19 @@ namespace GMW_data.DS_UtilityTableAdapters {
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[6].Connection = this.Connection;
- this._commandCollection[6].CommandText = "dbo.stp_ContaDeltaCelleBlocco";
+ this._commandCollection[6].CommandText = "dbo.stp_ContaCelleCreate";
this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[6].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[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotCelle", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[7].Connection = this.Connection;
+ this._commandCollection[7].CommandText = "dbo.stp_ContaDeltaCelleBlocco";
+ this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxBlocco", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[7].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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4931,7 +4939,7 @@ namespace GMW_data.DS_UtilityTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual int stp_ContaCelleCreate(string CodCS, string CodMag, ref global::System.Nullable TotCelle) {
+ public virtual object stp_ContaCelleCapa(string CodCS, string CodMag, ref global::System.Nullable TotCelle) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
if ((CodCS == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -4956,6 +4964,58 @@ namespace GMW_data.DS_UtilityTableAdapters {
!= global::System.Data.ConnectionState.Open)) {
command.Connection.Open();
}
+ object returnValue;
+ try {
+ returnValue = command.ExecuteScalar();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ if (((command.Parameters[3].Value == null)
+ || (command.Parameters[3].Value.GetType() == typeof(global::System.DBNull)))) {
+ TotCelle = new global::System.Nullable();
+ }
+ else {
+ TotCelle = new global::System.Nullable(((int)(command.Parameters[3].Value)));
+ }
+ if (((returnValue == null)
+ || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+ return null;
+ }
+ else {
+ return ((object)(returnValue));
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public virtual int stp_ContaCelleCreate(string CodCS, string CodMag, ref global::System.Nullable TotCelle) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
+ if ((CodCS == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(CodCS));
+ }
+ if ((CodMag == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[2].Value = ((string)(CodMag));
+ }
+ if ((TotCelle.HasValue == true)) {
+ command.Parameters[3].Value = ((int)(TotCelle.Value));
+ }
+ else {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ 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();
@@ -4978,7 +5038,7 @@ namespace GMW_data.DS_UtilityTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int stp_ContaDeltaCelleBlocco(global::System.Nullable IdxBlocco, ref global::System.Nullable DeltaCelle) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
if ((IdxBlocco.HasValue == true)) {
command.Parameters[1].Value = ((int)(IdxBlocco.Value));
}
diff --git a/GMW/GMW_data/DS_Utility.xsd b/GMW/GMW_data/DS_Utility.xsd
index a90dcf69..a976cc4f 100644
--- a/GMW/GMW_data/DS_Utility.xsd
+++ b/GMW/GMW_data/DS_Utility.xsd
@@ -212,6 +212,19 @@ WHERE (value = @value)
+
+
+
+ dbo.stp_ContaCelleCapa
+
+
+
+
+
+
+
+
+
@@ -343,21 +356,21 @@ where conditio = @conditio
-
+
-
+
-
+
@@ -370,22 +383,22 @@ where conditio = @conditio
-
-
+
+
-
+
-
+
@@ -398,35 +411,15 @@ where conditio = @conditio
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -440,21 +433,41 @@ where conditio = @conditio
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -467,29 +480,29 @@ where conditio = @conditio
-
-
+
+
-
+
-
+
-
+
@@ -502,8 +515,8 @@ where conditio = @conditio
-
-
+
+
@@ -516,14 +529,14 @@ where conditio = @conditio
-
+
-
+
@@ -533,24 +546,24 @@ where conditio = @conditio
-
+
-
+
-
+
-
+
diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs
index 2aa9276a..5113184b 100644
--- a/GMW/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW/GMW_data/DS_magazzino.Designer.cs
@@ -12560,8 +12560,8 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[AnagMag] ([CodMag], [CodCS], [DescMag]) VALUES (@CodMag, @CodC" +
- "S, @DescMag);\r\nSELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodMag = @CodMa" +
- "g)";
+ "S, @DescMag);\r\nSELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodCS = @CodCS)" +
+ " AND (CodMag = @CodMag)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodMag", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCS", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -12569,7 +12569,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagMag] SET [CodMag] = @CodMag, [CodCS] = @CodCS, [DescMag] = @DescMag WHERE (([CodMag] = @Original_CodMag) AND ([CodCS] = @Original_CodCS) AND ((@IsNull_DescMag = 1 AND [DescMag] IS NULL) OR ([DescMag] = @Original_DescMag)));
-SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodMag = @CodMag)";
+SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodCS = @CodCS) AND (CodMag = @CodMag)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodMag", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCS", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd
index 6b2f70e0..dddb1eae 100644
--- a/GMW/GMW_data/DS_magazzino.xsd
+++ b/GMW/GMW_data/DS_magazzino.xsd
@@ -286,7 +286,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
INSERT INTO [dbo].[AnagMag] ([CodMag], [CodCS], [DescMag]) VALUES (@CodMag, @CodCS, @DescMag);
-SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodMag = @CodMag)
+SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodCS = @CodCS) AND (CodMag = @CodMag)
@@ -295,7 +295,7 @@ SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodMag = @CodMag)
-
+
SELECT * FROM dbo.AnagMag
@@ -303,7 +303,7 @@ SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodMag = @CodMag)
UPDATE [dbo].[AnagMag] SET [CodMag] = @CodMag, [CodCS] = @CodCS, [DescMag] = @DescMag WHERE (([CodMag] = @Original_CodMag) AND ([CodCS] = @Original_CodCS) AND ((@IsNull_DescMag = 1 AND [DescMag] IS NULL) OR ([DescMag] = @Original_DescMag)));
-SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodMag = @CodMag)
+SELECT CodMag, CodCS, DescMag FROM AnagMag WHERE (CodCS = @CodCS) AND (CodMag = @CodMag)
@@ -896,7 +896,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB
-
+
dbo.stp_celle_updAttiva
@@ -908,7 +908,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB
-
+
dbo.stp_celle_updPiena
@@ -920,7 +920,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB
-
+
dbo.stp_celle_updateQuery
@@ -1876,273 +1876,127 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2157,17 +2011,17 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -2177,14 +2031,271 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2198,101 +2309,307 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2309,338 +2626,21 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index db05fac7..56910c51 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 db05fac7..56910c51 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 1b56aa09..ef13c672 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/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll
index 00c36cc9..e3e57fbb 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
|