diff --git a/GMW/GMW.suo b/GMW/GMW.suo index 584e9888..11b69679 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 3034dc00..488d24f2 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -62,7 +62,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx b/GMW/GMW/WebUserControls/mod_UdcCella.ascx index 5ab7616a..3caaa5af 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx @@ -77,7 +77,8 @@ - + [ALT-U]
+ @@ -101,7 +102,8 @@ - + [ALT-W]
+ @@ -109,5 +111,8 @@ + + + diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs index 9fa030bc..c0bac699 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs @@ -146,6 +146,7 @@ namespace GMW.WebUserControls // sistemo labels e buttons lblQta.Text = traduci("lblQta"); lblNewPos.Text = traduci("lblNewPos"); + lblErrore.Text = traduci("ErroreCellaDestOccupata"); btnQta.Text = traduci("btnQta"); btnSposta.Text = traduci("btnSposta"); cbeQta.ConfirmText = traduci("confermaRettificaQta"); @@ -192,7 +193,7 @@ namespace GMW.WebUserControls /// protected void btnSposta_Click1(object sender, EventArgs e) { - // ricavo il valore dell'UDC cliccato... + // ricavo il valore dell'UDC cliccato... string UDC = memLayer.ML.StringSessionObj(string.Format("{0}_sel", _idxGridView)); int IdxCellaFrom = 0; try @@ -202,20 +203,33 @@ namespace GMW.WebUserControls catch { } int IdxCellaTo = 0; + bool cellaToOk = false; try { - IdxCellaTo = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.Text)[0].IdxCella; + DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.Text)[0]; + IdxCellaTo = rowCella.IdxCella; + // controllo che la cella di destinazione NON sia bloccata + cellaToOk = rowCella.Attiva; } catch - { } - if (IdxCellaFrom > 0 && IdxCellaTo > 0) + { } + if (cellaToOk) { - MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaFrom, IdxCellaTo); + // controllo che sia valido x fare l'operazione + if (IdxCellaFrom > 0 && IdxCellaTo > 0) + { + MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaFrom, IdxCellaTo); + } + azzeraPostUpdate(); + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } } - azzeraPostUpdate(); - if (eh_nuovoValore != null) + else { - eh_nuovoValore(this, new EventArgs()); + // la cella è bloccata, nn devo permettere spostamento + lblErrore.Visible = true; } } /// @@ -252,6 +266,7 @@ namespace GMW.WebUserControls private void azzeraPostUpdate() { + lblErrore.Visible = false; grView.DataBind(); resetSelezione(); txtNewCella.Text = ""; diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs index 91f07462..94683a0a 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs @@ -147,5 +147,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::AjaxControlToolkit.ConfirmButtonExtender cbeSposta; + + /// + /// lblErrore control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblErrore; } } diff --git a/GMW/GMW/WebUserControls/mod_main_help.ascx b/GMW/GMW/WebUserControls/mod_main_help.ascx index 91a59d25..84862848 100644 --- a/GMW/GMW/WebUserControls/mod_main_help.ascx +++ b/GMW/GMW/WebUserControls/mod_main_help.ascx @@ -17,7 +17,13 @@ - + + + + + + + diff --git a/GMW/GMW/WebUserControls/mod_main_help.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_main_help.ascx.designer.cs index df0c9dce..fa9779da 100644 --- a/GMW/GMW/WebUserControls/mod_main_help.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_main_help.ascx.designer.cs @@ -38,4 +38,13 @@ public partial class mod_main_help { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblMess; + + /// + /// ImageMap1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageMap ImageMap1; } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index eaa3e4db..e3355c08 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 f68ee9cd..44e52cc6 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/images/SchemaMag.png b/GMW/GMW/images/SchemaMag.png index c39fd357..afbb1ea0 100644 Binary files a/GMW/GMW/images/SchemaMag.png and b/GMW/GMW/images/SchemaMag.png differ diff --git a/GMW/GMW/images/logo_sw.png b/GMW/GMW/images/logo_sw.png index 92619464..a8298254 100644 Binary files a/GMW/GMW/images/logo_sw.png and b/GMW/GMW/images/logo_sw.png differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 2bb2d1d7..8bcae9c6 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 eaa3e4db..e3355c08 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 15a682ef..35288600 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 8947804a..aaa9411d 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 047bd3b0..6869aa78 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index bddbc083..38d6d13c 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -14797,7 +14797,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [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 = "SELECT * FROM dbo.Celle"; @@ -14836,52 +14836,58 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB this._commandCollection[5].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] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_cellaGetByTipoCella"; + this._commandCollection[6].CommandText = "dbo.stp_cellaGetByIdxCella"; 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("@IdxTipoCella", 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("@IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 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_celleLibereGetByIdxBlocco"; + this._commandCollection[7].CommandText = "dbo.stp_cellaGetByTipoCella"; 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("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_celleNonAttiveByIdxBlocco"; + this._commandCollection[8].CommandText = "dbo.stp_celleLibereGetByIdxBlocco"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].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[8].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[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.stp_celle_updAttiva"; + this._commandCollection[9].CommandText = "dbo.stp_celleNonAttiveByIdxBlocco"; this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[9].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[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].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[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; - this._commandCollection[10].CommandText = "dbo.stp_celle_updPiena"; + this._commandCollection[10].CommandText = "dbo.stp_celle_updAttiva"; this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[10].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[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Piena", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 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_celle_updateQuery"; + this._commandCollection[11].CommandText = "dbo.stp_celle_updPiena"; 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("@Original_IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.VarChar, 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("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.VarChar, 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("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Piena", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@X", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Y", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Z", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_celle_updateQuery"; + 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("@Original_IdxCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.VarChar, 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("@IdxTipoCella", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.VarChar, 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("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Piena", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].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[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@X", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Y", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Z", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14985,8 +14991,24 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [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.CelleDataTable getByTipoCella(global::System.Nullable IdxTipoCella) { + public virtual DS_magazzino.CelleDataTable getByIdxCella(global::System.Nullable IdxCella) { this.Adapter.SelectCommand = this.CommandCollection[6]; + if ((IdxCella.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxCella.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_magazzino.CelleDataTable dataTable = new DS_magazzino.CelleDataTable(); + 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.CelleDataTable getByTipoCella(global::System.Nullable IdxTipoCella) { + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((IdxTipoCella.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxTipoCella.Value)); } @@ -15002,7 +15024,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.CelleDataTable getLibereByIdxBlocco(global::System.Nullable IdxBlocco) { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[8]; if ((IdxBlocco.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxBlocco.Value)); } @@ -15018,7 +15040,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_magazzino.CelleDataTable getNonAttiveByIdxBlocco(global::System.Nullable IdxBlocco) { - this.Adapter.SelectCommand = this.CommandCollection[8]; + this.Adapter.SelectCommand = this.CommandCollection[9]; if ((IdxBlocco.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxBlocco.Value)); } @@ -15375,7 +15397,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_celle_updAttiva(global::System.Nullable IdxCella, global::System.Nullable Attiva) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; if ((IdxCella.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxCella.Value)); } @@ -15408,7 +15430,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_celle_updPiena(global::System.Nullable IdxCella, global::System.Nullable Piena) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; if ((IdxCella.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxCella.Value)); } @@ -15442,7 +15464,7 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] public virtual int UpdateQuery(global::System.Nullable Original_IdxCella, string CodCS, string CodCella, global::System.Nullable IdxTipoCella, string Descrizione, global::System.Nullable Attiva, global::System.Nullable Piena, global::System.Nullable IdxBlocco, global::System.Nullable X, global::System.Nullable Y, global::System.Nullable Z) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[12]; if ((Original_IdxCella.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxCella.Value)); } diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 3e0afdfb..c3b404f0 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -886,6 +886,17 @@ SELECT IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxB + + + + dbo.stp_cellaGetByIdxCella + + + + + + + @@ -1900,273 +1911,127 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2181,17 +2046,17 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - - - - - - - + + + + + + + - + @@ -2201,14 +2066,271 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2222,101 +2344,307 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - + + + + + + + + + + - + - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2333,338 +2661,21 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index c8cb5225..aef63ee7 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,14 +4,14 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + @@ -44,7 +44,7 @@ 413 - 387 + 412 413 @@ -80,7 +80,7 @@ 755 - 941 + 954 755 diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index ad8ae719..93cc790f 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -160,6 +160,28 @@ namespace GMW_data #region Metodi esposti + #region operazioni su UDC + + /// + /// effettua lo scaricamento di un UDC (x spedizione) + /// + /// Codice company/sito + /// Codice UDC + /// Cella di destinazione + /// Codice posizione UDC finale + /// esito comando + public bool caricaUDC(string CodCS, string UDC, int IdxCellaTo, int IdxPosizUdc) + { + bool answ = false; + //try + //{ + // taPosUdcCorr.stp_scaricaUdc(CodCS, UDC, IdxCellaFrom, IdxPosizUdc); + // answ = true; + //} + //catch + //{ } + return answ; + } /// /// effettua lo spostamento di un UDC tra 2 posizioni indicate /// @@ -228,6 +250,175 @@ namespace GMW_data { } return answ; } + + #endregion + + #region procedure di verifica e traduzione dati da anagrafiche + + /// + /// Verifica la corrispondenza dati tra RigheListePrelievo ed ElencoCartellini + /// + /// + /// + /// + public bool verificaDatiUdc(string CodLista, string UDC) + { + bool answ = false; + + try + { + DS_magazzino.ElencoListePrelievoDataTable tabellaElenco = taElencoListePrelievo.getByCodLista(CodLista); + DS_magazzino.ElencoListePrelievoRow rigaElenco = tabellaElenco[0]; + + DS_magazzino.ElencoCartelliniDataTable tabellaUDC = taElencoCartellini.getDetailsUdcByUdc(UDC); + DS_magazzino.ElencoCartelliniRow rigaUDC = tabellaUDC[0]; + + // ricavo dati da confrontare - da Lista ricavo particolare/esponente/figura + string particolareLista = rigaElenco.Particolare; + string esponenteLista = rigaElenco.Esponente; + string figuraLista = rigaElenco.Figura; + string codImballoLista = rigaElenco.CodImballo; + + //stessi dati da UDC + string particolareUDC = rigaUDC.Particolare; + string esponenteUDC = rigaUDC.Esponente; + string figuraUDC = rigaUDC.Figura; + string codImballoUDC = rigaUDC.CodImballo; + + // condizioni di uguaglianza... + bool particolareOk = false; + bool esponenteOk = false; + bool figuraOk = false; + bool codImballoOk = false; + // verifico le condizioni 1 ad 1... + particolareOk = (particolareLista == particolareUDC); + if (esponenteLista == "*") + { + esponenteOk = true; + } + else + { + esponenteOk = (esponenteLista == esponenteUDC); + } + if (figuraLista == "*") + { + figuraOk = true; + } + else + { + figuraOk = (figuraLista == figuraUDC); + } + if (codImballoLista == "*") + { + codImballoOk = true; + } + else + { + codImballoOk = (codImballoLista == codImballoUDC); + } + + // verifica finale del risultato uguaglianza... + answ = (particolareOk && esponenteOk && figuraOk && codImballoOk); + } + catch + { + answ = false; + } + + return answ; + } + /// + /// restituisce codice soggetto dell'user corrente + /// + /// + public string CodSoggCurrUser() + { + // ricavo da session... + string codSoggetto = ""; + try + { + codSoggetto = DataProxy.obj.taSogg2Oper.getBuUserDominio(user_std.UtSn.utente, user_std.UtSn.dominio)[0].CodSoggetto; + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Non sono riuscito a recuperare il codice soggetto per l'utente loggato: {0}", user_std.UtSn.userNameAD), tipoLog.ERROR); + } + return codSoggetto; + } + /// + /// restituisce l'IdxCella dato il CodCella + /// + /// Codice company/sito + /// + /// + public int IdxCellaByCodCella(string CodCS, string CodCella) + { + int answ = 0; + try + { + answ = taCelle.getByCodCella(CodCella)[0].IdxCella; // NON controllo il CodCS... + } + catch + { } + return answ; + } + /// + /// restituisce il CodCella dato l'IdxCella + /// + /// Codice company/sito + /// + /// + public string CodCellaByIdxCella(string CodCS, int IdxCella) + { + string answ = ""; + try + { + answ = taCelle.getByIdxCella(IdxCella)[0].CodCella; // NON controllo il CodCS... + } + catch + { } + return answ; + } + /// + /// verifica se la cella indicata sia attiva + /// + /// Codice company/sito + /// + /// + public bool cellaAttiva(string CodCS, int IdxCella) + { + bool answ = false; + try + { + answ = taCelle.getByIdxCella(IdxCella)[0].Attiva; // NON controllo il CodCS... + } + catch + { } + return answ; + } + /// + /// verifica se la cella indicata sia piena + /// + /// Codice company/sito + /// + /// + public bool cellaPiena(string CodCS, int IdxCella) + { + bool answ = false; + try + { + answ = taCelle.getByIdxCella(IdxCella)[0].Piena; // NON controllo il CodCS... + } + catch + { } + return answ; + } + + + #endregion + + #region liste di prelievo + /// /// Crea una lista di prelievo andando a prenotare gli UDC del particolare richiesto in logica FIFO /// @@ -594,78 +785,6 @@ namespace GMW_data return answ; } /// - /// Verifica la corrispondenza dati tra RigheListePrelievo ed ElencoCartellini - /// - /// - /// - /// - public bool verificaDatiUdc(string CodLista, string UDC) - { - bool answ = false; - - try - { - DS_magazzino.ElencoListePrelievoDataTable tabellaElenco = taElencoListePrelievo.getByCodLista(CodLista); - DS_magazzino.ElencoListePrelievoRow rigaElenco = tabellaElenco[0]; - - DS_magazzino.ElencoCartelliniDataTable tabellaUDC = taElencoCartellini.getDetailsUdcByUdc(UDC); - DS_magazzino.ElencoCartelliniRow rigaUDC = tabellaUDC[0]; - - // ricavo dati da confrontare - da Lista ricavo particolare/esponente/figura - string particolareLista = rigaElenco.Particolare; - string esponenteLista = rigaElenco.Esponente; - string figuraLista = rigaElenco.Figura; - string codImballoLista = rigaElenco.CodImballo; - - //stessi dati da UDC - string particolareUDC = rigaUDC.Particolare; - string esponenteUDC = rigaUDC.Esponente; - string figuraUDC = rigaUDC.Figura; - string codImballoUDC = rigaUDC.CodImballo; - - // condizioni di uguaglianza... - bool particolareOk = false; - bool esponenteOk = false; - bool figuraOk = false; - bool codImballoOk = false; - // verifico le condizioni 1 ad 1... - particolareOk = (particolareLista == particolareUDC); - if (esponenteLista == "*") - { - esponenteOk = true; - } - else - { - esponenteOk = (esponenteLista == esponenteUDC); - } - if (figuraLista == "*") - { - figuraOk = true; - } - else - { - figuraOk = (figuraLista == figuraUDC); - } - if (codImballoLista == "*") - { - codImballoOk = true; - } - else - { - codImballoOk = (codImballoLista == codImballoUDC); - } - - // verifica finale del risultato uguaglianza... - answ = (particolareOk && esponenteOk && figuraOk && codImballoOk); - } - catch - { - answ = false; - } - - return answ; - } - /// /// Conferma che un dato UDC è stato prelevato per soddisfare la lista di prelievo ed aggiorna o aggiunge riga in RigheListePrelievo /// /// codice della lista di prelievo @@ -762,25 +881,10 @@ namespace GMW_data { } return answ; } - /// - /// restituisce codice soggetto dell'user corrente - /// - /// - public string CodSoggCurrUser() - { - // ricavo da session... - string codSoggetto = ""; - try - { - codSoggetto = DataProxy.obj.taSogg2Oper.getBuUserDominio(user_std.UtSn.utente, user_std.UtSn.dominio)[0].CodSoggetto; - } - catch (Exception e) - { - logger.lg.scriviLog(string.Format("Non sono riuscito a recuperare il codice soggetto per l'utente loggato: {0}", user_std.UtSn.userNameAD), tipoLog.ERROR); - } - return codSoggetto; - } + #endregion + + #endregion } } @@ -790,7 +894,8 @@ public enum esitoOperazione ok, // tutto ok, come true errore, // non è andata, errore generico errore_mismatch, // errore x mancanza corrispondenza tra dati (particolare-esponente-figura di lista ed UDC, ad esempio) - errore_readOnly // errore xché ild ato è read only o bloccato (es lista di prelievo già completata, NON posso riprenderla in carico) + errore_readOnly, // errore xché ild ato è read only o bloccato (es lista di prelievo già completata, NON posso riprenderla in carico) + errore_posUDC // errore perché UDC è in una posizione che non consente l'operazione indicata } public enum statoLista diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index f68ee9cd..44e52cc6 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 138678a0..0f93878d 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 f68ee9cd..44e52cc6 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 4218b1a1..c987d7ab 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 diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 138678a0..0f93878d 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 3458d608..1129fab3 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:{E54463DF-6607-479B-BB24-0E680C2EC34D}" - "PackageCode" = "8:{AF95C4CF-1ADA-40B3-B21A-1217A4118029}" + "ProductCode" = "8:{7C8E2714-79EB-4E9E-AA03-5E8220679B88}" + "PackageCode" = "8:{3A990B42-AD1B-4D39-8FAF-062A1289792D}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.150" + "ProductVersion" = "8:1.0.155" "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 5aa8e5c8..a871d5c8 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ