diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
index 03d83ac..b2bd055 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
@@ -15,8 +15,18 @@
-
# <%: traduci("LastAction") %>
-
+
+
+ # <%: traduci("LastAction") %>
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
index f74a983..6cce228 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
@@ -12,7 +12,10 @@ namespace NKC_WF.WebUserControls
protected string _SqlImportDir = memLayer.ML.CRS("_SqlImportDir");
protected void Page_Load(object sender, EventArgs e)
{
-
+ if (!Page.IsPostBack)
+ {
+ displayMessage("", false);
+ }
}
///
/// Nome file caricato
@@ -145,13 +148,13 @@ namespace NKC_WF.WebUserControls
imported = checkOk && !testOnly;
// ora effettua validazione e mostra eventuale esito...
processValidation();
- lblOutTask.Text = $"Data Import: executed tray, checkOk: {checkOk} | imported: {imported}";
+ displayMessage($"{traduci("KitDataImportExecuted")}: {checkOk} | : {imported}", false);
}
catch (Exception exc)
{
- string fullMessage = $"KitCsvMan: Eccezione in IMPORT file:{Environment.NewLine}{exc}";
+ string fullMessage = $"{traduci("KitDataImportException")}:{Environment.NewLine}{exc}";
logger.lg.scriviLog(fullMessage);
- lblOutTask.Text = fullMessage;
+ displayMessage(fullMessage, true);
}
}
@@ -163,10 +166,21 @@ namespace NKC_WF.WebUserControls
tryImport(false);
}
processValidation();
- if(imported)
+ if (imported)
{
raiseReset();
}
}
+ ///
+ /// DIsplay message + gest visualizzazione
+ ///
+ ///
+ ///
+ protected void displayMessage(string mainMessage, bool showFull)
+ {
+ lblOutTask.Text = mainMessage;
+ lblOutTaskAll.Text = mainMessage;
+ divFullMsg.Visible = showFull;
+ }
}
}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs
index 7fb9fc3..89ff21a 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.designer.cs
@@ -77,6 +77,24 @@ namespace NKC_WF.WebUserControls
///
protected global::System.Web.UI.WebControls.Label lblOutTask;
+ ///
+ /// Controllo divFullMsg.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFullMsg;
+
+ ///
+ /// Controllo lblOutTaskAll.
+ ///
+ ///
+ /// 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 lblOutTaskAll;
+
///
/// Controllo divStep1.
///
diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
index c903673..5bdb762 100644
--- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
@@ -183,6 +183,7 @@ namespace NKC_WF.WebUserControls
ComLib.updateBatchPositionByBunk(stackId);
doRaiseEv = true;
}
+ ComLib.setReloadMU();
}
// altrimenti segnalo NON pronto x caricare prossimo
else
diff --git a/NKC_WF/site/KitRequestImporter.aspx b/NKC_WF/site/KitRequestImporter.aspx
index 51afd0e..c736e8f 100644
--- a/NKC_WF/site/KitRequestImporter.aspx
+++ b/NKC_WF/site/KitRequestImporter.aspx
@@ -17,20 +17,22 @@
-
-
-
-
+
diff --git a/NKC_WF/site/KitRequestImporter.aspx.designer.cs b/NKC_WF/site/KitRequestImporter.aspx.designer.cs
index 372ffe6..14918c7 100644
--- a/NKC_WF/site/KitRequestImporter.aspx.designer.cs
+++ b/NKC_WF/site/KitRequestImporter.aspx.designer.cs
@@ -24,13 +24,13 @@ namespace NKC_WF
protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
///
- /// Controllo UpdatePanel1.
+ /// Controllo upnlCheck.
///
///
/// 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 UpdatePanel1;
+ protected global::System.Web.UI.UpdatePanel upnlCheck;
///
/// Controllo cmp_kitImpCheck.
@@ -50,6 +50,15 @@ namespace NKC_WF
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList;
+ ///
+ /// Controllo upnlList.
+ ///
+ ///
+ /// 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 upnlList;
+
///
/// Controllo cmp_kitList.
///
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs
index f41d7a8..263fed3 100644
--- a/NKC_WF/site/MachineUnload.aspx.cs
+++ b/NKC_WF/site/MachineUnload.aspx.cs
@@ -11,6 +11,8 @@ namespace NKC_WF
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
+ // svuoto redis...
+ memLayer.ML.redFlushKey(ComLib.redMachUnloadCount);
doUpdate();
}
}