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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-17 13:23:33 +02:00
parent a467c5ca0c 5367d5ca06
commit 3e786e6cb0
2 changed files with 67 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=333']) {
withEnv(['NEXT_BUILD_NUMBER=334']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+66 -53
View File
@@ -136,7 +136,8 @@ namespace NKC_WF.WebUserControls
if (!Page.IsPostBack)
{
resetShowData();
resetIcons();
resetMessages();
resetButtons();
updateCurrData();
}
cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh;
@@ -147,12 +148,6 @@ namespace NKC_WF.WebUserControls
lblDestination.Text = "--";
}
private void resetShowData()
{
showCart = false;
showBin = false;
showSecOp = false;
}
/// <summary>
/// Comando barcode letto
@@ -189,7 +184,8 @@ namespace NKC_WF.WebUserControls
}
private void Cmp_barcode_eh_doReset(object sender, EventArgs e)
{
resetIcons();
resetMessages();
resetButtons();
}
private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
@@ -205,7 +201,7 @@ namespace NKC_WF.WebUserControls
doUpdate();
if (doRaiseEv)
{
resetMessages();
resetMessageDivs();
}
}
@@ -282,16 +278,6 @@ namespace NKC_WF.WebUserControls
ComLib.saveItemPickup(SheetID, DeviceId, itemDtmx);
}
/// <summary>
/// Resetta mesaggi ed errori
/// </summary>
protected void resetMessages()
{
divInfoMessage.Visible = false;
lblInfoMessage.Text = "";
divItemError.Visible = false;
lblErrorMsg.Text = "";
}
/// <summary>
/// Processo il DataMatrix letto
/// </summary>
/// <param name="tipoCod"></param>
@@ -353,6 +339,7 @@ namespace NKC_WF.WebUserControls
DataLayer.man.taIL.updateStatus(itemIdSelected, 3, PlaceId);
lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}";
resetSelection(false);
resetButtons();
}
}
}
@@ -378,6 +365,7 @@ namespace NKC_WF.WebUserControls
DataLayer.man.taIL.updateStatus(itemIdSelected, 4, PlaceId);
lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}";
resetSelection(false);
resetButtons();
}
}
}
@@ -388,7 +376,7 @@ namespace NKC_WF.WebUserControls
{
int defaultSecScreenShowTimeout = memLayer.ML.CRI("defaultSecScreenShowTimeout");
ComLib.setSecScreenRequest(rawData, lblItemDtmx.Text, 60 * defaultSecScreenShowTimeout);
displMessage($"ITEM Sent to second screen | {lblItemDtmx.Text} for {defaultSecScreenShowTimeout} min", true);
displMessage($"ITEM Sent to second screen | {lblItemDtmx.Text} for {defaultSecScreenShowTimeout} min", false);
}
else
{
@@ -422,32 +410,7 @@ namespace NKC_WF.WebUserControls
divItemError.Visible = true;
resetSelection(resetStatus);
}
/// <summary>
/// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload
/// </summary>
/// <param name="resetStatus"></param>
protected void resetSelection(bool resetStatus)
{
if (resetStatus)
{
try
{
// SE item esiste...
var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999);
if (tabItem.Count == 1)
{
// riposto item a status 1...
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
}
}
catch
{ }
// elimino item sel...
itemIdSelected = 0;
}
resetShowData();
ComLib.resetItemPickup(SheetID, DeviceId);
}
/// <summary>
/// Mostra o nasconde dettaglio su ITEM letto
/// </summary>
@@ -508,7 +471,6 @@ namespace NKC_WF.WebUserControls
break;
}
}
lbtResetSel.Visible = (itemIdSelected != 0);
}
public int itemIdSelected
@@ -527,21 +489,74 @@ namespace NKC_WF.WebUserControls
lbtCancel.Visible = showBtn;
lbtScrapped.Visible = showBtn;
lbtParkArea.Visible = showBtn;
lbtResetSel.Visible = showBtn;
}
}
private void resetIcons()
/// <summary>
/// Resetto testi
/// </summary>
private void resetMessages()
{
lblDestination.CssClass = "text-secondary";
lblMessage.Text = "";
lblDestination.Text = "";
lblLastBCode.Text = "";
}
/// <summary>
/// resetto buttons azioni
/// </summary>
private void resetButtons()
{
lbtCancel.Visible = false;
lbtScrapped.Visible = false;
lbtParkArea.Visible = false;
lbtResetSel.Visible = (itemIdSelected != 0);
lbtResetSel.Visible = false;
}
/// <summary>
/// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload
/// </summary>
/// <param name="resetStatus"></param>
protected void resetSelection(bool resetStatus)
{
if (resetStatus)
{
try
{
// SE item esiste...
var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999);
if (tabItem.Count == 1)
{
// riposto item a status 1...
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
}
}
catch
{ }
// elimino item sel...
itemIdSelected = 0;
}
resetShowData();
ComLib.resetItemPickup(SheetID, DeviceId);
}
/// <summary>
/// Reset booleani visualizzazione
/// </summary>
private void resetShowData()
{
showCart = false;
showBin = false;
showSecOp = false;
}
/// <summary>
/// Resetta mesaggi ed errori
/// </summary>
protected void resetMessageDivs()
{
divInfoMessage.Visible = false;
lblInfoMessage.Text = "";
divItemError.Visible = false;
lblErrorMsg.Text = "";
}
protected DS_App.BinsDataTable currBinTab
{
get
@@ -642,8 +657,6 @@ namespace NKC_WF.WebUserControls
lblLastBCode.Text = $"DO SEC OP: {secOp}";
lblLastBCode.CssClass = "text-info";
}
// fix btn reset!
lbtResetSel.Visible = (itemIdSelected != 0);
}
protected void lbtCancel_Click(object sender, EventArgs e)