diff --git a/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs index c3ccb9b..bcd5447 100644 --- a/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs @@ -24,7 +24,7 @@ namespace NKC_WF.WebUserControls { answ = "alert-danger border-danger"; } - else if ((numReady + numOtherReady > 0) || (numOtherWait > 0)) + else if (numReady + numOtherWait > 0) { answ = "alert-warning border-warning"; } diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx index 1189f56..94fce5d 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx @@ -3,7 +3,7 @@ <%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> <%@ Register Src="~/WebUserControls/cmp_KS_BinCart.ascx" TagPrefix="uc1" TagName="cmp_KS_BinCart" %> <%@ Register Src="~/WebUserControls/cmp_KS_OtherItemsCart.ascx" TagPrefix="uc1" TagName="cmp_KS_OtherItemsCart" %> - +<%@ Register Src="~/WebUserControls/cmp_KS_Cart.ascx" TagPrefix="uc1" TagName="cmp_KS_Cart" %>
@@ -19,6 +19,9 @@
+
+ +
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 2ffaa92..69562d7 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -464,7 +464,6 @@ namespace NKC_WF.WebUserControls cmp_KS_BinCart.BinDtmx = rawData; cmp_KS_BinCart.doUpdate(); } - /// /// Imposta il cart sugli oggetti dipendenti /// @@ -478,6 +477,9 @@ namespace NKC_WF.WebUserControls cmp_KS_OtherItemsCart.CartID = codeInt; cmp_KS_OtherItemsCart.CartDtmx = rawData; cmp_KS_OtherItemsCart.doUpdate(); + cmp_KS_Cart.CartID = codeInt; + cmp_KS_Cart.CartDtmx = rawData; + cmp_KS_Cart.doUpdate(); } private void resetBin() diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs index d6ea639..8086de8 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs @@ -77,6 +77,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfLastValidBCode; + /// + /// Controllo cmp_KS_Cart. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_KS_Cart cmp_KS_Cart; + /// /// Controllo cmp_KS_BinCart. ///