Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2020-10-22 16:59:09 +02:00
3 changed files with 24 additions and 24 deletions
+19 -19
View File
@@ -11,25 +11,25 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_kitting
{
public partial class cmp_kitting
{
/// <summary>
/// Controllo cmp_kittingBin.
/// </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_kittingBin cmp_kittingBin;
/// <summary>
/// Controllo cmp_kittingBin.
/// </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_kittingBin cmp_kittingBin;
/// <summary>
/// Controllo cmp_kittingCart.
/// </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_kittingCart cmp_kittingCart;
}
/// <summary>
/// Controllo cmp_kittingCart.
/// </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_kittingCart cmp_kittingCart;
}
}
+3 -3
View File
@@ -1,10 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kittingBin.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kittingBin" %>
<div class="row">
<div class="row mx-0">
<asp:Repeater runat="server" ID="repBins" DataSourceID="ods">
<ItemTemplate>
<div class="col-2">
<div runat="server" id="divBlock" class="row small alert border-thick m-0 p-0 pb-2 alert-primary border border-primary" role="alert">
<div class="col-2 px-1">
<div runat="server" id="divBlock" class="row small alert border-thick p-0 pb-2 alert-primary border border-primary" role="alert">
<div class="col-12 bg-primary text-light pt-2">
<h5>
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>B{Eval("BinIndex")}</b> | {Eval("BinDtmxProc")}" %>' CssClass="text-uppercase" /></h5>
+2 -2
View File
@@ -1,9 +1,9 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kittingCart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kittingCart" %>
<div class="row">
<div class="row mx-0">
<asp:Repeater runat="server" ID="repCarts" DataSourceID="ods">
<ItemTemplate>
<div class="col-2">
<div class="col-2 px-1">
<div runat="server" id="divBlock" class='<%# "row small alert border-thick p-0 pb-2 border " + getCssByNums(Eval("NumPzWaiting"),Eval("NumPzBinAvail"),Eval("OtherQtyWait"),Eval("OtherQtyCur")) %>' role="alert">
<div class="col-12 bg-success text-light pt-2">
<h5>