diff --git a/GMW/WebUserControls/mod_finiti.ascx.designer.cs b/GMW/WebUserControls/mod_finiti.ascx.designer.cs
index 6df9d3d3..0e27eca8 100644
--- a/GMW/WebUserControls/mod_finiti.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_finiti.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace GMW.WebUserControls {
@@ -13,227 +13,227 @@ namespace GMW.WebUserControls {
public partial class mod_finiti {
///
- /// BundleReference1 control.
+ /// Controllo BundleReference1.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
///
- /// BundleReference2 control.
+ /// Controllo BundleReference2.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
///
- /// lblUdcParent control.
+ /// Controllo lblUdcParent.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblUdcParent;
///
- /// grView control.
+ /// Controllo grView.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.GridView grView;
///
- /// ods control.
+ /// Controllo ods.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
- /// lblNumRec control.
+ /// Controllo lblNumRec.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblNumRec;
///
- /// lblParticolareAttivo control.
+ /// Controllo lblParticolareAttivo.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblParticolareAttivo;
///
- /// lblDescrAttivo control.
+ /// Controllo lblDescrAttivo.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblDescrAttivo;
///
- /// lblDisegno control.
+ /// Controllo lblDisegno.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblDisegno;
///
- /// lblBarcode control.
+ /// Controllo lblBarcode.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblBarcode;
///
- /// txtBarcode control.
+ /// Controllo txtBarcode.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
///
- /// divNote control.
+ /// Controllo divNote.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNote;
///
- /// txtNote control.
+ /// Controllo txtNote.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.TextBox txtNote;
///
- /// btnEmptyNote control.
+ /// Controllo btnEmptyNote.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Button btnEmptyNote;
///
- /// lbtStampaUDC control.
+ /// Controllo lbtStampaUDC.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.LinkButton lbtStampaUDC;
///
- /// lblAL control.
+ /// Controllo lblAL.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblAL;
///
- /// grViewDest control.
+ /// Controllo grViewDest.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.GridView grViewDest;
///
- /// odsDest control.
+ /// Controllo odsDest.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsDest;
///
- /// lblPart control.
+ /// Controllo lblPart.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label lblPart;
///
- /// ddlImballi control.
+ /// Controllo ddlImballi.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.DropDownList ddlImballi;
///
- /// odsImballi control.
+ /// Controllo odsImballi.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsImballi;
///
- /// divQta control.
+ /// Controllo divQta.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divQta;
///
- /// lbtSetLastQty control.
+ /// Controllo lbtSetLastQty.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.LinkButton lbtSetLastQty;
///
- /// txtQta control.
+ /// Controllo txtQta.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.TextBox txtQta;
///
- /// lbtUpdQty control.
+ /// Controllo lbtUpdQty.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.LinkButton lbtUpdQty;
}
diff --git a/GMW/anagCelle.aspx.cs b/GMW/anagCelle.aspx.cs
index e25d2efd..18c51bf2 100644
--- a/GMW/anagCelle.aspx.cs
+++ b/GMW/anagCelle.aspx.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using SteamWare;
+using SteamWare;
+using System;
namespace GMW
{
diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd
index 3d096529..c2023ba8 100644
--- a/GMW_data/DS_magazzino.xsd
+++ b/GMW_data/DS_magazzino.xsd
@@ -448,7 +448,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
-
+
dbo.stp_UDC_setDL_DC_FORCED
@@ -460,7 +460,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
-
+
dbo.stp_UDC_travasoQty
@@ -551,7 +551,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
-
+
dbo.stp_UDC_updateNote
@@ -593,6 +593,22 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
+
+
+
+ dbo.stp_UDC_updateNotePosizioneDataImballo
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5652,7 +5668,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5709,7 +5725,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5741,7 +5757,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5763,7 +5779,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5797,7 +5813,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5872,14 +5888,14 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
-
+
@@ -5915,7 +5931,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -5972,7 +5988,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -6000,7 +6016,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -6047,7 +6063,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -6076,7 +6092,7 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
+
@@ -6254,21 +6270,21 @@ SELECT Trattamento, AL, DataTrattEnd, Durezza, Punzone, DataDur, CodSoggettoDur,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GMW_data/DS_magazzino1.Designer.cs b/GMW_data/DS_magazzino1.Designer.cs
index c5e2b025..1745b5f7 100644
--- a/GMW_data/DS_magazzino1.Designer.cs
+++ b/GMW_data/DS_magazzino1.Designer.cs
@@ -24040,7 +24040,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[30];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[31];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.ElencoCartellini";
@@ -24275,14 +24275,25 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[29] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[29].Connection = this.Connection;
- this._commandCollection[29].CommandText = "dbo.stp_UDC_updateQty";
+ this._commandCollection[29].CommandText = "dbo.stp_UDC_updateNotePosizioneDataImballo";
this._commandCollection[29].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[29].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[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFus", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImballo", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[30] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[30].Connection = this.Connection;
+ this._commandCollection[30].CommandText = "dbo.stp_UDC_updateQty";
+ this._commandCollection[30].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[30].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[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.VarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoDichiaraz", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -24929,7 +24940,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_magazzino.ElencoCartelliniDataTable updateQty(string UDC, string CodSoggetto, string CodTipoDichiaraz, string CodEvento, global::System.Nullable Qta) {
- this.Adapter.SelectCommand = this.CommandCollection[29];
+ this.Adapter.SelectCommand = this.CommandCollection[30];
if ((UDC == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -26241,6 +26252,64 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno
}
return returnValue;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public virtual int updateNotePosizioneDataImballo(string UDC, global::System.Nullable IdxPosizione, string note, string CodSoggetto, global::System.Nullable DataFus, string CodImballo) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[29];
+ if ((UDC == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(UDC));
+ }
+ if ((IdxPosizione.HasValue == true)) {
+ command.Parameters[2].Value = ((int)(IdxPosizione.Value));
+ }
+ else {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ if ((note == null)) {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[3].Value = ((string)(note));
+ }
+ if ((CodSoggetto == null)) {
+ command.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[4].Value = ((string)(CodSoggetto));
+ }
+ if ((DataFus.HasValue == true)) {
+ command.Parameters[5].Value = ((System.DateTime)(DataFus.Value));
+ }
+ else {
+ command.Parameters[5].Value = global::System.DBNull.Value;
+ }
+ if ((CodImballo == null)) {
+ command.Parameters[6].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[6].Value = ((string)(CodImballo));
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ int returnValue;
+ try {
+ returnValue = command.ExecuteNonQuery();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ return returnValue;
+ }
}
///
diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs
index 0ec8b000..d433b32f 100644
--- a/GMW_data/MagClass.cs
+++ b/GMW_data/MagClass.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using SteamWare;
-using System.Reflection;
+using SteamWare;
+using System;
using System.Data.SqlClient;
+using System.Reflection;
namespace GMW_data
{
@@ -506,7 +503,7 @@ namespace GMW_data
bool answ = false;
try
{
- answ = (taEA.getByAL(AL).Rows.Count > 0);
+ answ = (taEA.getByAL(AL).Rows.Count > 0);
}
catch
{ }
@@ -1686,6 +1683,18 @@ namespace GMW_data
{
taCartellini.updateNotePosizioneData(UDC, idxPosizione, note, CodSoggCurrUser, DataFus);
}
+ ///
+ /// aggiorna note, posizione e data fusione dell'UDC
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void updateNotePosizioneDataImballoUDC(string UDC, string note, int idxPosizione, DateTime DataFus, string CodImballo)
+ {
+ taCartellini.updateNotePosizioneDataImballo(UDC, idxPosizione, note, CodSoggCurrUser, DataFus, CodImballo);
+ }
#endregion
diff --git a/GMW_data/UserControlBCodeMan.cs b/GMW_data/UserControlBCodeMan.cs
index 2e9722e2..10da7814 100644
--- a/GMW_data/UserControlBCodeMan.cs
+++ b/GMW_data/UserControlBCodeMan.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using SteamWare;
+using SteamWare;
+using System;
namespace GMW_data
{
@@ -519,7 +516,7 @@ namespace GMW_data
return answ;
}
///
- /// calcola il codice imballo da ultimo oppure da webconfig
+ /// calcola il codice imballo da ultimo oppure da DB/webconfig
///
///
///
@@ -533,7 +530,7 @@ namespace GMW_data
}
else
{
- answ = memLayer.ML.CRS(confBaseVal);
+ answ = memLayer.ML.cdv(confBaseVal);
}
return answ;
}
@@ -1056,7 +1053,7 @@ namespace GMW_data
try
{
// aggiorno note e posizione da temp a definitivo x UDC...
- MagClass.magazzino.updateNotePosizioneDataUDC(currUDC, noteCompl, IdxPosizioneOut, DateTime.Now);
+ MagClass.magazzino.updateNotePosizioneDataImballoUDC(currUDC, noteCompl, IdxPosizioneOut, DateTime.Now, codImballo);
if (OpAuth.isAuth)
{
// salvo attributo dell'OpAuth...