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

pulizia procedure Bin/Cart in KSmart

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-22 17:41:28 +02:00
parent 46f54d0e02
commit e380997403
6 changed files with 9 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/WebUserControls/cmp_KS_BinCart.ascx
+7 -11
View File
@@ -3,20 +3,16 @@
<%@ Register Src="~/WebUserControls/cmp_KS_currCart.ascx" TagPrefix="uc1" TagName="cmp_KS_currCart" %>
<div class="row">
<div class="col col-lg-4">
<div class="col-6 col-lg-4">
<uc1:cmp_KS_currBin runat="server" ID="cmp_KS_currBin" />
</div>
<div class="col col-lg-4">
<div class="row">
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtAddOne" Text="1" />
</div>
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtAddAll" Text="All" />
</div>
</div>
<div class="col-6 col-lg-2">
<asp:LinkButton runat="server" ID="lbtAddOne" Text="1" />
</div>
<div class="col col-lg-4">
<div class="col-6 col-lg-2">
<asp:LinkButton runat="server" ID="lbtAddAll" Text="All" />
</div>
<div class="col-6 col-lg-4">
<uc1:cmp_KS_currCart runat="server" ID="cmp_KS_currCart" />
</div>
</div>
NKC_WF/WebUserControls/cmp_kittingSmart.ascx
-14
View File
@@ -49,20 +49,6 @@
<div class="col-12 px-0">
<uc1:cmp_KS_OkibBin runat="server" ID="cmp_KS_OkibBin" Visible="false" />
</div>
<div class="col-12 px-0">
<asp:HiddenField runat="server" ID="hfSecOp" />
<div class="row small">
<div class="col-4 pr-1">
<div runat="server" id="icnCart" class="btn btn-sm btn-block btn-outline-secondary">CART</div>
</div>
<div class="col-4 px-1">
<div runat="server" id="icnBin" class="btn btn-sm btn-block btn-outline-secondary">BIN</div>
</div>
<div class="col-4 pl-1">
<div runat="server" id="icnSecOp" class="btn btn-sm btn-block btn-outline-secondary">SEC OP</div>
</div>
</div>
</div>
<div class="col-12 px-0">
<asp:LinkButton runat="server" ID="lbtCancel" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtCancel_Click"><i class="fa fa-ban" aria-hidden="true"></i> <%: traduci("cancel") %></asp:LinkButton>
</div>
NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs
-26
View File
@@ -89,17 +89,6 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
protected string secOp
{
get
{
return hfSecOp.Value;
}
set
{
hfSecOp.Value = value;
}
}
/// <summary>
/// Aggiorna dati correnti (IP, batch, sheet...)
/// </summary>
@@ -531,8 +520,6 @@ namespace NKC_WF.WebUserControls
// verifico cosa devo mostrare come PROX passaggio...
showCart = string.IsNullOrEmpty(itemRow.ProcessesReq);
showBin = (itemRow.ProcessesReq.Contains("PaintFlag"));
secOp = itemRow.PostProcList;
showSecOp = (!string.IsNullOrEmpty(secOp));
doUpdate();
break;
case 3:
@@ -671,18 +658,10 @@ namespace NKC_WF.WebUserControls
private void doUpdate()
{
// reset grafico
icnCart.Attributes.Remove("class");
icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
icnBin.Attributes.Remove("class");
icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
icnSecOp.Attributes.Remove("class");
icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
// in base al secondo mostro uno o altro...
if (showCart)
{
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)
@@ -699,8 +678,6 @@ namespace NKC_WF.WebUserControls
}
else if (showBin)
{
icnBin.Attributes.Remove("class");
icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary");
lblMessage.Text = "Item recognized";
if (currBinTab.Count == 1)
{
@@ -715,10 +692,7 @@ namespace NKC_WF.WebUserControls
}
if (showSecOp)
{
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";
}
// fix btn reset!
NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs
Generated
-36
View File
@@ -185,42 +185,6 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_KS_OkibBin cmp_KS_OkibBin;
/// <summary>
/// Controllo hfSecOp.
/// </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 hfSecOp;
/// <summary>
/// Controllo icnCart.
/// </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.HtmlControls.HtmlGenericControl icnCart;
/// <summary>
/// Controllo icnBin.
/// </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.HtmlControls.HtmlGenericControl icnBin;
/// <summary>
/// Controllo icnSecOp.
/// </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.HtmlControls.HtmlGenericControl icnSecOp;
/// <summary>
/// Controllo lbtCancel.
/// </summary>
NKC_WF/site/KittingSmart.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="KittingSmart.aspx.cs" Inherits="NKC_WF.site.KittingSmart" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="KittingSmart.aspx.cs" Inherits="NKC_WF.site.KittingSmart" %>
<%@ Register Src="~/WebUserControls/cmp_kittingSmart.ascx" TagPrefix="uc1" TagName="cmp_kittingSmart" %>
<%@ Register Src="~/WebUserControls/cmp_kitRunning.ascx" TagPrefix="uc1" TagName="cmp_kitRunning" %>
NKC_WF/site/KittingSmart.aspx.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace NKC_WF.site
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
((SiteContent)this.Master).showSearch = false;
doUpdate();
}
cmp_kittingSmart.eh_doRefresh += cmp_kittingSmart_eh_doRefresh;