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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-19 18:01:22 +02:00
parent 2264c87031 048818deb4
commit a5df1189e3
18 changed files with 178 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/Enum.cs
+11
View File
@@ -14,4 +14,15 @@ namespace AppData
CART,
BIN
}
public enum cssClass
{
ND,
primary,
secondary,
info,
success,
warning,
danger
}
}
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=347']) {
withEnv(['NEXT_BUILD_NUMBER=348']) {
// 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_KS_BinCart.ascx.cs
+14
View File
@@ -164,6 +164,20 @@ namespace NKC_WF.WebUserControls
cmp_KS_OkibBin.Dtmx = value;
}
}
/// <summary>
/// Descrizione BIN selezionato (ord ext code)
/// </summary>
public string BinDesc
{
get
{
return cmp_KS_currBin.Description;
}
set
{
cmp_KS_currBin.Description = value;
}
}
protected void lbtAddOne_Click(object sender, EventArgs e)
{
NKC_WF/WebUserControls/cmp_KS_currBin.ascx
+8 -1
View File
@@ -3,5 +3,12 @@
<div class="border border-info">
<h5 class="table-info text-uppercase"> <%: traduci ("Bin") %></h5>
<asp:HiddenField runat="server" ID="hfValue" />
<asp:Label runat="server" ID="lblDtmx" />
<div class="row">
<div class="col-6">
<asp:Label runat="server" ID="lblDtmx" />
</div>
<div class="col-6">
<asp:Label runat="server" ID="lblDesc" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_KS_currBin.ascx.cs
+11
View File
@@ -38,5 +38,16 @@ namespace NKC_WF.WebUserControls
lblDtmx.Text = value;
}
}
public string Description
{
get
{
return lblDesc.Text;
}
set
{
lblDesc.Text = value;
}
}
}
}
NKC_WF/WebUserControls/cmp_KS_currBin.ascx.designer.cs
Generated
+9
View File
@@ -31,5 +31,14 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDtmx;
/// <summary>
/// Controllo lblDesc.
/// </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.Label lblDesc;
}
}
NKC_WF/WebUserControls/cmp_barcode.ascx
+4 -3
View File
@@ -1,7 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_barcode" %>
<div class="form-group bigText">
<%--AutoPostBack="True"--%>
<div class="bigText">
<asp:TextBox runat="server" ID="txtBarcode" class="form-control" autofocus="true" OnTextChanged="txtBarcode_TextChanged"></asp:TextBox>
<asp:Label ID="lblOutput" runat="server" for="txtBarcode" Width="100%" />
<asp:LinkButton runat="server" ID="lbtReset" OnClick="lbtReset_Click" CssClass="btn btn-block bnt-default">
<asp:Label ID="lblOutput" runat="server" /> <i class="fa fa-refresh" aria-hidden="true"></i>
</asp:LinkButton>
<asp:HiddenField ID="hfLastCmd" runat="server" />
</div>
NKC_WF/WebUserControls/cmp_barcode.ascx.cs
+17 -6
View File
@@ -92,21 +92,32 @@ namespace NKC_WF.WebUserControls
/// </summary>
public void resetMessage()
{
lblOutput.Visible = false;
lbtReset.Visible = false;
lblOutput.Text = "";
}
/// <summary>
/// Gestione output da mostrare (opzionale
/// </summary>
/// <param name="cssClass"></param>
/// <param name="cssClass">Enum delle classi permesse</param>
/// <param name="messaggio"></param>
public void showOutput(string cssClass, string messaggio)
public void showOutput(AppData.cssClass cssClass, string messaggio)
{
// In primis: mostro qualcosa SOLO SE ho del testo
lblOutput.Visible = !string.IsNullOrEmpty(messaggio);
lbtReset.Visible = !string.IsNullOrEmpty(messaggio);
lblOutput.Text = messaggio;
lblOutput.Attributes.Remove("class");
lblOutput.Attributes.Add("class", cssClass);
//lbtReset.Attributes.Remove("class");
//lbtReset.Attributes.Add("class", $"btn btn-block {cssClass}");
lbtReset.CssClass = $"btn btn-sm btn-block py-0 btn-{cssClass}";
}
/// <summary>
/// reset lettura
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtReset_Click(object sender, EventArgs e)
{
Response.Redirect(Request.RawUrl);
}
}
}
NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs
Generated
+9
View File
@@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
/// <summary>
/// Controllo lbtReset.
/// </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.LinkButton lbtReset;
/// <summary>
/// Controllo lblOutput.
/// </summary>
NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs
+23 -16
View File
@@ -208,53 +208,53 @@ namespace NKC_WF.WebUserControls
switch (decoData.codeType)
{
case codeType.UNK:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action");
resetSelection();
doRaiseEv = true;
break;
case codeType.Item:
cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.ItemGeneric:
cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}");
//processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.OtherItem:
cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid Generic PART Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Material - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Sheet:
cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Stack:
cmp_barcode.showOutput("badge badge-warning", $"BUNK - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Batch:
cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Cart:
cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Valid CR Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
doRaiseEv = true;
break;
case codeType.Bin:
cmp_barcode.showOutput("badge badge-warning", $"BIN NOT PAINTED - Ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"BIN NOT PAINTED - Ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.BinProcessed:
cmp_barcode.showOutput("badge badge-success", $"Valid BP Code: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Valid BP Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
default:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action");
resetSelection();
break;
}
@@ -423,9 +423,14 @@ namespace NKC_WF.WebUserControls
else
{
// mostro BIN!
setBin(rawData, codeInt);
string descr = "-";
try
{
descr = tabOKIB[0].OrderExtCode;
}
catch
{ }
setBin(rawData, codeInt, descr);
// verifico se il Bin sia già stato messo in scarico (in quel caso dico già ok...)
var listBinAcquired = tabOKIB.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull() && !x.IsBinKitStartNull()).ToList();
if (listBinAcquired.Count > 0)
@@ -577,10 +582,12 @@ namespace NKC_WF.WebUserControls
/// </summary>
/// <param name="rawData"></param>
/// <param name="codeInt"></param>
private void setBin(string rawData, int codeInt)
/// <param name="Description"></param>
private void setBin(string rawData, int codeInt, string Description)
{
cmp_KS_BinCart.BinID = codeInt;
cmp_KS_BinCart.BinDtmx = rawData;
cmp_KS_BinCart.BinDesc = Description;
cmp_KS_BinCart.doUpdate();
fixVisibility();
}
NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs
+11 -11
View File
@@ -188,57 +188,57 @@ namespace NKC_WF.WebUserControls
switch (decoData.codeType)
{
case codeType.Item:
cmp_barcode.showOutput("badge badge-success", $"IT {traduci("ValidCode")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"IT {traduci("ValidCode")}: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.ItemGeneric:
cmp_barcode.showOutput("badge badge-success", $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.rawData}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.OtherItem:
cmp_barcode.showOutput("badge badge-success", $"{traduci("OtherPart")} - {traduci("Ignored")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("OtherPart")} - {traduci("Ignored")}: {decoData.rawData}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Sheet:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Stack:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")}BUNK - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")}BUNK - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Batch:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")}BATCH - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")}BATCH - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Cart:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")}CART - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")}CART - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Bin:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("BinNotPainted")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("BinNotPainted")} - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.BinProcessed:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("BinPainted")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("BinPainted")} - {traduci("Ignored")}: {decoData.description}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.UNK:
default:
cmp_barcode.showOutput("text-danger", $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}");
resetDisplay(true);
doRaiseEv = true;
break;
NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs
+13 -13
View File
@@ -85,31 +85,31 @@ namespace NKC_WF.WebUserControls
switch (decoData.codeType)
{
case codeType.Item:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Item")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Item")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.ItemGeneric:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Sheet:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Stack:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Bunk")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Bunk")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Batch:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Batch")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Batch")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Cart:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Cart")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Cart")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Bin:
@@ -127,7 +127,7 @@ namespace NKC_WF.WebUserControls
// ora confronto cmd con ultimo valido
if (lastValidCmd != lastCmd)
{
cmp_barcode.showOutput("badge badge-success", $"{traduci("ValiBnCode")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("ValiBnCode")}: {decoData.description}");
// salvo
lastValidCmd = lastCmd;
}
@@ -141,21 +141,21 @@ namespace NKC_WF.WebUserControls
}
else
{
cmp_barcode.showOutput("badge badge-danger", $"{decoData.description} --> {traduci("NoValiAction")}");
cmp_barcode.showOutput(cssClass.danger, $"{decoData.description} --> {traduci("NoValiAction")}");
}
lbtConfirmPaint.Visible = allOk;
break;
case codeType.BinProcessed:
cmp_barcode.showOutput("text-danger", $"{traduci("BinProcessed")} - {traduci("Ignored")}: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("BinProcessed")} - {traduci("Ignored")}: {decoData.rawData} --> no action");
doRaiseEv = true;
break;
case codeType.SecScreen:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("SecScreen")} - {traduci("Ignored")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("SecScreen")} - {traduci("Ignored")}: {decoData.description}");
doRaiseEv = true;
break;
case codeType.UNK:
default:
cmp_barcode.showOutput("text-danger", $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}");
doRaiseEv = true;
break;
}
@@ -188,7 +188,7 @@ namespace NKC_WF.WebUserControls
printNewLabel(decoData);
// update tabelle!
doUpdate();
cmp_barcode.showOutput("badge badge-success", $"{traduci("PaintConfirmed")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("PaintConfirmed")}: {decoData.description}");
}
}
}
NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
+8 -8
View File
@@ -62,12 +62,12 @@ namespace NKC_WF.WebUserControls
switch (decoData.codeType)
{
case codeType.UNK:
cmp_barcode.showOutput("text-danger", traduci("UnkownData"));
cmp_barcode.showOutput(cssClass.danger, traduci("UnkownData"));
doRaiseEv = true;
break;
case codeType.Item:
case codeType.ItemGeneric:
cmp_barcode.showOutput("text-warning", $"{traduci("Part")} - {traduci("Ignored")}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Part")} - {traduci("Ignored")}");
doRaiseEv = true;
break;
case codeType.Material:
@@ -76,7 +76,7 @@ namespace NKC_WF.WebUserControls
// se tab vuota --> HO FINITO!!!!
if (nextTbl.Count == 0)
{
cmp_barcode.showOutput("badge badge-warning", $"{traduci("BunkCompleted")}, {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("BunkCompleted")}, {decoData.description}");
}
// se ho valori --> controllo se corretto...
else
@@ -84,27 +84,27 @@ namespace NKC_WF.WebUserControls
string codReq = nextTbl[0].MatExtCode.ToString();
if (codReq == decoData.codeInt.ToString())
{
cmp_barcode.showOutput("badge badge-success", $"{traduci("SheetRecorded")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("SheetRecorded")}: {decoData.description}");
// chiamo stored x indicare preparato
DLMan.taSHL.setPrepared(nextTbl[0].SheetID);
lgInfo($"cmpStackBuilding | taSHL.setPrepared | SheetID: {nextTbl[0].SheetID}");
}
else
{
cmp_barcode.showOutput("badge badge-danger", $"{traduci("WrongSheet")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("WrongSheet")}: {decoData.description}");
}
}
break;
case codeType.Sheet:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")} - {traduci("Ignored")}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")} - {traduci("Ignored")}");
doRaiseEv = true;
break;
case codeType.Stack:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Bunk")} - {traduci("Ignored")}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Bunk")} - {traduci("Ignored")}");
doRaiseEv = true;
break;
case codeType.Batch:
cmp_barcode.showOutput("badge badge-warning", $"{traduci("Batch")} - {traduci("Ignored")}");
cmp_barcode.showOutput(cssClass.warning, $"{traduci("Batch")} - {traduci("Ignored")}");
doRaiseEv = true;
break;
default:
NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs
+7 -7
View File
@@ -138,7 +138,7 @@ namespace NKC_WF.WebUserControls
{ }
if (tabStack != null && tabStack.Count == 0)
{
cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrBunkNotFound")}: {decoData.description}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrBunkNotFound")}: {decoData.description}");
doRaiseEv = true;
}
else
@@ -146,7 +146,7 @@ namespace NKC_WF.WebUserControls
// verifico non sia già in lavorazione
if (currentBunkAlreadyWorking(decoData.codeInt))
{
cmp_barcode.showOutput("badge badge-success", $"{traduci("ErrBunkInProc")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("ErrBunkInProc")}: {decoData.rawData}");
doRaiseEv = true;
}
else
@@ -157,7 +157,7 @@ namespace NKC_WF.WebUserControls
// controllo se il bunk richiesto sia stato caricato coi materiali...
if (!isBunkFilled(decoData.codeInt))
{
cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrNextBunkNotReady")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrNextBunkNotReady")}: {decoData.rawData}");
doRaiseEv = true;
}
else
@@ -165,7 +165,7 @@ namespace NKC_WF.WebUserControls
// verifico SE i BUNKS correnti siano tutti stati completati (NumSheet == NumWorking)
if (currentBunkPrinted)
{
cmp_barcode.showOutput("badge badge-success", $"{traduci("BunkOK")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"{traduci("BunkOK")}: {decoData.rawData}");
ComLib.resetCurrBunk();
ComLib.taktMLCurrBunk = decoData.codeInt.ToString();
// processo DB e salvo che lo stack è stato caricato in MACHINE LOAD
@@ -196,21 +196,21 @@ namespace NKC_WF.WebUserControls
// altrimenti segnalo NON pronto x caricare prossimo
else
{
cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrPrevBunkNotReady")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrPrevBunkNotReady")}: {decoData.rawData}");
doRaiseEv = true;
}
}
}
else
{
cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrWrongBunk")}: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrWrongBunk")}: {decoData.rawData}");
doRaiseEv = true;
}
}
}
break;
default:
cmp_barcode.showOutput("text-danger", $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}");
cmp_barcode.showOutput(cssClass.danger, $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}");
doRaiseEv = true;
break;
}
NKC_WF/WebUserControls/cmp_unloadSmart.ascx
+5 -6
View File
@@ -9,8 +9,8 @@
<div class="card text-center" style="width: 100%;">
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineUnloadSmart") %></h4>
<div class="card-body py-1">
<div class="row mt-2" style="min-height: 25rem;">
<div class="col-12 px-0">
<div class="row mt-0" style="min-height: 22rem;">
<div class="col-12 px-0 my-0">
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
<asp:HiddenField runat="server" ID="hfLastBCode" />
<asp:HiddenField runat="server" ID="hfLastValidBCode" />
@@ -18,15 +18,15 @@
<asp:HiddenField runat="server" ID="hfShowBin" />
<asp:HiddenField runat="server" ID="hfShowSecOp" />
</div>
<div class="col-12 px-0">
<div class="col-12 px-0 my-0">
<div runat="server" id="divItemDet" class="bg-success text-warning small" visible="false">
<asp:HiddenField runat="server" ID="hfItemID" />
<div class="row">
<div class="row py-1">
<div class="col-3 pr-0">
<b>
<asp:Label runat="server" ID="lblItemCode" /></b>
</div>
<div class="col-6 px-1">
<div class="col-6 px-0 text-truncate">
<asp:Label runat="server" ID="lblItemDesc" />
</div>
<div class="col-3 pl-0">
@@ -65,7 +65,6 @@
<div class="col-12 px-0">
<b>
<asp:Label runat="server" ID="lblLastBCode" /></b><br />
<asp:Label runat="server" ID="lblMessage" /><br />
<asp:Label runat="server" ID="lblDestination" />
</div>
<div class="col-12 px-0">
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+16 -19
View File
@@ -145,7 +145,6 @@ namespace NKC_WF.WebUserControls
cmp_barcode.eh_doReset += Cmp_barcode_eh_doReset;
// resetto
lblLastBCode.Text = "------";
lblMessage.Text = "----";
lblDestination.Text = "--";
}
@@ -214,54 +213,54 @@ namespace NKC_WF.WebUserControls
switch (decoData.codeType)
{
case codeType.UNK:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action");
resetSelection(false);
doRaiseEv = true;
break;
case codeType.Item:
tryPickup(decoData.rawData);
cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.ItemGeneric:
tryPickup(decoData.rawData);
cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Material - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Sheet:
cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Stack:
cmp_barcode.showOutput("badge badge-warning", $"BUNK - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.OtherItem:
cmp_barcode.showOutput("badge badge-warning", $"Generic PART - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Generic PART - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Batch:
cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}");
doRaiseEv = true;
break;
case codeType.Cart:
cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Valid CR Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.Bin:
cmp_barcode.showOutput("badge badge-success", $"Valid BN Code: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Valid BN Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.SecScreen:
cmp_barcode.showOutput("badge badge-success", $"Valid Screen Code: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Valid Screen Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
default:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action");
resetSelection(false);
break;
}
@@ -508,7 +507,6 @@ namespace NKC_WF.WebUserControls
private void resetMessages()
{
lblDestination.CssClass = "text-secondary";
lblMessage.Text = "";
lblDestination.Text = "";
lblLastBCode.Text = "";
}
@@ -631,7 +629,6 @@ namespace NKC_WF.WebUserControls
{
icnCart.Attributes.Remove("class");
icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success");
lblMessage.Text = "Item recognized";
// controllo SE HO cart
if (currCartTab.Count == 1)
{
@@ -649,7 +646,6 @@ namespace NKC_WF.WebUserControls
{
icnBin.Attributes.Remove("class");
icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary");
lblMessage.Text = "Item recognized";
if (currBinTab.Count == 1)
{
var binRow = currBinTab[0];
@@ -665,7 +661,6 @@ namespace NKC_WF.WebUserControls
{
icnSecOp.Attributes.Remove("class");
icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info");
lblMessage.Text = "Item recognized";
lblLastBCode.Text = $"DO SEC OP: {secOp}";
lblLastBCode.CssClass = "text-info";
}
@@ -704,7 +699,8 @@ namespace NKC_WF.WebUserControls
lgInfo($"cmp_unloadSmart | parkArea | Status --> 100 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}");
resetSelection(true);
showItemDetail(false, null, false);
lblMessage.Text = traduci("PartParked");
lblLastBCode.Text = traduci("PartParked");
lblLastBCode.CssClass = "text-secondary";
}
/// <summary>
/// Imposto come danneggiato/scrapped da rilavorare offline
@@ -718,7 +714,8 @@ namespace NKC_WF.WebUserControls
lgInfo($"cmp_unloadSmart | SCRAP | Status --> 990 | itemIdSelected: {itemIdSelected} | PlaceId: {PlaceId}");
resetSelection(false);
showItemDetail(false, null, false);
lblMessage.Text = traduci("PartScrapped");
lblLastBCode.Text = traduci("PartScrapped");
lblLastBCode.CssClass = "text-danger";
// riprocesso barcode...
lastCmd = lastValidCmd;
processLastCmd(false);
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs
Generated
-9
View File
@@ -230,15 +230,6 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblLastBCode;
/// <summary>
/// Controllo lblMessage.
/// </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.Label lblMessage;
/// <summary>
/// Controllo lblDestination.
/// </summary>
NKC_WF/site/GlobalSearch.aspx.cs
+11 -11
View File
@@ -76,49 +76,49 @@ namespace NKC_WF.site
switch (decoData.codeType)
{
case codeType.UNK:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action");
doShowResults = false;
break;
case codeType.Item:
cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}");
cmp_searchItems.itemDtmx = decoData.rawData;
doShowResults = true;
break;
case codeType.ItemGeneric:
cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}");
cmp_searchItems.itemDtmx = decoData.rawData;
doShowResults = true;
break;
case codeType.OtherItem:
cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}");
cmp_barcode.showOutput(cssClass.success, $"Valid Generic PART Code: {decoData.rawData}");
doShowResults = false;
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Material - ignored: {decoData.description}");
doShowResults = false;
break;
case codeType.Sheet:
cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}");
doShowResults = false;
break;
case codeType.Stack:
cmp_barcode.showOutput("badge badge-warning", $"BUNK - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}");
doShowResults = false;
break;
case codeType.Batch:
cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}");
doShowResults = false;
break;
case codeType.Cart:
cmp_barcode.showOutput("badge badge-success", $"Cart - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Cart - ignored: {decoData.description}");
doShowResults = false;
break;
case codeType.Bin:
cmp_barcode.showOutput("badge badge-success", $"Bin - ignored: {decoData.description}");
cmp_barcode.showOutput(cssClass.success, $"Bin - ignored: {decoData.description}");
doShowResults = false;
break;
default:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action");
doShowResults = false;
break;
}