diff --git a/MP-Site/WebUserControls/mod_logControlli.ascx b/MP-Site/WebUserControls/mod_logControlli.ascx index 46244675..e219e5b3 100644 --- a/MP-Site/WebUserControls/mod_logControlli.ascx +++ b/MP-Site/WebUserControls/mod_logControlli.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logControlli.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logControlli" %> - + diff --git a/MP-Site/WebUserControls/mod_logScarti.ascx b/MP-Site/WebUserControls/mod_logScarti.ascx index 25b14313..8c1e9929 100644 --- a/MP-Site/WebUserControls/mod_logScarti.ascx +++ b/MP-Site/WebUserControls/mod_logScarti.ascx @@ -1,41 +1,50 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logScarti.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logScarti" %> - - - - - + + - + - - - - - - - - - - - - - - - - - +
+
+
+ Art: + +
+
+ <%# Eval("Descrizione") %>' +
+
+
+ + <%# Eval("Qta") %> + pz +
+
+
+ + +
+
+ + + +
+
+
+ Nota: + + +
+
- + - - - + + + + \ No newline at end of file diff --git a/MP-Site/WebUserControls/mod_logScarti.ascx.cs b/MP-Site/WebUserControls/mod_logScarti.ascx.cs index 213765ee..42a39df1 100644 --- a/MP-Site/WebUserControls/mod_logScarti.ascx.cs +++ b/MP-Site/WebUserControls/mod_logScarti.ascx.cs @@ -17,10 +17,29 @@ namespace MP_SITE.WebUserControls { logger.lg.scriviLog("fine caricamento dati LogScarti", tipoLog.INFO); } + if (!Page.IsPostBack) + { + fixMacchina(); + } } public void reportUpdt(object sender, EventArgs e) { reportUpdate(); } + + private void fixMacchina() + { + string IdxMacc = memLayer.ML.StringSessionObj("IdxMacchina"); + int idx = 0; + if (isMulti(IdxMacc)) + { + idx = IdxMacc.IndexOf("#"); + if (idx > 0) + { + IdxMacc = IdxMacc.Substring(0, IdxMacc.IndexOf("#")); + } + } + memLayer.ML.setSessionVal("IdxMacchinaScarti", IdxMacc); + } } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_elencoScarti.ascx b/MP-TAB/WebUserControls/mod_elencoScarti.ascx index ffe68da0..58be22c8 100644 --- a/MP-TAB/WebUserControls/mod_elencoScarti.ascx +++ b/MP-TAB/WebUserControls/mod_elencoScarti.ascx @@ -5,6 +5,9 @@
+ + Nessun record trovato + @@ -36,7 +39,8 @@
Nota: - + +
@@ -48,6 +52,7 @@ +
diff --git a/MapoDb/DS_ProdTempi.Designer.cs b/MapoDb/DS_ProdTempi.Designer.cs index 542a9fbd..a3b20f61 100644 --- a/MapoDb/DS_ProdTempi.Designer.cs +++ b/MapoDb/DS_ProdTempi.Designer.cs @@ -26622,6 +26622,7 @@ FROM MappaStatoExpl"; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = "dbo.stp_RS_pending"; @@ -26684,7 +26685,7 @@ FROM MappaStatoExpl"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_ProdTempi.RegistroScartiDataTable getFilt(string IdxMacchina, global::System.Nullable DataFrom, global::System.Nullable DataTo) { + public virtual DS_ProdTempi.RegistroScartiDataTable getFilt(string IdxMacchina, global::System.Nullable DataFrom, global::System.Nullable DataTo, global::System.Nullable showMulti) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((IdxMacchina == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -26704,6 +26705,12 @@ FROM MappaStatoExpl"; else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((showMulti.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showMulti.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } DS_ProdTempi.RegistroScartiDataTable dataTable = new DS_ProdTempi.RegistroScartiDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index 7b61f591..f292f1b1 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -2029,6 +2029,7 @@ FROM dbo.v_RegistroScarti + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 5bf7d807..91c24143 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -4,31 +4,31 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + - - + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file