diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config
index 4645b29d..b0db1a58 100644
--- a/MP-Tablet/Web.config
+++ b/MP-Tablet/Web.config
@@ -72,6 +72,9 @@
+
+
+
diff --git a/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs b/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs
index 41371785..e26cf8ff 100644
--- a/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs
@@ -108,8 +108,13 @@ namespace MoonProTablet.WebUserControls
controllerMapo.scriviRigaEventoBarcode(idxMacchina.ToString(), idxEvento, rigaStato.CodArticolo, commento, DataLayer.MatrOpr, rigaStato.pallet, dataOraEv.AddSeconds(1), DateTime.Now);
// eseguo ricalcolo!
DateTime startRicalcolo = dataOraEv.AddMinutes(memLayer.ML.confReadInt("minAnticipoRicalcolo"));
- DataLayer.obj.taComm.stp_ricalcolaDatiMacchinaFromDate(idxMacchina.ToString(), startRicalcolo, 1); // nella stored imposto macchina OFFline e poi ONline, parto da "minAnticipoRicalcolo" minuti prima...
- // aggiorno data evento x insert eventuale commento (5 sec...)
+
+ // leggo parametri x esecuzione...
+ int rdm_nEvStep = memLayer.ML.CRI("rdm_nEvStep");
+ int rdm_nEvCheck = memLayer.ML.CRI("rdm_nEvCheck");
+ bool rdm_ChkOnly = memLayer.ML.CRB("rdm_ChkOnly");
+ DataLayer.obj.taComm.stp_ricalcolaDatiMacchinaFromDate(idxMacchina.ToString(), startRicalcolo, 1, rdm_nEvStep, rdm_nEvCheck, rdm_ChkOnly); // nella stored imposto macchina OFFline e poi ONline, parto da "minAnticipoRicalcolo" minuti prima...
+ // aggiorno data evento x insert eventuale commento (5 sec...)
dataOraEv = dataOraEv.AddSeconds(5);
// riabilito insert... anche se non dovrebbe servire x stored ricalcolo precedente...
DataLayer.obj.taStatoMacchine.setInsEnabled(idxMacchina.ToString(), true);
diff --git a/MapoDb/DS_Utility.Designer.cs b/MapoDb/DS_Utility.Designer.cs
index 3ebd535d..896cb6ca 100644
--- a/MapoDb/DS_Utility.Designer.cs
+++ b/MapoDb/DS_Utility.Designer.cs
@@ -7317,12 +7317,15 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
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[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
- this._commandCollection[2].CommandText = "man.stp_ricalcolaDatiMacchinaFromDate";
+ this._commandCollection[2].CommandText = "man.stp_ricalcolaDatiMacchinaFromDateFork";
this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[2].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[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxStatoStart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nStepEventi", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nRecCheck", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOnly", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7398,7 +7401,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual int stp_ricalcolaDatiMacchinaFromDate(string idxMacchina, global::System.Nullable inizio, global::System.Nullable idxStatoStart) {
+ public virtual int stp_ricalcolaDatiMacchinaFromDate(string idxMacchina, global::System.Nullable inizio, global::System.Nullable idxStatoStart, global::System.Nullable nStepEventi, global::System.Nullable nRecCheck, global::System.Nullable CheckOnly) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
if ((idxMacchina == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -7418,6 +7421,24 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
else {
command.Parameters[3].Value = global::System.DBNull.Value;
}
+ if ((nStepEventi.HasValue == true)) {
+ command.Parameters[4].Value = ((int)(nStepEventi.Value));
+ }
+ else {
+ command.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ if ((nRecCheck.HasValue == true)) {
+ command.Parameters[5].Value = ((int)(nRecCheck.Value));
+ }
+ else {
+ command.Parameters[5].Value = global::System.DBNull.Value;
+ }
+ if ((CheckOnly.HasValue == true)) {
+ command.Parameters[6].Value = ((bool)(CheckOnly.Value));
+ }
+ else {
+ command.Parameters[6].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)) {
diff --git a/MapoDb/DS_Utility.xsd b/MapoDb/DS_Utility.xsd
index fdb5fef8..c6fc6a3a 100644
--- a/MapoDb/DS_Utility.xsd
+++ b/MapoDb/DS_Utility.xsd
@@ -308,15 +308,18 @@ ORDER BY label
-
+
- man.stp_ricalcolaDatiMacchinaFromDate
+ man.stp_ricalcolaDatiMacchinaFromDateFork
+
+
+
@@ -449,7 +452,7 @@ ORDER BY label
-
+
@@ -463,7 +466,7 @@ ORDER BY label
-
+
@@ -478,7 +481,7 @@ ORDER BY label
-
+
@@ -492,7 +495,7 @@ ORDER BY label
-
+
@@ -512,7 +515,7 @@ ORDER BY label
-
+
@@ -581,7 +584,7 @@ ORDER BY label
-
+
@@ -617,7 +620,7 @@ ORDER BY label
-
+
@@ -668,7 +671,7 @@ ORDER BY label
-
+
diff --git a/MapoDb/DS_Utility.xss b/MapoDb/DS_Utility.xss
index c21956e4..ab9924c5 100644
--- a/MapoDb/DS_Utility.xss
+++ b/MapoDb/DS_Utility.xss
@@ -11,11 +11,11 @@
-
+
-
+
-
+
\ No newline at end of file