Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OK selezione e deselezione ITEMS

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-23 18:23:49 +01:00
parent c13343a456
commit ce94e2d6f1
8 changed files with 145 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/ComLib.cs
+5
View File
@@ -1616,7 +1616,12 @@ namespace AppData
// sostituisco
dictData.Remove(deviceId);
}
// salvo!
rawData = JsonConvert.SerializeObject(dictData);
memLayer.ML.setRSV($"{redKeyBase}:ItemsSel", rawData);
answ = true;
// reset memoria redis del CSS x obbligare refresh...
memLayer.ML.setRSV($"{redKeyBase}:Css", "");
}
catch
{ }
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=214']) {
withEnv(['NEXT_BUILD_NUMBER=215']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_unloadSmart.ascx
+3
View File
@@ -3,6 +3,9 @@
<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %>
<div class="mx-0">
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<asp:HiddenField ID="hfDeviceId" runat="server" />
<div class="card text-center" style="width: 100%;">
<h4 class="card-header bg-secondary text-light"><%: traduci("MachineUnloadSmart") %></h4>
<div class="card-body py-1">
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+47 -16
View File
@@ -12,17 +12,34 @@ namespace NKC_WF.WebUserControls
/// <summary>
/// ID univoco da IP
/// </summary>
protected string deviceId = "AAA";
protected string DeviceId
{
set
{
hfDeviceId.Value = value;
}
get
{
return hfDeviceId.Value;
}
}
/// <summary>
/// Batch selezionato
/// </summary>
protected int BatchID;
/// <summary>
/// Sheet selezionato...
/// </summary>
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
/// </summary>
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");
}
/// <summary>
/// Batch corrente...
/// </summary>
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);
}
/// <summary>
@@ -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;
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs
Generated
+27
View File
@@ -14,6 +14,33 @@ namespace NKC_WF.WebUserControls
public partial class cmp_unloadSmart
{
/// <summary>
/// Controllo hfBatchID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
/// <summary>
/// Controllo hfSheetID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetID;
/// <summary>
/// Controllo hfDeviceId.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfDeviceId;
/// <summary>
/// Controllo cmp_barcode.
/// </summary>
NKC_WF/site/MachineUnloadSmart.aspx
+1
View File
@@ -5,5 +5,6 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<uc1:cmp_unloadSmart runat="server" ID="cmp_unloadSmart" />
</asp:Content>
NKC_WF/site/MachineUnloadSmart.aspx.cs
+36 -1
View File
@@ -1,6 +1,41 @@
namespace NKC_WF
using System;
namespace NKC_WF
{
public partial class MachineUnloadSmart : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
doUpdate();
}
}
/// <summary>
/// Batch corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
/// <summary>
/// Aggiorna componente principale e child components
/// </summary>
private void doUpdate()
{
//!!!FIXME!!! fare calcolo del VERO batch corrente...
BatchId = 242; // fixed x test!
// aggiorno child
cmp_unloadSmart.BatchId = BatchId;
}
}
}
NKC_WF/site/MachineUnloadSmart.aspx.designer.cs
Generated
+25 -14
View File
@@ -7,18 +7,29 @@
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF {
public partial class MachineUnloadSmart {
/// <summary>
/// Controllo cmp_unloadSmart.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_unloadSmart cmp_unloadSmart;
}
namespace NKC_WF
{
public partial class MachineUnloadSmart
{
/// <summary>
/// Controllo hfBatchID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
/// <summary>
/// Controllo cmp_unloadSmart.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_unloadSmart cmp_unloadSmart;
}
}