diff --git a/MP-TAB/WebUserControls/cmp_ST_detail.ascx b/MP-TAB/WebUserControls/cmp_ST_detail.ascx
index 32ad87fe..84d9beaf 100644
--- a/MP-TAB/WebUserControls/cmp_ST_detail.ascx
+++ b/MP-TAB/WebUserControls/cmp_ST_detail.ascx
@@ -6,12 +6,12 @@
-
+
-
+
diff --git a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
index b4562b8c..08624a4b 100644
--- a/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
+++ b/MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
@@ -152,7 +152,7 @@ namespace MoonProTablet.WebUserControls
// verifico EVENTUALI deroghe
var currDeroga = DataLayerObj.getDerogaSt(tabRichieste[0].IdxST);
// se è deroga x gruppo/tipo/num corretto...
- if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num)
+ if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num && tabRichieste[0].Oggetto == currDeroga.Oggetto)
{
// ... forzo accettazione deroga
DataLayerObj.taSTChk.upsertQuery(idxOdl, tabRichieste[0].IdxST, tabRichieste[0].Oggetto, tabRichieste[0].Num, BCodeVal, tabRichieste[0].Value, true, user_std.UtSn.utente);
diff --git a/MP-TAB/WebUserControls/cmp_ST_objView.ascx b/MP-TAB/WebUserControls/cmp_ST_objView.ascx
index b271ce2b..7cd76b05 100644
--- a/MP-TAB/WebUserControls/cmp_ST_objView.ascx
+++ b/MP-TAB/WebUserControls/cmp_ST_objView.ascx
@@ -1,9 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objView.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_ST_objView" %>
-
+
+
diff --git a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs
index d157ad5e..d7a931b3 100644
--- a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs
+++ b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.cs
@@ -71,7 +71,6 @@ namespace MoonProTablet.WebUserControls
}
}
-
public int dataNum
{
get
@@ -85,6 +84,21 @@ namespace MoonProTablet.WebUserControls
hfNum.Value = $"{value}";
}
}
+
+ public int dataOggetto
+ {
+ get
+ {
+ int answ = 0;
+ int.TryParse(hfOggetto.Value, out answ);
+ return answ;
+ }
+ set
+ {
+ hfOggetto.Value = $"{value}";
+ }
+ }
+
public int idxST
{
get
@@ -237,7 +251,7 @@ namespace MoonProTablet.WebUserControls
answ = (currDeroga != null);
if (answ)
{
- answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType);
+ answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto);
}
}
catch
@@ -289,6 +303,7 @@ namespace MoonProTablet.WebUserControls
{
CanForce = enableForceParamSchedaTecnica,
Num = dataNum,
+ Oggetto = dataOggetto,
CodTipo = dataType,
CodGruppo = dataGroup,
IdxST = idxST
diff --git a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs
index c8621400..c3b17230 100644
--- a/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs
+++ b/MP-TAB/WebUserControls/cmp_ST_objView.ascx.designer.cs
@@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class cmp_ST_objView
{
- ///
- /// hfNum control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.HiddenField hfNum;
-
///
/// hfIdxST control.
///
@@ -50,6 +41,24 @@ namespace MoonProTablet.WebUserControls
///
protected global::System.Web.UI.WebControls.HiddenField hfGruppo;
+ ///
+ /// hfNum control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfNum;
+
+ ///
+ /// hfOggetto control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfOggetto;
+
///
/// hfLabel control.
///