diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
index 3677ebe..10e08ad 100644
--- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
@@ -12,17 +12,34 @@ namespace NKC_WF.WebUserControls
///
/// ID univoco da IP
///
- protected string deviceId = "AAA";
+ protected string DeviceId
+ {
+ set
+ {
+ hfDeviceId.Value = value;
+ }
+ get
+ {
+ return hfDeviceId.Value;
+ }
+ }
- ///
- /// Batch selezionato
- ///
- protected int BatchID;
///
/// Sheet selezionato...
///
- protected int SheetID;
-
+ protected int SheetID
+ {
+ set
+ {
+ hfSheetID.Value = value.ToString();
+ }
+ get
+ {
+ int answ = 0;
+ int.TryParse(hfSheetID.Value, out answ);
+ return answ;
+ }
+ }
protected string secOp
{
get
@@ -39,15 +56,29 @@ namespace NKC_WF.WebUserControls
///
protected void updateCurrData()
{
- //!!!FIXME!!! fare calcolo del VERO batch corrente...
- BatchID = 242;
// FORSE 5/5?!?
- var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchID, 3, 5);
+ var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5);
if (sheetList.Count > 0)
{
SheetID = sheetList[0].SheetID;
}
- deviceId = ComLib.GetIPAddress().Replace(".", "0").Replace(":", "0");
+ DeviceId = ComLib.GetIPAddress().Replace(".", "0").Replace(":", "0");
+ }
+ ///
+ /// Batch corrente...
+ ///
+ public int BatchId
+ {
+ set
+ {
+ hfBatchID.Value = value.ToString();
+ }
+ get
+ {
+ int answ = 0;
+ int.TryParse(hfBatchID.Value, out answ);
+ return answ;
+ }
}
protected void Page_Load(object sender, EventArgs e)
{
@@ -124,7 +155,7 @@ namespace NKC_WF.WebUserControls
case codeType.UNK:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
// elimino item sel...
- ComLib.resetItemPickup(SheetID, deviceId);
+ ComLib.resetItemPickup(SheetID, DeviceId);
doRaiseEv = true;
break;
case codeType.Item:
@@ -164,7 +195,7 @@ namespace NKC_WF.WebUserControls
default:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
// elimino item sel...
- ComLib.resetItemPickup(SheetID, deviceId);
+ ComLib.resetItemPickup(SheetID, DeviceId);
break;
}
@@ -178,7 +209,7 @@ namespace NKC_WF.WebUserControls
{
// salvo in item sel...
updateCurrData();
- ComLib.saveItemPickup(SheetID, deviceId, itemDtmx);
+ ComLib.saveItemPickup(SheetID, DeviceId, itemDtmx);
}
///
@@ -237,7 +268,7 @@ namespace NKC_WF.WebUserControls
DataLayer.man.taIL.updateStatus(itemIdSelected, 4, "WRK001");
lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}";
// elimino item sel...
- ComLib.resetItemPickup(SheetID, deviceId);
+ ComLib.resetItemPickup(SheetID, DeviceId);
}
}
break;
@@ -257,7 +288,7 @@ namespace NKC_WF.WebUserControls
DataLayer.man.taIL.updateStatus(itemIdSelected, 5, "WRK001");
lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}";
// elimino item sel...
- ComLib.resetItemPickup(SheetID, deviceId);
+ ComLib.resetItemPickup(SheetID, DeviceId);
}
}
break;
diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs
index f458543..73d796d 100644
--- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs
@@ -14,6 +14,33 @@ namespace NKC_WF.WebUserControls
public partial class cmp_unloadSmart
{
+ ///
+ /// Controllo hfBatchID.
+ ///
+ ///
+ /// 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.HiddenField hfBatchID;
+
+ ///
+ /// Controllo hfSheetID.
+ ///
+ ///
+ /// 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.HiddenField hfSheetID;
+
+ ///
+ /// Controllo hfDeviceId.
+ ///
+ ///
+ /// 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.HiddenField hfDeviceId;
+
///
/// Controllo cmp_barcode.
///
diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
index 2417af1..ff67d3f 100644
--- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
@@ -48,7 +48,7 @@ namespace NKC_WF.WebUserControls
// rimetto da validare tramite stored
try
{
- DataLayer.man.taBL.resetPartUnValid(memLayer.ML.CRS("cadBaseBath"));
+ DataLayer.man.taBL.resetPartUnValid();
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
}
@@ -89,7 +89,7 @@ namespace NKC_WF.WebUserControls
// rimetto da validare tramite stored
try
{
- DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"), "*");
+ DataLayer.man.taBL.redoPartValid("*");
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
}
diff --git a/NKC_WF/favicon.ico b/NKC_WF/favicon.ico
index a3a7999..4f0e0ad 100644
Binary files a/NKC_WF/favicon.ico and b/NKC_WF/favicon.ico differ
diff --git a/NKC_WF/mongocrypt.dll b/NKC_WF/mongocrypt.dll
new file mode 100644
index 0000000..3cc3634
Binary files /dev/null and b/NKC_WF/mongocrypt.dll differ
diff --git a/NKC_WF/packages.config b/NKC_WF/packages.config
index 73d88df..7b7fef3 100644
--- a/NKC_WF/packages.config
+++ b/NKC_WF/packages.config
@@ -46,7 +46,7 @@
-
+
diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx
new file mode 100644
index 0000000..3c06a36
--- /dev/null
+++ b/NKC_WF/site/BatchPreview.aspx
@@ -0,0 +1,21 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="BatchPreview.aspx.cs" Inherits="NKC_WF.site.BatchPreview" %>
+
+<%@ Register Src="~/WebUserControls/cmp_BP_bunkList.ascx" TagPrefix="uc1" TagName="cmp_BP_bunkList" %>
+<%@ Register Src="~/WebUserControls/cmp_MU_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_MU_svgViewer" %>
+<%@ Register Src="~/WebUserControls/cmp_BP_sheetList.ascx" TagPrefix="uc1" TagName="cmp_BP_sheetList" %>
+
+
+
+
+
+
+
+
+
Batch preview - start | pause | stop
+
+
+
+
+
+
+
+
DEBUG UNLOAD PAGE
+
+
+
+
+
+
+
+
+
+
+