diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll
index 2ebf0b78..bd677466 100644
Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ
diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll
index 6985a0ec..78a3f3a6 100644
Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ
diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll
index 06e63ae2..781de40c 100644
Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ
diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll
index 9209f985..dc4fe5c6 100644
Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ
diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll
index 6985a0ec..78a3f3a6 100644
Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ
diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll
index 06e63ae2..781de40c 100644
Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ
diff --git a/GMW/Web.config b/GMW/Web.config
index 36063a34..452ff452 100644
--- a/GMW/Web.config
+++ b/GMW/Web.config
@@ -93,6 +93,11 @@
+
+
+
+
+
diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx.cs b/GMW/WebUserControls/mod_assegnaNC.ascx.cs
index 201d7f4b..990a93b4 100644
--- a/GMW/WebUserControls/mod_assegnaNC.ascx.cs
+++ b/GMW/WebUserControls/mod_assegnaNC.ascx.cs
@@ -236,6 +236,10 @@ namespace GMW.WebUserControls
protected void lbConfermaNC_Click(object sender, EventArgs e)
{
DataProxy.obj.taENC.updCompleta(idxNcSel, true);
+ // associo NC a TUTTI i cartellini interessati (IdxNC)
+ bool assSpediti = memLayer.ML.CRB("assSpediti");
+ bool assConsumati = memLayer.ML.CRB("assConsumati");
+ DataProxy.obj.taUNCTree.assignAttr(idxNcSel, assSpediti, assConsumati, MagClass.magazzino.CodSoggCurrUser);
fixSelections();
showEffects();
grView.DataBind();
@@ -248,6 +252,13 @@ namespace GMW.WebUserControls
protected void lbPrint_Click(object sender, EventArgs e)
{
// effettua stampa di TUTTI gli UDC compresi (TRANNE quelli in carico a postazioni in IN/OUT che saranno poi stampati...)
+ bool fatto = false;
+ // recupero elenco UDC... SOLO SE NON CARICATI IN POSTAZIONE
+
+ // stampo!
+
+ //fatto = MagClass.magazzino.ristampaUdc(udcReq, Postazione.printer, Request.UserHostName);
+
#if false
// ciclo grView e salvo le righe selezionate, e cancello le EVENTUALI deselezionate
DateTime start;
diff --git a/GMW/WebUserControls/mod_elencoUNC.ascx b/GMW/WebUserControls/mod_elencoUNC.ascx
index cf87ca04..04daf4e4 100644
--- a/GMW/WebUserControls/mod_elencoUNC.ascx
+++ b/GMW/WebUserControls/mod_elencoUNC.ascx
@@ -8,6 +8,7 @@
+
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index cda3eb5a..5b89aaa7 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index 6985a0ec..78a3f3a6 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index 06e63ae2..781de40c 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ
diff --git a/GMW_data/DS_Applicazione.Designer.cs b/GMW_data/DS_Applicazione.Designer.cs
index a31fb1b4..40594bce 100644
--- a/GMW_data/DS_Applicazione.Designer.cs
+++ b/GMW_data/DS_Applicazione.Designer.cs
@@ -9682,6 +9682,8 @@ namespace GMW_data {
private global::System.Data.DataColumn columnliv;
+ private global::System.Data.DataColumn columnDecodPosizione;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public UNC_treeDataTable() {
@@ -9731,6 +9733,14 @@ namespace GMW_data {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn DecodPosizioneColumn {
+ get {
+ return this.columnDecodPosizione;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -9768,11 +9778,12 @@ namespace GMW_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public UNC_treeRow AddUNC_treeRow(string UDC, int liv) {
+ public UNC_treeRow AddUNC_treeRow(string UDC, int liv, string DecodPosizione) {
UNC_treeRow rowUNC_treeRow = ((UNC_treeRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
UDC,
- liv};
+ liv,
+ DecodPosizione};
rowUNC_treeRow.ItemArray = columnValuesArray;
this.Rows.Add(rowUNC_treeRow);
return rowUNC_treeRow;
@@ -9797,6 +9808,7 @@ namespace GMW_data {
internal void InitVars() {
this.columnUDC = base.Columns["UDC"];
this.columnliv = base.Columns["liv"];
+ this.columnDecodPosizione = base.Columns["DecodPosizione"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -9806,9 +9818,13 @@ namespace GMW_data {
base.Columns.Add(this.columnUDC);
this.columnliv = new global::System.Data.DataColumn("liv", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnliv);
+ this.columnDecodPosizione = new global::System.Data.DataColumn("DecodPosizione", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnDecodPosizione);
this.columnUDC.ReadOnly = true;
this.columnUDC.MaxLength = 50;
this.columnliv.ReadOnly = true;
+ this.columnDecodPosizione.AllowDBNull = false;
+ this.columnDecodPosizione.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -15206,6 +15222,17 @@ namespace GMW_data {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string DecodPosizione {
+ get {
+ return ((string)(this[this.tableUNC_tree.DecodPosizioneColumn]));
+ }
+ set {
+ this[this.tableUNC_tree.DecodPosizioneColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsUDCNull() {
@@ -27296,6 +27323,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, I
tableMapping.DataSetTable = "UNC_tree";
tableMapping.ColumnMappings.Add("UDC", "UDC");
tableMapping.ColumnMappings.Add("liv", "liv");
+ tableMapping.ColumnMappings.Add("DecodPosizione", "DecodPosizione");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -27309,13 +27337,22 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, I
[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[1];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "dbo.stp_UNC_getChildByIdxNc";
this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[0].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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[1].Connection = this.Connection;
+ this._commandCollection[1].CommandText = "dbo.stp_UNC_assignAttr";
+ 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("@IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assSpediti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assConsumati", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -27353,6 +27390,52 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, I
this.Adapter.Fill(dataTable);
return dataTable;
}
+
+ [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 assignAttr(global::System.Nullable IdxNC, global::System.Nullable assSpediti, global::System.Nullable assConsumati, string CodSoggetto) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
+ if ((IdxNC.HasValue == true)) {
+ command.Parameters[1].Value = ((int)(IdxNC.Value));
+ }
+ else {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ if ((assSpediti.HasValue == true)) {
+ command.Parameters[2].Value = ((bool)(assSpediti.Value));
+ }
+ else {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ if ((assConsumati.HasValue == true)) {
+ command.Parameters[3].Value = ((bool)(assConsumati.Value));
+ }
+ else {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ if ((CodSoggetto == null)) {
+ command.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[4].Value = ((string)(CodSoggetto));
+ }
+ 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/DS_Applicazione.xsd b/GMW_data/DS_Applicazione.xsd
index 6a87d31f..083f1ce8 100644
--- a/GMW_data/DS_Applicazione.xsd
+++ b/GMW_data/DS_Applicazione.xsd
@@ -2074,7 +2074,7 @@ FROM v_UDC_NC
-
+
dbo.stp_UNC_getChildByIdxNc
@@ -2089,8 +2089,24 @@ FROM v_UDC_NC
+
-
+
+
+
+
+ dbo.stp_UNC_assignAttr
+
+
+
+
+
+
+
+
+
+
+
@@ -3263,7 +3279,7 @@ FROM v_UDC_NC
-
+
@@ -3302,7 +3318,7 @@ FROM v_UDC_NC
-
+
@@ -3360,7 +3376,7 @@ FROM v_UDC_NC
-
+
@@ -3371,6 +3387,13 @@ FROM v_UDC_NC
+
+
+
+
+
+
+
@@ -3461,12 +3484,12 @@ FROM v_UDC_NC
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GMW_data/DS_Applicazione.xss b/GMW_data/DS_Applicazione.xss
index a25d809f..4c48ddf1 100644
--- a/GMW_data/DS_Applicazione.xss
+++ b/GMW_data/DS_Applicazione.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -28,7 +28,7 @@
-
+