diff --git a/MP-TAB/WebUserControls/cmp_ST_detail.ascx b/MP-TAB/WebUserControls/cmp_ST_detail.ascx
index 78276a35..286af9dd 100644
--- a/MP-TAB/WebUserControls/cmp_ST_detail.ascx
+++ b/MP-TAB/WebUserControls/cmp_ST_detail.ascx
@@ -19,7 +19,6 @@
-
diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
index fae3e69b..2a810d69 100644
--- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
+++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
@@ -77,7 +77,7 @@ namespace MoonProTablet.WebUserControls
bool showInput = false;
try
{
- showInput = DataLayerObj.taSTAR.getPendingByOdl(CodArticolo, idxOdl).Count > 0;
+ showInput = DataLayerObj.taSTAR.getPendingByOdl(idxOdl).Count > 0;
}
catch
{ }
@@ -91,7 +91,7 @@ namespace MoonProTablet.WebUserControls
{
bool found = false;
// per prima cosa recupero i valori "Pending" da leggere come candidati...
- var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(CodArticolo, idxOdl);
+ var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
if (tabRichieste != null && tabRichieste.Count > 0)
{
// cerco per EQ come primo step...
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index ccf0d373..9101532c 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -495,7 +495,7 @@ namespace MoonProTablet.WebUserControls
// controllo se ci sia da verificare scheda tecnica
if (enableSchedaTecnica)
{
- var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl("", idxOdl);
+ var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
bool okCheckST = tabRichieste.Count == 0;
if (okCheckST)
{
diff --git a/MapoDb/DS_SheetTech.Designer.cs b/MapoDb/DS_SheetTech.Designer.cs
index 993c9082..4b918d6c 100644
--- a/MapoDb/DS_SheetTech.Designer.cs
+++ b/MapoDb/DS_SheetTech.Designer.cs
@@ -4504,14 +4504,12 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
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("@CodGruppo", 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("@CodArticolo", 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("@IdxODL", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 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 = "dbo.stp_ST_AR_getPendingOdl";
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("@CodArticolo", 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("@IdxODL", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -4543,7 +4541,7 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
[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_SheetTech.ST_ActualRowDataTable getByCodArt(string CodGruppo, string CodArticolo, global::System.Nullable IdxODL) {
+ public virtual DS_SheetTech.ST_ActualRowDataTable getByCodArt(string CodGruppo, global::System.Nullable IdxODL) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((CodGruppo == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -4551,17 +4549,11 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodGruppo));
}
- if ((CodArticolo == null)) {
- this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodArticolo));
- }
if ((IdxODL.HasValue == true)) {
- this.Adapter.SelectCommand.Parameters[3].Value = ((int)(IdxODL.Value));
+ this.Adapter.SelectCommand.Parameters[2].Value = ((int)(IdxODL.Value));
}
else {
- this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+ this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
DS_SheetTech.ST_ActualRowDataTable dataTable = new DS_SheetTech.ST_ActualRowDataTable();
this.Adapter.Fill(dataTable);
@@ -4572,19 +4564,13 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
[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_SheetTech.ST_ActualRowDataTable getPendingByOdl(string CodArticolo, global::System.Nullable IdxODL) {
+ public virtual DS_SheetTech.ST_ActualRowDataTable getPendingByOdl(global::System.Nullable IdxODL) {
this.Adapter.SelectCommand = this.CommandCollection[2];
- if ((CodArticolo == null)) {
- this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodArticolo));
- }
if ((IdxODL.HasValue == true)) {
- this.Adapter.SelectCommand.Parameters[2].Value = ((int)(IdxODL.Value));
+ this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxODL.Value));
}
else {
- this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+ this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
DS_SheetTech.ST_ActualRowDataTable dataTable = new DS_SheetTech.ST_ActualRowDataTable();
this.Adapter.Fill(dataTable);
diff --git a/MapoDb/DS_SheetTech.xsd b/MapoDb/DS_SheetTech.xsd
index da9534fb..976bef62 100644
--- a/MapoDb/DS_SheetTech.xsd
+++ b/MapoDb/DS_SheetTech.xsd
@@ -169,7 +169,6 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
-
@@ -181,7 +180,6 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
dbo.stp_ST_AR_getPendingOdl
-
@@ -275,7 +273,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
-
+
dbo.stp_ST_CHK_cleanByOdl
@@ -297,7 +295,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
-
+
dbo.stp_ST_CHK_upsert
@@ -564,7 +562,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -587,7 +585,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -660,7 +658,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -700,7 +698,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -721,7 +719,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -741,7 +739,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -761,7 +759,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
+
@@ -860,11 +858,11 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/MapoDb/DS_SheetTech.xss b/MapoDb/DS_SheetTech.xss
index 2f444b71..4bc60b09 100644
--- a/MapoDb/DS_SheetTech.xss
+++ b/MapoDb/DS_SheetTech.xss
@@ -8,7 +8,7 @@
-
+