From f883fb31718be1d484986bb2bf06fecdf97eab10 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 14:54:39 +0200 Subject: [PATCH 01/14] start new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 432707e..5c147cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=356']) { + withEnv(['NEXT_BUILD_NUMBER=357']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From 07da1b440348b02ad5a2a484c46055fe1278d16d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 15:25:15 +0200 Subject: [PATCH 02/14] =?UTF-8?q?Testato=20invalidate=20part=20da=20DETAIL?= =?UTF-8?q?=20IRK=20=C3=A8=20a=20posto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NKC_WF/WebUserControls/cmp_cartDetIRK.ascx | 2 +- NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx index 4652cc9..190c798 100644 --- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx @@ -38,7 +38,7 @@ - <%# traduci("Invalidate") %> + <%# traduci("Invalidate") %> diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs index c9a5c88..3dad80b 100644 --- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs @@ -60,6 +60,7 @@ namespace NKC_WF.WebUserControls // esegue la stored di reset delle PART con quel ExtCode nel cart... DLMan.taIL.invalidateByPartCart(CartID, ItemExtCode, PlaceId); } + grView.DataBind(); } } } \ No newline at end of file From 05ee608063ef29bdce7ad67c5f8b5c69b4cbfb4e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 16:27:55 +0200 Subject: [PATCH 03/14] ancora update x testare kit adv --- NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs | 6 +++- .../cmp_kittingSmartAdvInvalid.ascx.cs | 32 +++++++++++++++---- .../WebUserControls/cmp_unloadSmart.ascx.cs | 14 ++++++-- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs b/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs index d44611f..56f6499 100644 --- a/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs @@ -24,8 +24,12 @@ namespace NKC_WF.WebUserControls set { hfItemId.Value = value.ToString(); - frmView.DataBind(); } } + + public void doUpdate() + { + frmView.DataBind(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs index caabc58..df59612 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs @@ -70,7 +70,9 @@ namespace NKC_WF.WebUserControls public void resetShowData() { cmp_KS_Cart.CartID = 0; + cmp_KS_Cart.doUpdate(); cmp_ItemDet.ItemId = 0; + cmp_ItemDet.doUpdate(); lastObject = ""; ItemExtCode = ""; cmp_barcode.resetMessage(); @@ -128,6 +130,7 @@ namespace NKC_WF.WebUserControls // reset comando cmp_barcode.inputAcquired = ""; + cmp_barcode.resetInput(); // aggiorno... doUpdate(); if (doRaiseEv) @@ -172,8 +175,8 @@ namespace NKC_WF.WebUserControls /// private void processItemSuggestion(codeType tipoCod, string rawData, int codeInt) { - displError(""); - displInfo(""); + divInfo.Visible = false; + divError.Visible = false; DataLayer DLMan = new DataLayer(); // processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero) switch (tipoCod) @@ -241,9 +244,7 @@ namespace NKC_WF.WebUserControls } else { - // salvo item e ext code... - cmp_ItemDet.ItemId = codeInt; - ItemExtCode = tabItems[0].ItemExtCode; + setItem(rawData, codeInt, tabItems[0].ItemExtCode); // se PART --> il relativo modulo mostrerà reload checkPartCart(); } @@ -319,9 +320,25 @@ namespace NKC_WF.WebUserControls protected void resetSelection() { - + resetCart(); + resetItem(); } + /// + /// Imposta ITEM sugli oggetti dipendenti + /// + /// + /// + /// + private void setItem(string rawData, int codeInt, string itemExtCode) + { + + // salvo item e ext code... + cmp_ItemDet.ItemId = codeInt; + ItemExtCode = itemExtCode; + cmp_ItemDet.doUpdate(); + fixVisibility(); + } /// /// Imposta il cart sugli oggetti dipendenti /// @@ -350,6 +367,7 @@ namespace NKC_WF.WebUserControls { // reset grafico cmp_KS_Cart.Visible = cmp_KS_Cart.CartID > 0; + checkPartCart(); } protected void lbtInvalidateCart_Click(object sender, EventArgs e) @@ -370,7 +388,7 @@ namespace NKC_WF.WebUserControls } // resetto resetShowData(); - raiseReset(); + Response.Redirect(Request.RawUrl); } diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 58a5ea6..9f58ea8 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -264,7 +264,7 @@ namespace NKC_WF.WebUserControls { // salvo in item sel... updateCurrData(); - bool fatto= ComLib.saveItemPickup(SheetID, DeviceId, itemDtmx); + bool fatto = ComLib.saveItemPickup(SheetID, DeviceId, itemDtmx); lgInfo($"cmp_unloadSmart | tryPickup | item: {itemDtmx} | SheetID: {SheetID} | DeviceId: {DeviceId} | done: {fatto}"); } /// @@ -329,7 +329,15 @@ namespace NKC_WF.WebUserControls { // dichiaro che è depositato DLMan.taIL.updateStatus(itemIdSelected, 3, PlaceId); - message = $"{traduci("Part")} {itemIdSelected} {traduci("PutInCart")} {rawData}"; + int cartIndex = 0; + try + { + cartIndex = currCartTab[0].CartIndex; + + } + catch + { } + message = $"{traduci("Part")} {itemIdSelected} {traduci("PutInCart")} C{cartIndex} {rawData}"; lblDestination.Text = message; lgInfo($"cmp_unloadSmart | Status --> 3 | {message} | PlaceId: {PlaceId}"); resetSelection(false); @@ -408,7 +416,7 @@ namespace NKC_WF.WebUserControls divItemError.Visible = true; resetSelection(resetStatus); } - + /// /// Mostra o nasconde dettaglio su ITEM letto /// From 3347c026f713800e4fb49656b2e3099a9841e372 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 16:44:47 +0200 Subject: [PATCH 04/14] OK funziona invalidate PARTS on smart device!!!! --- .../cmp_kittingSmartAdvInvalid.ascx | 2 + .../cmp_kittingSmartAdvInvalid.ascx.cs | 62 ++++++++++++++----- ...mp_kittingSmartAdvInvalid.ascx.designer.cs | 18 ++++++ 3 files changed, 67 insertions(+), 15 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx index 157bd93..e27ec0e 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx @@ -8,6 +8,8 @@
+ + <%: traduci("ModePart") %> <%: traduci("ModeCart") %>
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs index df59612..a3f5e54 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs @@ -58,6 +58,42 @@ namespace NKC_WF.WebUserControls } } } + /// + /// CartID selezionato + /// + protected int CartID + { + get + { + int answ = 0; + int.TryParse(hfCartId.Value, out answ); + return answ; + } + set + { + hfCartId.Value = value.ToString(); + cmp_KS_Cart.CartID = value; + cmp_KS_Cart.doUpdate(); + } + } + /// + /// ItemID selezionato + /// + protected int ItemID + { + get + { + int answ = 0; + int.TryParse(hfItemId.Value, out answ); + return answ; + } + set + { + hfItemId.Value = value.ToString(); + cmp_ItemDet.ItemId = value; + cmp_ItemDet.doUpdate(); + } + } protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -69,10 +105,8 @@ namespace NKC_WF.WebUserControls public void resetShowData() { - cmp_KS_Cart.CartID = 0; - cmp_KS_Cart.doUpdate(); - cmp_ItemDet.ItemId = 0; - cmp_ItemDet.doUpdate(); + CartID = 0; + ItemID = 0; lastObject = ""; ItemExtCode = ""; cmp_barcode.resetMessage(); @@ -275,7 +309,7 @@ namespace NKC_WF.WebUserControls // se ho part + cart mostro button if (currMode == invalidMode.Part) { - if (cmp_ItemDet.ItemId > 0 && cmp_KS_Cart.CartID > 0) + if (ItemID > 0 && CartID > 0) { lbtInvalidatePartCart.Visible = true; lbtInvalidatePartCart.DataBind(); @@ -334,9 +368,8 @@ namespace NKC_WF.WebUserControls { // salvo item e ext code... - cmp_ItemDet.ItemId = codeInt; ItemExtCode = itemExtCode; - cmp_ItemDet.doUpdate(); + ItemID = codeInt; fixVisibility(); } /// @@ -347,33 +380,32 @@ namespace NKC_WF.WebUserControls /// private void setCart(string rawData, int codeInt, string Description) { - cmp_KS_Cart.CartID = codeInt; cmp_KS_Cart.CartDtmx = rawData; cmp_KS_Cart.CartDesc = Description; - cmp_KS_Cart.doUpdate(); + CartID = codeInt; fixVisibility(); } private void resetCart() { - cmp_KS_Cart.CartID = 0; + CartID = 0; fixVisibility(); } private void resetItem() { - cmp_ItemDet.ItemId = 0; + ItemID = 0; fixVisibility(); } private void fixVisibility() { // reset grafico - cmp_KS_Cart.Visible = cmp_KS_Cart.CartID > 0; + cmp_KS_Cart.Visible = CartID > 0; checkPartCart(); } protected void lbtInvalidateCart_Click(object sender, EventArgs e) { // esegue la stored di reset dell'intero cart... - DLMan.taIL.invalidateByCart(cmp_KS_Cart.CartID, PlaceId); + DLMan.taIL.invalidateByCart(CartID, PlaceId); // resetto resetShowData(); raiseReset(); @@ -381,10 +413,10 @@ namespace NKC_WF.WebUserControls protected void lbtInvalidatePartCart_Click(object sender, EventArgs e) { // solo se ho in sessione dati... - if (cmp_ItemDet.ItemId > 0 && cmp_KS_Cart.CartID > 0 && !string.IsNullOrEmpty(ItemExtCode)) + if (ItemID > 0 && CartID > 0 && !string.IsNullOrEmpty(ItemExtCode)) { // esegue la stored di reset delle PART con quel ExtCode nel cart... - DLMan.taIL.invalidateByPartCart(cmp_KS_Cart.CartID,ItemExtCode, PlaceId); + DLMan.taIL.invalidateByPartCart(CartID,ItemExtCode, PlaceId); } // resetto resetShowData(); diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs index 0b2e7f3..9ca5647 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs @@ -32,6 +32,24 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfMode; + /// + /// Controllo hfCartId. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfCartId; + + /// + /// Controllo hfItemId. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfItemId; + /// /// Controllo lblPart. /// From 6d24d865631099e51de46b971d2882d21e0d56a0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 17:54:59 +0200 Subject: [PATCH 05/14] OK x smart reloading KSAdv --- .../cmp_kittingSmartAdvInvalid.ascx | 26 ++--- .../cmp_kittingSmartAdvInvalid.ascx.cs | 105 ++++++++++++------ ...mp_kittingSmartAdvInvalid.ascx.designer.cs | 36 ++++-- 3 files changed, 111 insertions(+), 56 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx index e27ec0e..08be036 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx @@ -10,12 +10,14 @@ + + <%: traduci("ModePart") %> <%: traduci("ModeCart") %> + <%: traduci("ModeRevalidation") %>
- -
+
@@ -27,8 +29,7 @@
- -
+
@@ -47,18 +48,13 @@
-
-
- -
-
-
-
- -
-
+
+ +
+
+ +
-
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs index a3f5e54..a2c461f 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.cs @@ -1,7 +1,9 @@ using AppData; using NKC_SDK; +using SteamWare; using System; using System.Collections.Generic; +using System.Configuration; using System.Linq; using System.Web; using System.Web.UI; @@ -115,14 +117,14 @@ namespace NKC_WF.WebUserControls divInfo.Visible = false; fixVisibility(); } - public invalidMode currMode + public KSAdMode currMode { get { - invalidMode answ = invalidMode.ND; + KSAdMode answ = KSAdMode.ND; try { - answ = (invalidMode)Enum.Parse(typeof(invalidMode), hfMode.Value); + answ = (KSAdMode)Enum.Parse(typeof(KSAdMode), hfMode.Value); } catch { } @@ -139,17 +141,21 @@ namespace NKC_WF.WebUserControls { lblPart.Visible = false; lblCart.Visible = false; + lblRevalid.Visible = false; lbtInvalidateCart.Visible = false; lbtInvalidatePartCart.Visible = false; switch (currMode) { - case invalidMode.Part: + case KSAdMode.InvalidPart: lblPart.Visible = true; break; - case invalidMode.Cart: + case KSAdMode.InvalidCart: lblCart.Visible = true; break; - case invalidMode.ND: + case KSAdMode.RevalidPart: + lblRevalid.Visible = true; + break; + case KSAdMode.ND: default: break; } @@ -251,10 +257,7 @@ namespace NKC_WF.WebUserControls catch { } setCart(rawData, codeInt, descr); - // verifico il MODO: se CART --> mostro button x invalidare ALL - lbtInvalidateCart.Visible = (currMode == invalidMode.Cart); - lbtInvalidateCart.DataBind(); - // se PART --> il relativo modulo mostrerà reload + // verifico cosa mostrare/fare checkPartCart(); } } @@ -262,7 +265,7 @@ namespace NKC_WF.WebUserControls break; case codeType.Item: - if (currMode != invalidMode.Part) + if (currMode == KSAdMode.InvalidCart) { displError($"{traduci("KS_ADV_WrongMode")} {rawData} --> {traduci("ErrPleaseRetry")}"); resetItem(); @@ -279,7 +282,7 @@ namespace NKC_WF.WebUserControls else { setItem(rawData, codeInt, tabItems[0].ItemExtCode); - // se PART --> il relativo modulo mostrerà reload + // verifico cosa mostrare/fare checkPartCart(); } } @@ -303,25 +306,61 @@ namespace NKC_WF.WebUserControls hfItemExtCode.Value = value; } } + protected string ItemDtmx + { + get + { + return hfItemDtmx.Value; + } + set + { + hfItemDtmx.Value = value; + } + } private void checkPartCart() { - // se ho part + cart mostro button - if (currMode == invalidMode.Part) + // reset preliminare + lbtInvalidateCart.Visible = false; + lbtInvalidatePartCart.Visible = false; + switch (currMode) { - if (ItemID > 0 && CartID > 0) - { - lbtInvalidatePartCart.Visible = true; - lbtInvalidatePartCart.DataBind(); - } - else - { - lbtInvalidatePartCart.Visible = false; - } - } - else - { - lbtInvalidatePartCart.Visible = false; + case KSAdMode.InvalidCart: + // verifico il MODO: se CART --> mostro button x invalidare ALL + lbtInvalidateCart.Visible = true; + lbtInvalidateCart.DataBind(); + break; + case KSAdMode.InvalidPart: + // se SONO in modalità invalid part/cart ho part + cart mostro button + if (ItemID > 0 && CartID > 0) + { + lbtInvalidatePartCart.Visible = true; + lbtInvalidatePartCart.DataBind(); + } + else + { + lbtInvalidatePartCart.Visible = false; + } + break; + case KSAdMode.RevalidPart: + // se son in modalità revalidazione... + if (ItemID > 0 && CartID > 0) + { + // acquisisco... + DLMan.taPLog.acquireItems(ItemID, CartID, currIpAddress, user_std.UtSn.userNameAD); + lgInfo($"cmp_KittingSmartAdvInvalid | taPLog.acquireItems | ItemID : {ItemID} | CartID: {CartID} | user: {user_std.UtSn.userNameAD} | IP: {currIpAddress}"); + // resetto (solo cart) + CartID = 0; + ItemID = 0; + // mostro messaggio... + string message = $"{ItemDtmx} {traduci("Part")} {ItemExtCode} {traduci("PutInCart")} {cmp_KS_Cart.CartDtmx}"; + displInfo(message); + } + + break; + case KSAdMode.ND: + default: + break; } } @@ -369,6 +408,7 @@ namespace NKC_WF.WebUserControls // salvo item e ext code... ItemExtCode = itemExtCode; + ItemDtmx = rawData; ItemID = codeInt; fixVisibility(); } @@ -416,7 +456,7 @@ namespace NKC_WF.WebUserControls if (ItemID > 0 && CartID > 0 && !string.IsNullOrEmpty(ItemExtCode)) { // esegue la stored di reset delle PART con quel ExtCode nel cart... - DLMan.taIL.invalidateByPartCart(CartID,ItemExtCode, PlaceId); + DLMan.taIL.invalidateByPartCart(CartID, ItemExtCode, PlaceId); } // resetto resetShowData(); @@ -426,12 +466,13 @@ namespace NKC_WF.WebUserControls } /// - /// MOdalità invalid su KittingSmart + /// Modalità operativa su KittingSmartAdvanced /// - public enum invalidMode + public enum KSAdMode { ND = 0, - Part, - Cart + InvalidPart, + InvalidCart, + RevalidPart } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs index 9ca5647..f3311b9 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdvInvalid.ascx.designer.cs @@ -50,6 +50,24 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfItemId; + /// + /// Controllo hfItemExtCode. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfItemExtCode; + + /// + /// Controllo hfItemDtmx. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfItemDtmx; + /// /// Controllo lblPart. /// @@ -68,6 +86,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblCart; + /// + /// Controllo lblRevalid. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Label lblRevalid; + /// /// Controllo lbtInvalidatePartCart. /// @@ -158,15 +185,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblSuccessMsg; - /// - /// Controllo hfItemExtCode. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfItemExtCode; - /// /// Controllo cmp_ItemDet. /// From 342908cd2dc450228084f494a9b932e254aac6c1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 17:55:09 +0200 Subject: [PATCH 06/14] eliminato controllo inutilizzato --- .../cmp_kittingSmartAdvBcode.ascx | 74 -- .../cmp_kittingSmartAdvBcode.ascx.cs | 822 ------------------ .../cmp_kittingSmartAdvBcode.ascx.designer.cs | 242 ------ 3 files changed, 1138 deletions(-) delete mode 100644 NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx delete mode 100644 NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.cs delete mode 100644 NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.designer.cs diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx b/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx deleted file mode 100644 index caa9af4..0000000 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx +++ /dev/null @@ -1,74 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kittingSmartAdvBcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kittingSmartAdvBcode" %> - -<%@ 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" %> -<%@ Register Src="~/WebUserControls/cmp_KS_Items.ascx" TagPrefix="uc1" TagName="cmp_KS_Items" %> - - -
- - - -
-

<%: traduci("KittingSmartAdv") %>

-
-
-
- - - - -
-
- - - - -
-
-
- -
-
- - -
-
- -
-
- -
-
- -
-
-
-
-
- -
-
-
-
- -
-
-
-
- <%: traduci("cancel") %> -
-
- -
- -
-
- <%: traduci("ResetSel") %> -
-
-
-
-
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.cs deleted file mode 100644 index a98255f..0000000 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.cs +++ /dev/null @@ -1,822 +0,0 @@ -using AppData; -using NKC_SDK; -using SteamWare; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - - -namespace NKC_WF.WebUserControls -{ - public partial class cmp_kittingSmartAdvBcode : BaseUserControl - { - /// - /// ID univoco da IP - /// - protected string DeviceId - { - set - { - hfDeviceId.Value = value; - } - get - { - return hfDeviceId.Value; - } - } - - /// - /// Sheet selezionato... - /// - protected int SheetID - { - set - { - hfSheetID.Value = value.ToString(); - } - get - { - int answ = 0; - int.TryParse(hfSheetID.Value, out answ); - return answ; - } - } - /// - /// Aggiorna dati correnti (IP, batch, sheet...) - /// - protected void updateCurrData() - { - // FORSE 5/5?!? - DataLayer DLMan = new DataLayer(); - var sheetList = DLMan.taSHL.getByMLStatus(PackListID, 3, 5); - if (sheetList.Count > 0) - { - SheetID = sheetList[0].SheetID; - } - DeviceId = ComLib.GetIPAddress().Replace(".", "0").Replace(":", "0"); - } - /// - /// PackList corrente... - /// - public int PackListID - { - set - { - hfBatchID.Value = value.ToString(); - } - get - { - int answ = 0; - int.TryParse(hfBatchID.Value, out answ); - return answ; - } - } - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - lastObject = ""; - resetShowData(); - resetIcons(); - updateCurrData(); - } - cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; - cmp_barcode.eh_doReset += Cmp_barcode_eh_doReset; - cmp_KS_BinCart.eh_doRefresh += cmp_KS_BinCart_eh_doRefresh; - cmp_KS_OtherItemsCart.eh_doRefresh += cmp_KS_OtherItemsCart_eh_doRefresh; - cmp_KS_Items.eh_doRefresh += cmp_KS_Items_eh_doRefresh; - } - - private void cmp_KS_Items_eh_doRefresh(object sender, EventArgs e) - { - displInfo("PART added"); - // resetto BIN & CART - resetBin(); - resetCart(); - resetItem(); - } - - private void cmp_KS_OtherItemsCart_eh_doRefresh(object sender, EventArgs e) - { - displInfo("Other PART added"); - // resetto BIN & CART - resetBin(); - resetCart(); - resetItem(); - } - - private void cmp_KS_BinCart_eh_doRefresh(object sender, EventArgs e) - { - displInfo("PAINT PART added"); - // resetto BIN & CART - resetBin(); - resetCart(); - resetItem(); - } - - private void resetShowData() - { - cmp_KS_Cart.Visible = false; - cmp_KS_BinCart.Visible = false; - cmp_KS_OtherItemsCart.Visible = false; - cmp_KS_Items.Visible = false; - } - - /// - /// Comando barcode letto - /// - protected string lastCmd - { - get - { - return hfLastBCode.Value; - } - set - { - hfLastBCode.Value = value; - lastValidCmd = value; - } - } - /// - /// Ultimo object letto - /// - protected string lastObject - { - get - { - return hfLastObject.Value; - } - set - { - hfLastObject.Value = value; - } - } - /// - /// ULTIMO Comando barcode VALIDO (!="") letto - /// - protected string lastValidCmd - { - get - { - return hfLastValidBCode.Value; - } - set - { - // solo se è !="" - if (!string.IsNullOrEmpty(value)) - { - hfLastValidBCode.Value = value; - } - } - } - private void Cmp_barcode_eh_doReset(object sender, EventArgs e) - { - resetIcons(); - } - - private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e) - { - bool doRaiseEv = false; - // processo evento.. - lastCmd = cmp_barcode.inputAcquired.ToUpper(); - doRaiseEv = processLastCmd(doRaiseEv); - - // reset comando - cmp_barcode.inputAcquired = ""; - // aggiorno... - doUpdate(); - if (doRaiseEv) - { - raiseEvent(); - } - } - - private bool processLastCmd(bool doRaiseEv) - { - if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true; - // processiamo barcode letto - decodedData decoData = DLMan.decodeBcode(lastCmd); - switch (decoData.codeType) - { - case codeType.UNK: - cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); - resetSelection(); - doRaiseEv = true; - break; - case codeType.Item: - cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}"); - processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - break; - case codeType.ItemGeneric: - cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}"); - //processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - break; - case codeType.OtherItem: - 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(cssClass.warning, $"Material - ignored: {decoData.description}"); - doRaiseEv = true; - break; - case codeType.Sheet: - cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}"); - doRaiseEv = true; - break; - case codeType.Stack: - cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}"); - doRaiseEv = true; - break; - case codeType.Batch: - cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}"); - doRaiseEv = true; - break; - case codeType.Cart: - 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(cssClass.warning, $"BIN NOT PAINTED - Ignored: {decoData.description}"); - doRaiseEv = true; - break; - case codeType.BinProcessed: - cmp_barcode.showOutput(cssClass.success, $"Valid BP Code: {decoData.description}"); - processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); - break; - default: - cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); - resetSelection(); - break; - } - return doRaiseEv; - } - - /// - /// Processo il DataMatrix letto - /// - /// - /// - /// - private void processItemSuggestion(codeType tipoCod, string rawData, int codeInt) - { - DS_App.ItemListDataTable tabItem = null; - DataLayer DLMan = new DataLayer(); - divInfo.Visible = false; - // processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero) - switch (tipoCod) - { - case codeType.Cart: - // primo step: verifico dal codice CART l'ordine da cui deriva... - var tabOrdini = DLMan.taOL.getByCart(rawData); - if (tabOrdini.Count == 0) - { - displError($"{traduci("KS_PIS_CartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}"); - resetCart(); - } - else - { - var rigaOrd = tabOrdini[0]; - // ora si va sulla tab delle PackListDet x cercare ordine legato al Cart... prendo quella attiva! - var tabPLD = DLMan.taPLD.getRunByOrdExtCode(rigaOrd.OrderExtCode); - // controllo se trovo righe... - if (tabPLD.Count == 0) - { - displError($"KIT REQuest: PackList not found for Cart {rawData} --> OrdExtCode {rigaOrd.OrderExtCode}, {traduci("ErrPleaseRetry")}"); - resetCart(); - } - else - { - // mostro CART! - string descr = "-"; - try - { - descr = rigaOrd.OrderExtCode; - } - catch - { } - setCart(rawData, codeInt, descr); - // verifico se il cart sia già stato messo in scarico (in quel caso dico già ok...) - var tabLog = DLMan.taPLog.getByCartId(codeInt); - if (tabLog.Count > 0) - { - // per scrupolo sistemo la data di kitting... - DLMan.taCR.setKitStart(codeInt); - // verifico se sia completo --> reset... altrimenti lascio così... - var tabCOK = DLMan.taCOK.GetData(); - // cerco se sia "green" numWait + numReady + numOtherWait = 0 - var tabGreen = tabCOK.Where(x => (x.NumPzWaiting + x.NumPzBinAvail + x.OtherQtyWait == 0) && x.CartDtmx == rawData).ToList(); - if (tabGreen.Count > 0) - { - // verifico se sia SECONDA lettura - if (lastObject == rawData) - { - // --> metto cart in scarico e registro LOG come se avesse appena letto 1:1 ogni Dtmx - DLMan.taPLog.closeCart(codeInt); - lgInfo($"cmp_kittingSmart | taPLog.closeCart | codeInt: {codeInt} | rawData: {rawData}"); - // mostro che ho fatto - displInfo($"OK: CART removed {rawData}"); - lastObject = ""; - // resetto BIN & CART - resetBin(); - resetCart(); - } - else - { - lastObject = rawData; - displInfo($"Cart already completed, please read CART another time: Cart {rawData}"); - } - resetCart(); - } - } - else - { - // recupero da tab di check complessiva - var tabPLCheck = DLMan.taPLC.GetData(rawData); - if (tabPLCheck.Count == 0) - { - displError($"ERROR evaluating CART: {rawData}"); - resetCart(); - } - else - { - var rigaCheck = tabPLCheck[0]; - // verifico penalty (vedere stored: pezzi da leggere >= pezzi del cart...) - if (rigaCheck.NumPenalty == 0) - { - // verifico se sia SECONDA lettura - if (lastObject == rawData) - { - // --> metto cart in scarico e registro LOG come se avesse appena letto 1:1 ogni Dtmx - DLMan.taPLog.acquireCart(rawData, currIpAddress, user_std.UtSn.userNameAD); - lgInfo($"cmp_kittingSmart | taPLog.acquireCart | rawData: {rawData} | UserName: {user_std.UtSn.userNameAD} | currIpAddress: {currIpAddress}"); - displInfo($"OK: CART acquired {rawData} - item confirmed"); - lastObject = ""; - // eseguo comando x spostare i PAINT nel cart corretto... - DLMan.taKL.updateCartForBin(rawData); - lgInfo($"cmp_kittingSmart | taKL.updateCartForBin | rawData: {rawData}"); - // resetto BIN & CART - resetBin(); - resetCart(); - } - else - { - lastObject = rawData; - displError($"Please read CART another time: Cart {rawData}"); - } - } - else - { - displError($"ERROR CART contains KIT already on download: {rawData}"); - resetCart(); - } - } - } - } - } - break; - case codeType.BinProcessed: - // recupero la tab OKIB x iniziare a controllare i dati... - var tabOKIB = DLMan.taOKIB.getByBinDtmxProc(rawData); - // PRIMO: verifico SE ho delle righe valide... - if (tabOKIB.Count == 0) - { - displError($"BIN: Code not found {rawData}, {traduci("ErrPleaseRetry")}"); - // reset preliminare - resetBin(); - } - else - { - var listPainted = tabOKIB.Where(x => !x.IsPaintDateNull()).ToList(); - if (listPainted.Count == 0) - { - displError($"BIN: Paint Date missing for item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}"); - // reset preliminare - resetBin(); - } - else - { - var listAvailable = tabOKIB.Where(x => !x.IsPaintDateNull() && x.IsOnCartDateNull()).ToList(); - if (listAvailable.Count == 0) - { - displError($"BIN: No item available for pickup on target CART for code {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}"); - // reset preliminare - resetBin(); - } - else - { - // verifico SE ci sia ALMENO UN CART in postazione (iniziato KIT ma NON finito)... - var listCartAvailable = tabOKIB.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList(); - if (listCartAvailable.Count == 0) - { - displError($"BIN: No CART available to proceed: {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}"); - // reset preliminare - resetBin(); - } - else - { - // mostro BIN! - 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) - { - // verifico se sia GIA' stato completato KIT... - var listBinNotCompleted = tabOKIB.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull() && !x.IsBinKitStartNull() && x.IsBinKitEndNull()).ToList(); - if (listBinNotCompleted.Count == 0) - { - displError($"BIN: already completed: {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}"); - // reset preliminare - resetBin(); - } - } - else - { - // processing... - if (lastObject == rawData) - { - // seconda lettura x indicare in scarico - DLMan.taBN.updateKitting(codeInt, true, false); - lgInfo($"cmp_kittingSmart | taBN.updateKitting | BinID: {codeInt} | BinDtmx: {rawData} | recStart: true | recEnd: false"); - // resetto BIN & CART - resetBin(); - resetCart(); - } - else - { - // chiedo seconda lettura - lastObject = rawData; - displError($"Please read BIN another time: BIN {rawData}"); - // reset preliminare - resetBin(); - } - } - } - } - } - } - break; - case codeType.Item: - // recupero la tab ITEMS x iniziare a controllare i dati... - tabItem = DLMan.taIL.getBySearch(codeInt, rawData, 0, 999); - if (tabItem.Count == 0) - { - displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}"); - showItemDetail(false, null, true); - } - else if (tabItem.Count == 1) - { - var itemRow = tabItem[0]; - showItemDetail(true, itemRow, false); - // verifico se ITEM sia o meno stato caricato sul CART x delivery finale - if (!itemRow.IsOnCartDateNull()) - { - // se caricato --> mostro che è già a posto - displError($"{traduci("ErrPartAlreadyOnCart")} {rawData}, {traduci("ErrPleaseRetry")}"); - resetItem(); - } - else - { - // imposto controllo... - cmp_KS_Items.ItemID = codeInt; - cmp_KS_Items.NeedSecOp = !string.IsNullOrEmpty(itemRow.PostProcList); - cmp_KS_Items.NeedPaint = !string.IsNullOrEmpty(itemRow.ProcessesReq) && itemRow.ProcessesReq == "PaintFlag"; - // controllo! - cmp_KS_Items.doUpdate(); - } - } - break; - case codeType.OtherItem: - // recupero la tab OKOI x iniziare a controllare i dati... - var tabOKOI = DLMan.taOKOI.getByOtherItemDtmx(rawData); - // PRIMO: verifico SE ho delle righe valide... - if (tabOKOI.Count == 0) - { - displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}"); - // reset preliminare - resetOtherItem(); - } - else - { - var listAvailable = tabOKOI.Where(x => x.IsOnCartDateNull()).ToList(); - if (listAvailable.Count == 0) - { - displError($"{traduci("ErrPartNoItemAvail")} {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, {traduci("ErrPleaseRetry")}"); - // reset preliminare - resetOtherItem(); - } - else - { - // verifico SE ci sia ALMENO UN CART in postazione (iniziato KIT ma NON finito)... - var listCartAvailable = tabOKOI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList(); - if (listCartAvailable.Count == 0) - { - displError($"{traduci("ErrPartNoCartAvail")}: {rawData} | PART {tabOKOI[0].OtherItemExtCode} {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}"); - // reset preliminare - resetOtherItem(); - } - else - { - string descr = "-"; - try - { - descr = tabOKOI[0].OtherItemExtCode; - } - catch - { } - // mostro OtherItem! - setOtherItem(rawData, codeInt, descr); - } - } - } - break; - default: - lastObject = ""; - break; - } - } - /// - /// Imposta il codice Item sugli oggetti dipendenti - /// - /// - /// - private void setItem(string rawData, int codeInt) - { - itemIdSelected = codeInt; - cmp_KS_Items.ItemID = codeInt; - cmp_KS_Items.ItemDtmx = rawData; - cmp_KS_Items.doUpdate(); - fixVisibility(); - } - /// - /// Imposta il codice OtherItem sugli oggetti dipendenti - /// - /// - /// - /// - private void setOtherItem(string rawData, int codeInt, string Description) - { - cmp_KS_OtherItemsCart.OtherItemID = codeInt; - cmp_KS_OtherItemsCart.OtherItemDtmx = rawData; - cmp_KS_OtherItemsCart.OtherItemDesc = Description; - cmp_KS_OtherItemsCart.doUpdate(); - fixVisibility(); - } - - /// - /// Imposta il bin sugli oggetti dipendenti - /// - /// - /// - /// - 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(); - } - /// - /// Imposta il cart sugli oggetti dipendenti - /// - /// - /// - /// - private void setCart(string rawData, int codeInt, string Description) - { - cmp_KS_BinCart.CartID = codeInt; - cmp_KS_BinCart.CartDtmx = rawData; - cmp_KS_BinCart.CartDesc = Description; - cmp_KS_BinCart.doUpdate(); - cmp_KS_OtherItemsCart.CartID = codeInt; - cmp_KS_OtherItemsCart.CartDtmx = rawData; - cmp_KS_OtherItemsCart.CartDesc = Description; - cmp_KS_OtherItemsCart.doUpdate(); - cmp_KS_Cart.CartID = codeInt; - cmp_KS_Cart.CartDtmx = rawData; - cmp_KS_Cart.CartDesc = Description; - cmp_KS_Cart.doUpdate(); - cmp_KS_Items.CartID = codeInt; - cmp_KS_Items.CartDtmx = rawData; - cmp_KS_Items.CartDesc = Description; - cmp_KS_Items.doUpdate(); - fixVisibility(); - } - - private void resetBin() - { - cmp_KS_BinCart.BinID = 0; - fixVisibility(); - } - - private void resetCart() - { - cmp_KS_BinCart.CartID = 0; - cmp_KS_OtherItemsCart.CartID = 0; - cmp_KS_Cart.CartID = 0; - cmp_KS_Items.CartID = 0; - fixVisibility(); - } - private void resetOtherItem() - { - cmp_KS_OtherItemsCart.OtherItemID = 0; - fixVisibility(); - } - private void resetItem() - { - itemIdSelected = 0; - cmp_KS_Items.ItemID = 0; - fixVisibility(); - } - - /// - /// Mostra INFO ed effettua reset vari... - /// - /// - protected void displInfo(string infoMessage) - { - lblSuccessMsg.Text = infoMessage; - divError.Visible = false; - divInfo.Visible = true; - resetSelection(); - } - /// - /// Mostra ERROR ed effettua reset vari... - /// - /// - protected void displError(string errorMessage) - { - lblErrorMsg.Text = errorMessage; - divError.Visible = true; - divInfo.Visible = false; - resetSelection(); - } - /// - /// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload - /// - protected void resetSelection() - { - // elimino item sel... - itemIdSelected = 0; - resetShowData(); - bool fatto = ComLib.resetItemPickup(SheetID, DeviceId); - lgInfo($"cmp_kittingSmart | ComLib.resetItemPickup | SheetID: {SheetID} | DeviceId: {DeviceId} | done: {fatto}"); - } - /// - /// Mostra o nasconde dettaglio su ITEM letto - /// - /// - /// - /// - private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError) - { - resetShowData(); - divItemDet.Visible = showItem; - divError.Visible = showError; - if (showError) - { - displError("Item not found"); - } - if (showItem) - { - lblItemCode.Text = itemRow.ItemExtCode; - lblItemDesc.Text = itemRow.ItemDesc; - lblItemDtmx.Text = itemRow.ItemDtmx; - // cerco kit --> cart... - string cartDtmx = "-"; - try - { - var tabCart = DLMan.taCR.getByItemID(itemRow.ItemID); - if (tabCart != null && tabCart.Count > 0) - { - cartDtmx = tabCart[0].CartDtmx; - } - } - catch - { } - lblItemCartDtmx.Text = cartDtmx; - setItem(itemRow.ItemDtmx, itemRow.ItemID); - // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... - switch (itemRow.StatusID) - { - case 0: - displError(traduci("ErrPartNotReady")); - break; - case 1: - case 2: - case 100: - doUpdate(); - break; - case 3: - displError(traduci("ErrPartAlreadyOnCart")); - break; - case 4: - // fino a concorrenza qta richiesta sposto, POI do errori - displError(traduci("ErrAllPartAlreadyOnBin")); - break; - case 5: - displError(traduci("ErrPartAlreadyOnKit")); - break; - case 990: - displError(traduci("ErrPartSt990")); - break; - case 991: - displError(traduci("ErrPartSt991")); - break; - default: - displError(traduci("ErrPartStUnkn")); - break; - } - } - lbtResetSel.Visible = (itemIdSelected != 0); - } - - public int itemIdSelected - { - get - { - int answ = 0; - int.TryParse(hfItemID.Value, out answ); - return answ; - } - set - { - hfItemID.Value = value.ToString(); - bool showBtn = value != 0; - // fix visibilità - lbtCancel.Visible = showBtn; - } - } - - private void resetIcons() - { - lblDestination.CssClass = "text-secondary"; - lblDestination.Text = ""; - lblLastBCode.Text = ""; - lbtCancel.Visible = false; - lbtResetSel.Visible = (itemIdSelected != 0); - } - - protected DS_App.BinsDataTable currBinTab - { - get - { - return DLMan.taBN.getByItemID(itemIdSelected); - } - } - protected DS_App.CartsDataTable currCartTab - { - get - { - return DLMan.taCR.getByItemID(itemIdSelected); - } - } - - private void doUpdate() - { - fixVisibility(); - } - - private void fixVisibility() - { - // reset grafico - cmp_KS_Cart.Visible = cmp_KS_Cart.CartID > 0 && (cmp_KS_BinCart.BinID + cmp_KS_OtherItemsCart.OtherItemID + cmp_KS_Items.ItemID == 0); - cmp_KS_BinCart.Visible = cmp_KS_BinCart.BinID > 0; - cmp_KS_OtherItemsCart.Visible = cmp_KS_OtherItemsCart.OtherItemID > 0; - cmp_KS_Items.Visible = cmp_KS_Items.ItemID > 0; - // fix btn reset! - lbtResetSel.Visible = (itemIdSelected != 0); - } - - protected void lbtCancel_Click(object sender, EventArgs e) - { - resetSelection(); - showItemDetail(false, null, false); - } - protected void lbtResetSel_Click(object sender, EventArgs e) - { - var tabSheet = DLMan.taSHL.getByItemID(itemIdSelected); - if (tabSheet.Count == 1) - { - resetShowData(); - // resetto sheet selezionato... - DLMan.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId); - lgInfo($"cmp_kittingSmart | taIL.updateSheetStatusPU | SheetID: {tabSheet[0].SheetID} | PlaceId: {PlaceId}"); - resetSelection(); - showItemDetail(false, null, false); - } - } - - } -} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.designer.cs deleted file mode 100644 index 15b582e..0000000 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdvBcode.ascx.designer.cs +++ /dev/null @@ -1,242 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. -// -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// -//------------------------------------------------------------------------------ - -namespace NKC_WF.WebUserControls -{ - - - public partial class cmp_kittingSmartAdvBcode - { - - /// - /// Controllo hfBatchID. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfBatchID; - - /// - /// Controllo hfSheetID. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfSheetID; - - /// - /// Controllo hfDeviceId. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfDeviceId; - - /// - /// Controllo cmp_barcode. - /// - /// - /// 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_barcode cmp_barcode; - - /// - /// Controllo hfLastBCode. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfLastBCode; - - /// - /// Controllo hfLastObject. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfLastObject; - - /// - /// Controllo hfLastValidBCode. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfLastValidBCode; - - /// - /// Controllo cmp_KS_BinCart. - /// - /// - /// 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_BinCart cmp_KS_BinCart; - - /// - /// Controllo cmp_KS_OtherItemsCart. - /// - /// - /// 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_OtherItemsCart cmp_KS_OtherItemsCart; - - /// - /// 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_Items. - /// - /// - /// 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_Items cmp_KS_Items; - - /// - /// Controllo divItemDet. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divItemDet; - - /// - /// Controllo hfItemID. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfItemID; - - /// - /// Controllo lblItemCode. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblItemCode; - - /// - /// Controllo lblItemDesc. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblItemDesc; - - /// - /// Controllo lblItemDtmx. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblItemDtmx; - - /// - /// Controllo lblItemCartDtmx. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblItemCartDtmx; - - /// - /// Controllo divError. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divError; - - /// - /// Controllo lblErrorMsg. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblErrorMsg; - - /// - /// Controllo divInfo. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divInfo; - - /// - /// Controllo lblSuccessMsg. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblSuccessMsg; - - /// - /// Controllo lbtCancel. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtCancel; - - /// - /// Controllo lblLastBCode. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblLastBCode; - - /// - /// Controllo lblDestination. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblDestination; - - /// - /// Controllo lbtResetSel. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtResetSel; - } -} From b18d766f6c4c9e4d7817b1e9b04bd61e1e9f43f8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 17:55:23 +0200 Subject: [PATCH 07/14] refresh periodico stato cart --- NKC_WF/site/CartDetIRK.aspx | 7 ++++++- NKC_WF/site/CartDetIRK.aspx.cs | 5 +++++ NKC_WF/site/CartDetIRK.aspx.designer.cs | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/NKC_WF/site/CartDetIRK.aspx b/NKC_WF/site/CartDetIRK.aspx index 6614f8e..14da361 100644 --- a/NKC_WF/site/CartDetIRK.aspx +++ b/NKC_WF/site/CartDetIRK.aspx @@ -15,7 +15,12 @@
- + + + + + +
diff --git a/NKC_WF/site/CartDetIRK.aspx.cs b/NKC_WF/site/CartDetIRK.aspx.cs index a834599..f4f36bc 100644 --- a/NKC_WF/site/CartDetIRK.aspx.cs +++ b/NKC_WF/site/CartDetIRK.aspx.cs @@ -35,5 +35,10 @@ namespace NKC_WF.site // invio SINGOLO record in stampa DLMan.stampaDoc(cmp_cartDetIRK.CartID.ToString(), currQueue, tipoDocumento.docCartIRKSum, Request.UserHostName); } + + protected void timerMain_Tick(object sender, EventArgs e) + { + cmp_cartDetIRK.doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/CartDetIRK.aspx.designer.cs b/NKC_WF/site/CartDetIRK.aspx.designer.cs index c9fbee2..8256915 100644 --- a/NKC_WF/site/CartDetIRK.aspx.designer.cs +++ b/NKC_WF/site/CartDetIRK.aspx.designer.cs @@ -23,6 +23,24 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.LinkButton lbtPrint; + /// + /// Controllo upnlCartSummary. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlCartSummary; + + /// + /// Controllo timerMain. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerMain; + /// /// Controllo cmp_cartDetIRK. /// From 8bf71c5fdb6d55c3dcf3e3fdb1bbae401e5973d7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 17:56:48 +0200 Subject: [PATCH 08/14] fix gestioen kitSmartA>dv --- NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx | 4 +--- NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.cs | 14 +++++++------- .../cmp_kittingSmartAdv.ascx.designer.cs | 13 ++----------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx b/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx index b733daf..6b9a11b 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx @@ -77,9 +77,7 @@
-
-
-
+
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.cs index 57edcda..aaa5d4c 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.cs @@ -103,8 +103,7 @@ namespace NKC_WF.WebUserControls // check button visibility + status attivo divAct01.Visible = false; divAct02.Visible = false; - divAct03.Visible = false; - divAct04.Visible = false; + divActValid.Visible = false; lbtReset.Visible = false; lbtKitSusp.Visible = false; lbtKitReorder.Visible = false; @@ -126,17 +125,18 @@ namespace NKC_WF.WebUserControls break; case KitAdvMode.PartsReload: lbtReset.Visible = true; - divAct03.Visible = enableReload; + cmp_kittingSmartAdvInvalid.currMode = KSAdMode.RevalidPart; + divActValid.Visible = enableReload; break; case KitAdvMode.PartInvalidate: lbtReset.Visible = true; - cmp_kittingSmartAdvInvalid.currMode = invalidMode.Part; - divAct04.Visible = enableInvalidPart; + cmp_kittingSmartAdvInvalid.currMode = KSAdMode.InvalidPart; + divActValid.Visible = enableInvalidPart; break; case KitAdvMode.CartInvalidate: lbtReset.Visible = true; - cmp_kittingSmartAdvInvalid.currMode = invalidMode.Cart; - divAct04.Visible = enableInvalidCart; + cmp_kittingSmartAdvInvalid.currMode = KSAdMode.InvalidCart; + divActValid.Visible = enableInvalidCart; break; case KitAdvMode.NA: default: diff --git a/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.designer.cs index c3b11ee..4988f15 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmartAdv.ascx.designer.cs @@ -132,22 +132,13 @@ namespace NKC_WF.WebUserControls protected global::NKC_WF.WebUserControls.cmp_partMIA_byPLID cmp_partMIA_byPLID; /// - /// Controllo divAct03. + /// Controllo divActValid. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAct03; - - /// - /// Controllo divAct04. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAct04; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divActValid; /// /// Controllo cmp_kittingSmartAdvInvalid. From 1bf47bc3f5faeef9691d4b3c252e351996c62a81 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 17:57:06 +0200 Subject: [PATCH 09/14] refresh + pulizia codice --- NKC_WF/NKC_WF.csproj | 8 -------- NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 800e103..dd2ba92 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -466,7 +466,6 @@ - @@ -1209,13 +1208,6 @@ cmp_kittingSmartAdv.ascx - - cmp_kittingSmartAdvBcode.ascx - ASPXCodeBehind - - - cmp_kittingSmartAdvBcode.ascx - cmp_kittingSmartAdvInvalid.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs index 3dad80b..ef98b8f 100644 --- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs @@ -53,6 +53,11 @@ namespace NKC_WF.WebUserControls return answ; } + public void doUpdate() + { + grView.DataBind(); + } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) { if (!string.IsNullOrEmpty(ItemExtCode)) From 4e628c1783dbbde3ce4c6937d54d61bec0b96f95 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 17:57:21 +0200 Subject: [PATCH 10/14] relayout gfrafico itemDet --- NKC_WF/WebUserControls/cmp_ItemDet.ascx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_ItemDet.ascx b/NKC_WF/WebUserControls/cmp_ItemDet.ascx index a736e0a..f730596 100644 --- a/NKC_WF/WebUserControls/cmp_ItemDet.ascx +++ b/NKC_WF/WebUserControls/cmp_ItemDet.ascx @@ -5,15 +5,15 @@
-
+
-
- -
-
+
+
+ +
From 990f83d47a4f5df4f4fb1c01ced005a538b213b9 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 20:03:14 +0200 Subject: [PATCH 11/14] fix globale search x dettaglio CART --- NKC_WF/WebUserControls/cmp_KS_Cart.ascx | 1 + NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs | 1 + .../cmp_KS_Cart.ascx.designer.cs | 9 +++++++++ NKC_WF/site/GlobalSearch.aspx | 10 ++++++---- NKC_WF/site/GlobalSearch.aspx.cs | 2 +- NKC_WF/site/GlobalSearch.aspx.designer.cs | 18 +++++++++--------- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx index 8dff89a..e2b1939 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx @@ -6,6 +6,7 @@
+ <%: traduci("CartSummary") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs index 5843686..bd46064 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.cs @@ -27,6 +27,7 @@ namespace NKC_WF.WebUserControls set { cmp_KS_currCart.CurrId = value; + hlShowDetail.DataBind(); } } diff --git a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.designer.cs index 88e7ef4..101331e 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Cart.ascx.designer.cs @@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls /// protected global::NKC_WF.WebUserControls.cmp_KS_currCart cmp_KS_currCart; + /// + /// Controllo hlShowDetail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HyperLink hlShowDetail; + /// /// Controllo cmp_KS_OkibCart. /// diff --git a/NKC_WF/site/GlobalSearch.aspx b/NKC_WF/site/GlobalSearch.aspx index 50a2d29..20ead81 100644 --- a/NKC_WF/site/GlobalSearch.aspx +++ b/NKC_WF/site/GlobalSearch.aspx @@ -16,11 +16,13 @@ - -
-
<%: traduci("SearchDetCart") %>
- + +
+
+
<%: traduci("SearchDetCart") %>
+ +
<%: traduci("SearchDetBin") %>
diff --git a/NKC_WF/site/GlobalSearch.aspx.cs b/NKC_WF/site/GlobalSearch.aspx.cs index de16bf5..e5dde0b 100644 --- a/NKC_WF/site/GlobalSearch.aspx.cs +++ b/NKC_WF/site/GlobalSearch.aspx.cs @@ -27,7 +27,7 @@ namespace NKC_WF.site /// /// CartID selezionato /// - protected int CartID + public int CartID { get { diff --git a/NKC_WF/site/GlobalSearch.aspx.designer.cs b/NKC_WF/site/GlobalSearch.aspx.designer.cs index 1b5c1b3..15890c5 100644 --- a/NKC_WF/site/GlobalSearch.aspx.designer.cs +++ b/NKC_WF/site/GlobalSearch.aspx.designer.cs @@ -41,15 +41,6 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.HiddenField hfLastValidBCode; - /// - /// Controllo cmp_searchItems. - /// - /// - /// 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_searchItems cmp_searchItems; - /// /// Controllo hfItemID. /// @@ -59,6 +50,15 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.HiddenField hfItemID; + /// + /// Controllo cmp_searchItems. + /// + /// + /// 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_searchItems cmp_searchItems; + /// /// Controllo divCart. /// From cbc617b9bf7810e23a6f1ead3d6e81da736d5839 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 20:45:16 +0200 Subject: [PATCH 12/14] Fix CartDetailIRK in device smart (small) --- AppData/DS_App.Designer.cs | 72 ++++++++++++- AppData/DS_App.xsd | 114 +++++++++++---------- AppData/DS_App.xss | 4 +- NKC_WF/Content/Site.less | 4 + NKC_WF/Content/Site.min.css | 2 +- NKC_WF/WebUserControls/cmp_cartDetIRK.ascx | 72 ++++++++----- NKC_WF/site/CartDetIRK.aspx | 34 +++--- 7 files changed, 199 insertions(+), 103 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 67f209c..5f49b85 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -15830,6 +15830,10 @@ namespace AppData { private global::System.Data.DataColumn columnCartDtmx; + private global::System.Data.DataColumn columnCartIndex; + + private global::System.Data.DataColumn columnCartID; + private global::System.Data.DataColumn columnItemExtCode; private global::System.Data.DataColumn columnItemDesc; @@ -15893,6 +15897,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn CartIndexColumn { + get { + return this.columnCartIndex; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn CartIDColumn { + get { + return this.columnCartID; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn ItemExtCodeColumn { @@ -15986,11 +16006,13 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public CartIRKRow AddCartIRKRow(string OrderExtCode, string CartDtmx, string ItemExtCode, string ItemDesc, string ItemNote, int TotReq, int TotCur, int MatExtCode, string MatDesc) { + public CartIRKRow AddCartIRKRow(string OrderExtCode, string CartDtmx, int CartIndex, int CartID, string ItemExtCode, string ItemDesc, string ItemNote, int TotReq, int TotCur, int MatExtCode, string MatDesc) { CartIRKRow rowCartIRKRow = ((CartIRKRow)(this.NewRow())); object[] columnValuesArray = new object[] { OrderExtCode, CartDtmx, + CartIndex, + CartID, ItemExtCode, ItemDesc, ItemNote, @@ -16022,6 +16044,8 @@ namespace AppData { internal void InitVars() { this.columnOrderExtCode = base.Columns["OrderExtCode"]; this.columnCartDtmx = base.Columns["CartDtmx"]; + this.columnCartIndex = base.Columns["CartIndex"]; + this.columnCartID = base.Columns["CartID"]; this.columnItemExtCode = base.Columns["ItemExtCode"]; this.columnItemDesc = base.Columns["ItemDesc"]; this.columnItemNote = base.Columns["ItemNote"]; @@ -16038,6 +16062,10 @@ namespace AppData { base.Columns.Add(this.columnOrderExtCode); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartDtmx); + this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCartIndex); + this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCartID); this.columnItemExtCode = new global::System.Data.DataColumn("ItemExtCode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnItemExtCode); this.columnItemDesc = new global::System.Data.DataColumn("ItemDesc", typeof(string), null, global::System.Data.MappingType.Element); @@ -16054,6 +16082,7 @@ namespace AppData { base.Columns.Add(this.columnMatDesc); this.columnOrderExtCode.MaxLength = 250; this.columnCartDtmx.MaxLength = 10; + this.columnCartID.AllowDBNull = false; this.columnItemExtCode.AllowDBNull = false; this.columnItemExtCode.MaxLength = 250; this.columnItemDesc.AllowDBNull = false; @@ -23298,6 +23327,33 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int CartIndex { + get { + try { + return ((int)(this[this.tableCartIRK.CartIndexColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'CartIndex\' nella tabella \'CartIRK\' è DBNull.", e); + } + } + set { + this[this.tableCartIRK.CartIndexColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int CartID { + get { + return ((int)(this[this.tableCartIRK.CartIDColumn])); + } + set { + this[this.tableCartIRK.CartIDColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string ItemExtCode { @@ -23409,6 +23465,18 @@ namespace AppData { this[this.tableCartIRK.CartDtmxColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsCartIndexNull() { + return this.IsNull(this.tableCartIRK.CartIndexColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetCartIndexNull() { + this[this.tableCartIRK.CartIndexColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsTotReqNull() { @@ -37459,6 +37527,8 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.DataSetTable = "CartIRK"; tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); + tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); + tableMapping.ColumnMappings.Add("CartID", "CartID"); tableMapping.ColumnMappings.Add("ItemExtCode", "ItemExtCode"); tableMapping.ColumnMappings.Add("ItemDesc", "ItemDesc"); tableMapping.ColumnMappings.Add("ItemNote", "ItemNote"); diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index a686cb5..f577a08 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -1024,7 +1024,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_invalidateByCart @@ -1036,7 +1036,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_invalidateByPartCart @@ -1049,7 +1049,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateCadPath @@ -1062,7 +1062,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateFromNesting @@ -1077,7 +1077,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateSheetStatus @@ -1090,7 +1090,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateSheetStatusPU @@ -1102,7 +1102,7 @@ SELECT ItemID, StatusID, KitID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, ItemQ - + dbo.stp_IL_updateStatus @@ -3127,6 +3127,8 @@ FROM v_Pack2Cart + + @@ -3145,7 +3147,7 @@ FROM v_Pack2Cart - + @@ -3195,7 +3197,7 @@ FROM v_Pack2Cart - + @@ -3220,7 +3222,7 @@ FROM v_Pack2Cart - + @@ -3275,7 +3277,7 @@ FROM v_Pack2Cart - + @@ -3348,7 +3350,7 @@ FROM v_Pack2Cart - + @@ -3356,7 +3358,7 @@ FROM v_Pack2Cart - + @@ -3425,7 +3427,7 @@ FROM v_Pack2Cart - + @@ -3458,7 +3460,7 @@ FROM v_Pack2Cart - + @@ -3499,7 +3501,7 @@ FROM v_Pack2Cart - + @@ -3518,7 +3520,7 @@ FROM v_Pack2Cart - + @@ -3549,7 +3551,7 @@ FROM v_Pack2Cart - + @@ -3557,7 +3559,7 @@ FROM v_Pack2Cart - + @@ -3574,7 +3576,7 @@ FROM v_Pack2Cart - + @@ -3583,7 +3585,7 @@ FROM v_Pack2Cart - + @@ -3614,7 +3616,7 @@ FROM v_Pack2Cart - + @@ -3622,7 +3624,7 @@ FROM v_Pack2Cart - + @@ -3638,7 +3640,7 @@ FROM v_Pack2Cart - + @@ -3646,7 +3648,7 @@ FROM v_Pack2Cart - + @@ -3674,7 +3676,7 @@ FROM v_Pack2Cart - + @@ -3710,7 +3712,7 @@ FROM v_Pack2Cart - + @@ -3726,7 +3728,7 @@ FROM v_Pack2Cart - + @@ -3736,7 +3738,7 @@ FROM v_Pack2Cart - + @@ -3753,7 +3755,7 @@ FROM v_Pack2Cart - + @@ -3766,7 +3768,7 @@ FROM v_Pack2Cart - + @@ -3815,7 +3817,7 @@ FROM v_Pack2Cart - + @@ -3844,7 +3846,7 @@ FROM v_Pack2Cart - + @@ -3886,7 +3888,7 @@ FROM v_Pack2Cart - + @@ -3996,7 +3998,7 @@ FROM v_Pack2Cart - + @@ -4059,7 +4061,7 @@ FROM v_Pack2Cart - + @@ -4104,7 +4106,7 @@ FROM v_Pack2Cart - + @@ -4130,7 +4132,7 @@ FROM v_Pack2Cart - + @@ -4223,7 +4225,7 @@ FROM v_Pack2Cart - + @@ -4286,7 +4288,7 @@ FROM v_Pack2Cart - + @@ -4345,7 +4347,7 @@ FROM v_Pack2Cart - + @@ -4394,7 +4396,7 @@ FROM v_Pack2Cart - + @@ -4426,7 +4428,7 @@ FROM v_Pack2Cart - + @@ -4443,6 +4445,8 @@ FROM v_Pack2Cart + + @@ -4618,18 +4622,18 @@ FROM v_Pack2Cart - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index d52a90c..1101821 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -41,7 +41,7 @@ - + diff --git a/NKC_WF/Content/Site.less b/NKC_WF/Content/Site.less index 2bfa016..3d7b304 100644 --- a/NKC_WF/Content/Site.less +++ b/NKC_WF/Content/Site.less @@ -52,6 +52,10 @@ body { font-family: 'Roboto Condensed', sans-serif; font-size: 0.9rem; } + .smallTable { + font-size: 0.7rem; + font-family: 'Open Sans Condensed', sans-serif; + } } @borderThick: 3px; diff --git a/NKC_WF/Content/Site.min.css b/NKC_WF/Content/Site.min.css index 72f35b2..6af8dea 100644 --- a/NKC_WF/Content/Site.min.css +++ b/NKC_WF/Content/Site.min.css @@ -1 +1 @@ -body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}body{font-family:'Roboto Condensed',sans-serif;font-size:.9rem;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}} \ No newline at end of file +body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}body{font-family:'Roboto Condensed',sans-serif;font-size:.9rem;}.smallTable{font-size:.7rem;font-family:'Open Sans Condensed',sans-serif;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx index 190c798..0596b62 100644 --- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx @@ -7,11 +7,12 @@
-
- order: +
+ order: +
-
- cart: +
+ <%# Eval("CartIndex","C{0}") %> <%# Eval("CartDtmx") %>
@@ -24,28 +25,43 @@ +
+ + + + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + + + + + + + - - - <%-- - --%> - - - <%----%> - - - - - - - <%# traduci("Invalidate") %> - - - - - - - - - - + + + + + + +
diff --git a/NKC_WF/site/CartDetIRK.aspx b/NKC_WF/site/CartDetIRK.aspx index 14da361..eac7f67 100644 --- a/NKC_WF/site/CartDetIRK.aspx +++ b/NKC_WF/site/CartDetIRK.aspx @@ -3,24 +3,26 @@ <%@ Register Src="~/WebUserControls/cmp_cartDetIRK.ascx" TagPrefix="uc1" TagName="cmp_cartDetIRK" %> -
-
-
-
-

<%: traduci("CartSummary") %>

-
-
- <%: traduci("Print") %> +
+
+
+
+
+

<%: traduci("CartSummary") %>

+
+
+ <%: traduci("Print") %> +
-
-
- - - - - - +
+ + + + + + +
From 516baaa1a8303fa1a8556cef5dfa97a45f7ae719 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 21:04:43 +0200 Subject: [PATCH 13/14] Fix dati mancanti su CartDetailIRK --- AppData/DS_App.Designer.cs | 61 +++++++++++++++++-- AppData/DS_App.xsd | 19 ++++++ AppData/DS_App.xss | 4 +- NKC_WF/WebUserControls/cmp_cartDetIRK.ascx | 19 ++++-- NKC_WF/WebUserControls/cmp_kitReqRunning.ascx | 2 +- NKC_WF/WebUserControls/cmp_kitReqSched.ascx | 3 +- 6 files changed, 92 insertions(+), 16 deletions(-) diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 5f49b85..4b1a990 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -15463,6 +15463,8 @@ namespace AppData { private global::System.Data.DataColumn columnCartID; + private global::System.Data.DataColumn columnBatchName; + private global::System.Data.DataColumn columnCartIndex; private global::System.Data.DataColumn columnCartDtmx; @@ -15524,6 +15526,14 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn BatchNameColumn { + get { + return this.columnBatchName; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn CartIndexColumn { @@ -15609,11 +15619,12 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) { + public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, string BatchName, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) { Pack2CartRow rowPack2CartRow = ((Pack2CartRow)(this.NewRow())); object[] columnValuesArray = new object[] { PackListID, CartID, + BatchName, CartIndex, CartDtmx, OrderExtCode, @@ -15652,6 +15663,7 @@ namespace AppData { internal void InitVars() { this.columnPackListID = base.Columns["PackListID"]; this.columnCartID = base.Columns["CartID"]; + this.columnBatchName = base.Columns["BatchName"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartDtmx = base.Columns["CartDtmx"]; this.columnOrderExtCode = base.Columns["OrderExtCode"]; @@ -15667,6 +15679,8 @@ namespace AppData { base.Columns.Add(this.columnPackListID); this.columnCartID = new global::System.Data.DataColumn("CartID", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartID); + this.columnBatchName = new global::System.Data.DataColumn("BatchName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnBatchName); this.columnCartIndex = new global::System.Data.DataColumn("CartIndex", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartIndex); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); @@ -15684,6 +15698,8 @@ namespace AppData { this.columnPackListID}, true)); this.columnPackListID.AllowDBNull = false; this.columnCartID.AllowDBNull = false; + this.columnBatchName.AllowDBNull = false; + this.columnBatchName.MaxLength = 50; this.columnCartIndex.AllowDBNull = false; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; @@ -23163,6 +23179,17 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string BatchName { + get { + return ((string)(this[this.tablePack2Cart.BatchNameColumn])); + } + set { + this[this.tablePack2Cart.BatchNameColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int CartIndex { @@ -37330,6 +37357,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.DataSetTable = "Pack2Cart"; tableMapping.ColumnMappings.Add("PackListID", "PackListID"); tableMapping.ColumnMappings.Add("CartID", "CartID"); + tableMapping.ColumnMappings.Add("BatchName", "BatchName"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); @@ -37349,17 +37377,23 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_Pack2Cart"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_P2C_getByPackListId"; + this._commandCollection[1].CommandText = "dbo.stp_P2C_getByCartId"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PackListID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_P2C_getByPackListId"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PackListID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -37390,8 +37424,25 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_App.Pack2CartDataTable getByPackListId(global::System.Nullable PackListID) { + public virtual DS_App.Pack2CartDataTable getByCartId(global::System.Nullable CartID) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((CartID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.Pack2CartDataTable dataTable = new DS_App.Pack2CartDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_App.Pack2CartDataTable getByPackListId(global::System.Nullable PackListID) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((PackListID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(PackListID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index f577a08..04d5ba4 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3089,6 +3089,7 @@ FROM v_Pack2Cart + @@ -3097,6 +3098,17 @@ FROM v_Pack2Cart + + + + dbo.stp_P2C_getByCartId + + + + + + + @@ -4401,6 +4413,13 @@ FROM v_Pack2Cart + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 1101821..8010df8 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -40,7 +40,7 @@ - + diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx index 0596b62..f2455d1 100644 --- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx @@ -7,19 +7,26 @@
-
- order: - +
+ req date: +
-
- <%# Eval("CartIndex","C{0}") %> <%# Eval("CartDtmx") %> +
+ model: +
+
+ order: + +
+
+ cart: <%# Eval("CartIndex","C{0}") %> <%# Eval("CartDtmx") %>
- + diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx index 639ce21..ca1be4f 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx @@ -39,7 +39,7 @@ <%----%> - + <%----%> diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx index 0134a6e..7b30c51 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx @@ -47,9 +47,8 @@ - + - <%----%> From 770e77469a4f5c725dd2669a9869ea23698f3374 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 26 Aug 2020 21:13:56 +0200 Subject: [PATCH 14/14] Del search box nelle pagine che non necessitano --- NKC_WF/site/About.aspx.cs | 4 ++++ NKC_WF/site/BatchPreview.aspx.cs | 1 + NKC_WF/site/KitRequestSched.aspx.cs | 1 + NKC_WF/site/MachineOffline.aspx.cs | 4 ++++ NKC_WF/site/OrderScheduler.aspx.cs | 1 + NKC_WF/site/OtherItems.aspx.cs | 5 ++++- NKC_WF/site/PartMIA.aspx | 2 -- NKC_WF/site/PartMIA.aspx.cs | 1 - 8 files changed, 15 insertions(+), 4 deletions(-) diff --git a/NKC_WF/site/About.aspx.cs b/NKC_WF/site/About.aspx.cs index 09721a4..9e8a6b6 100644 --- a/NKC_WF/site/About.aspx.cs +++ b/NKC_WF/site/About.aspx.cs @@ -8,6 +8,10 @@ namespace NKC_WF protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = false; + } } } } \ No newline at end of file diff --git a/NKC_WF/site/BatchPreview.aspx.cs b/NKC_WF/site/BatchPreview.aspx.cs index 5808616..dc2044a 100644 --- a/NKC_WF/site/BatchPreview.aspx.cs +++ b/NKC_WF/site/BatchPreview.aspx.cs @@ -179,6 +179,7 @@ namespace NKC_WF.site { if (!Page.IsPostBack) { + ((SiteMaster)this.Master).showSearch = false; tabSheetKey = $"{memLayer.ML.redHash($"TabSheets")}:{BatchId}"; // imposto bunk! cmp_BP_bunkList.BatchId = BatchId; diff --git a/NKC_WF/site/KitRequestSched.aspx.cs b/NKC_WF/site/KitRequestSched.aspx.cs index f1779b6..bd66450 100644 --- a/NKC_WF/site/KitRequestSched.aspx.cs +++ b/NKC_WF/site/KitRequestSched.aspx.cs @@ -6,6 +6,7 @@ namespace NKC_WF.site { protected void Page_Load(object sender, EventArgs e) { + ((SiteMaster)this.Master).showSearch = false; cmp_kitReqSched.eh_doRefresh += cmp_kitReqSched_eh_doRefresh; cmp_kitReqRunning.eh_doRefresh += cmp_kitReqRunning_eh_doRefresh; } diff --git a/NKC_WF/site/MachineOffline.aspx.cs b/NKC_WF/site/MachineOffline.aspx.cs index 96a465f..38ba26f 100644 --- a/NKC_WF/site/MachineOffline.aspx.cs +++ b/NKC_WF/site/MachineOffline.aspx.cs @@ -7,6 +7,10 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { + if(!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = false; + } cmp_scrapList.eh_doRefresh += Cmp_scrapList_eh_doRefresh; cmp_offlineOrders.eh_doReset += cmp_offlineOrders_eh_doReset; } diff --git a/NKC_WF/site/OrderScheduler.aspx.cs b/NKC_WF/site/OrderScheduler.aspx.cs index c24477a..af11e71 100644 --- a/NKC_WF/site/OrderScheduler.aspx.cs +++ b/NKC_WF/site/OrderScheduler.aspx.cs @@ -8,6 +8,7 @@ namespace NKC_WF.site { if(!Page.IsPostBack) { + ((SiteMaster)this.Master).showSearch = false; cmp_orderPrintRun.Visible = false; cmp_orderPrintSch.Visible = false; } diff --git a/NKC_WF/site/OtherItems.aspx.cs b/NKC_WF/site/OtherItems.aspx.cs index 4531d1b..7fe2c6a 100644 --- a/NKC_WF/site/OtherItems.aspx.cs +++ b/NKC_WF/site/OtherItems.aspx.cs @@ -11,7 +11,10 @@ namespace NKC_WF.site { protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + ((SiteContent)this.Master).showSearch = false; + } } } } \ No newline at end of file diff --git a/NKC_WF/site/PartMIA.aspx b/NKC_WF/site/PartMIA.aspx index 09eecb9..8125693 100644 --- a/NKC_WF/site/PartMIA.aspx +++ b/NKC_WF/site/PartMIA.aspx @@ -4,8 +4,6 @@ <%@ Register Src="~/WebUserControls/cmp_partMIA_byPLID.ascx" TagPrefix="uc1" TagName="cmp_partMIA_byPLID" %> <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> - -
diff --git a/NKC_WF/site/PartMIA.aspx.cs b/NKC_WF/site/PartMIA.aspx.cs index 6a4f32a..79de5d3 100644 --- a/NKC_WF/site/PartMIA.aspx.cs +++ b/NKC_WF/site/PartMIA.aspx.cs @@ -32,7 +32,6 @@ namespace NKC_WF.site protected string machine = "WRK001"; protected void Page_Load(object sender, EventArgs e) { - if (!Page.IsPostBack) { ((SiteMaster)this.Master).showSearch = false;