-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs
index d253933..80060be 100644
--- a/NKC_WF/site/MachineLoad.aspx.cs
+++ b/NKC_WF/site/MachineLoad.aspx.cs
@@ -8,7 +8,7 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
- ((SiteContent)this.Master).showSearch = false;
+ ((SiteMaster)this.Master).showSearch = false;
forceRefresh();
}
cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx
index 5efe691..3065dd5 100644
--- a/NKC_WF/site/MachineLoadSmart.aspx
+++ b/NKC_WF/site/MachineLoadSmart.aspx
@@ -1,10 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoadSmart.aspx.cs" Inherits="NKC_WF.site.MachineLoadSmart" %>
-<%@ Register Src="~/WebUserControls/cmp_ML_smart.ascx" TagPrefix="uc1" TagName="cmp_ML_smart" %>
-
+<%@ Register Src="~/WebUserControls/cmp_stackLoading.ascx" TagPrefix="uc1" TagName="cmp_stackLoading" %>
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.cs b/NKC_WF/site/MachineLoadSmart.aspx.cs
index 1724f9c..c293753 100644
--- a/NKC_WF/site/MachineLoadSmart.aspx.cs
+++ b/NKC_WF/site/MachineLoadSmart.aspx.cs
@@ -14,49 +14,20 @@ namespace NKC_WF.site
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
-#if false
- doUpdate();
-#endif
+ forceRefresh();
}
+ cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
}
-#if false
- ///
- /// Batch corrente...
- ///
- public int BatchId
+
+ private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e)
{
- set
- {
- hfBatchID.Value = value.ToString();
- }
- get
- {
- int answ = 0;
- int.TryParse(hfBatchID.Value, out answ);
- return answ;
- }
+ forceRefresh();
}
- ///
- /// Aggiorna componente principale e child components
- ///
- private void doUpdate()
+
+ private void forceRefresh()
{
- setCurrData();
- // aggiorno child
- cmp_unloadSmart.BatchId = BatchId;
+
}
- ///
- /// Imposta dati correnti (Bunk / Sheet)
- ///
- private void setCurrData()
- {
- // recupero bunk corrente...
- DS_App.StackListRow currBunk = ComLib.getCurrBunk();
- if (currBunk != null)
- {
- BatchId = currBunk.BatchID;
- }
- }
-#endif
+
}
}
\ No newline at end of file
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs
index b175025..4493031 100644
--- a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs
+++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs
@@ -15,12 +15,21 @@ namespace NKC_WF.site
{
///
- /// Controllo cmp_ML_smart.
+ /// Controllo upnlBCode.
///
///
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
- protected global::NKC_WF.WebUserControls.cmp_ML_smart cmp_ML_smart;
+ protected global::System.Web.UI.UpdatePanel upnlBCode;
+
+ ///
+ /// Controllo cmp_stackLoading.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::NKC_WF.WebUserControls.cmp_stackLoading cmp_stackLoading;
}
}
diff --git a/NKC_WF/temp/119748.pdf b/NKC_WF/temp/119748.pdf
deleted file mode 100644
index 5ee27c6..0000000
Binary files a/NKC_WF/temp/119748.pdf and /dev/null differ