-
+
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs
index b41a4f4..5f514cf 100644
--- a/NKC_WF/site/MachineUnload.aspx.cs
+++ b/NKC_WF/site/MachineUnload.aspx.cs
@@ -30,10 +30,11 @@ namespace NKC_WF
set
{
hfBatchID.Value = value.ToString();
+ ComLib.setCurrBunkId(machine, value);
}
get
{
- int answ = 0;
+ int answ = ComLib.getCurrBunkId(machine);
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
@@ -46,10 +47,11 @@ namespace NKC_WF
set
{
hfSheetID.Value = value.ToString();
+ ComLib.setCurrSheetId(machine, value);
}
get
{
- int answ = 0;
+ int answ = ComLib.getCurrSheetId(machine);
int.TryParse(hfSheetID.Value, out answ);
return answ;
}
@@ -61,15 +63,16 @@ namespace NKC_WF
{
// imposto dati correnti
bool doUpdate = setCurrData();
+ // aggiorno child
+ cmp_MU_stats.BatchId = BatchId;
+ cmp_MU_bins.BatchId = BatchId;
+ cmp_MU_carts.BatchId = BatchId;
+ cmp_MU_svgViewer.BatchId = BatchId;
+ cmp_MU_svgViewer.SheetId = SheetId;
if (doUpdate)
{
- // aggiorno child
- cmp_MU_stats.BatchId = BatchId;
- cmp_MU_bins.BatchId = BatchId;
- cmp_MU_carts.BatchId = BatchId;
- cmp_MU_svgViewer.BatchId = BatchId;
- cmp_MU_svgViewer.SheetId = SheetId;
cmp_MU_svgViewer.doUpdate();
+ upnlTitle.Update();
}
}
///
@@ -88,7 +91,7 @@ namespace NKC_WF
needUpdate = true;
}
- DS_App.SheetListRow currSheet = ComLib.getCurrSheet(BatchId);
+ DS_App.SheetListRow currSheet = ComLib.getCurrSheet(BatchId, machine);
if (currSheet != null)
{
if (SheetId != currSheet.SheetID)
@@ -101,10 +104,12 @@ namespace NKC_WF
else
{
BatchId = 0;
+ ComLib.setCurrBunkId(machine, 0);
+ ComLib.setCurrSheetId(machine, 0);
ComLib.man.resetSheetUnload(0);
}
// se sheet/bunk 0 --> update!
- if (BatchId == 0 && SheetId == 0)
+ if (BatchId <= 0 && SheetId <= 0)
{
needUpdate = true;
}
@@ -168,9 +173,10 @@ namespace NKC_WF
///
protected void incrNumWait()
{
- if (numWaitSvg > 30)
+ if (numWaitSvg > 20)
{
memLayer.ML.resetRCnt(redProdReq);
+ Response.Redirect(Request.RawUrl);
}
memLayer.ML.setRCntI(redProdReq);
}
diff --git a/NKC_WF/site/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs
index be25b73..655bc4e 100644
--- a/NKC_WF/site/MachineUnload.aspx.designer.cs
+++ b/NKC_WF/site/MachineUnload.aspx.designer.cs
@@ -14,6 +14,15 @@ namespace NKC_WF
public partial class MachineUnload
{
+ ///
+ /// Controllo upnlTitle.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.UpdatePanel upnlTitle;
+
///
/// Controllo upnlStats.
///