diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index bdd1f589..fed7665a 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -46,6 +46,17 @@ namespace MoonProTablet.WebUserControls
}
}
+ ///
+ /// Verifica chiave showOdlProvv in tab Config
+ ///
+ protected bool enableRiattrezzaggio
+ {
+ get
+ {
+ return memLayer.ML.cdvb("enableRiattrezzaggio");
+ }
+ }
+
///
/// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
///
@@ -437,7 +448,7 @@ namespace MoonProTablet.WebUserControls
private void checkBtnStatus()
{
// di default rendo abilitato / disabilitato tutto in base al valore "isEnabled"
- lbtShowSplitODL.Enabled = isEnabled;
+ lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio;
lbtSplitODL.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled;
fixWCtrStatus(lbtShowSplitODL);
@@ -487,12 +498,12 @@ namespace MoonProTablet.WebUserControls
bool okCheckST = tabRichieste.Count == 0;
if (okCheckST)
{
- lblNeedSTAR.Visible = false;
+ hlNeedStar.Visible = false;
lbtStartProd.Enabled = (isEnabled && inAttr);
}
else
{
- lblNeedSTAR.Visible = (isEnabled && inAttr);
+ hlNeedStar.Visible = (isEnabled && inAttr);
lbtStartProd.Enabled = false;
}
}
@@ -608,7 +619,7 @@ namespace MoonProTablet.WebUserControls
///
private void fixSplitBtn(bool splitOdl)
{
- lbtShowSplitODL.Visible = !splitOdl;
+ lbtShowSplitODL.Visible = !splitOdl && enableRiattrezzaggio;
chkCloseOdl.Visible = !splitOdl;
lbtSplitODL.Visible = splitOdl;
showNoteTC(splitOdl);
@@ -846,8 +857,7 @@ namespace MoonProTablet.WebUserControls
DataLayerObj.taODL.fixMachineSlave(idxMacchina, 30, 1);
}
// sistemo buttons!
- bool splitOdl = false;
- fixSplitBtn(splitOdl);
+ fixSplitBtn(false);
}
catch (Exception exc)
{
@@ -926,8 +936,7 @@ namespace MoonProTablet.WebUserControls
///
protected void lbtShowSplitODL_Click(object sender, EventArgs e)
{
- bool splitOdl = true;
- fixSplitBtn(splitOdl);
+ fixSplitBtn(true);
// recupero current idx
int currODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
updateTempoTc(currODL, true);
@@ -955,6 +964,12 @@ namespace MoonProTablet.WebUserControls
// effettuo split su nuovo ODL
DataLayerObj.taODL.splitODL(currODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCRichAttr, PzPallet, txtNote.Text, true, 0);
+ // se c'è gestione SchedaTecnica --> chiamo procedura update x lotti
+ if (enableSchedaTecnica)
+ {
+ int newODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
+ DataLayerObj.taMagELotti.UpsertByOdl(newODL, true);
+ }
// resetto ODL su redis...
DataLayerObj.emptyCurrODL(idxMacchinaFix);
@@ -964,8 +979,7 @@ namespace MoonProTablet.WebUserControls
// processo chiusura setup
processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrato Riattrezzaggio ODL (old: {0})", currODL), currODL);
// sistemo buttons!
- bool splitOdl = false;
- fixSplitBtn(splitOdl);
+ fixSplitBtn(false);
// sollevo evento!
if (eh_reqUpdate != null)
@@ -1165,6 +1179,8 @@ namespace MoonProTablet.WebUserControls
{
lblOut.Text = "Selezionare un ORDINE valido!";
}
+ checkBtnStatus();
+ fixSplitBtn(false);
// sollevo evento!
if (eh_reqUpdate != null)
{
@@ -1258,6 +1274,7 @@ namespace MoonProTablet.WebUserControls
{
mod_tempoMSMC.modoTempo = timeMode.MC;
}
+ fixSplitBtn(false);
}
cmp_newODL.eh_newVal += Cmp_newODL_eh_newVal;
}
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs
index 925bd22e..7f7f0528 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs
@@ -222,13 +222,13 @@ namespace MoonProTablet.WebUserControls
protected global::System.Web.UI.WebControls.LinkButton lbtReopOdlSuTav;
///
- /// Controllo lblNeedSTAR.
+ /// Controllo hlNeedStar.
///
///
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
- protected global::System.Web.UI.WebControls.Label lblNeedSTAR;
+ protected global::System.Web.UI.WebControls.HyperLink hlNeedStar;
///
/// Controllo lbtStartProd.