From c10e31f37b2cf8d128a436af8282652512e7776b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 11 Aug 2020 11:47:30 +0200 Subject: [PATCH 1/5] start new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index af0b0e2..c6549c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=318']) { + withEnv(['NEXT_BUILD_NUMBER=319']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From cbecb539e8050a084fb1414c99fd19baa97dd215 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 11 Aug 2020 11:58:32 +0200 Subject: [PATCH 2/5] traduzione codice cs x errori + inizio gest ITEMS scrap on KIT --- .../WebUserControls/cmp_kittingSmart.ascx.cs | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 31a06d7..a4493bc 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -266,7 +266,7 @@ namespace NKC_WF.WebUserControls var tabOrdini = DataLayer.man.taOL.getByCart(rawData); if (tabOrdini.Count == 0) { - displError($"CART: Order not found for Cart {rawData}, please retry", true); + displError($"CART: Order not found for Cart {rawData}, {traduci("ErrPleaseRetry")}", true); resetCart(); } else @@ -277,7 +277,7 @@ namespace NKC_WF.WebUserControls // controllo se trovo righe... if (tabPLD.Count == 0) { - displError($"KIT REQuest: PackList not found for Cart {rawData} --> OrdExtCode {rigaOrd.OrderExtCode}, please retry", true); + displError($"KIT REQuest: PackList not found for Cart {rawData} --> OrdExtCode {rigaOrd.OrderExtCode}, {traduci("ErrPleaseRetry")}", true); resetCart(); } else @@ -365,7 +365,7 @@ namespace NKC_WF.WebUserControls // PRIMO: verifico SE ho delle righe valide... if (tabOKIB.Count == 0) { - displError($"BIN: Code not found {rawData}, please retry", true); + displError($"BIN: Code not found {rawData}, {traduci("ErrPleaseRetry")}", true); // reset preliminare resetBin(); } @@ -374,7 +374,7 @@ namespace NKC_WF.WebUserControls 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}, please retry", true); + displError($"BIN: Paint Date missing for item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}", true); // reset preliminare resetBin(); } @@ -383,7 +383,7 @@ namespace NKC_WF.WebUserControls 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}, please retry", true); + displError($"BIN: No item available for pickup on target CART for code {rawData} | item {tabOKIB[0].ItemDesc} | order {tabOKIB[0].OrderExtCode}, {traduci("ErrPleaseRetry")}", true); // reset preliminare resetBin(); } @@ -446,25 +446,31 @@ namespace NKC_WF.WebUserControls tabItem = DataLayer.man.taIL.getBySearch(codeInt, rawData, 0, 999); if (tabItem.Count == 0) { - displError($"PART: Code not found {rawData}, please retry", true); + displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}", true); showItemDetail(false, null, true); } else if (tabItem.Count == 1) { - showItemDetail(true, tabItem[0], false); + var itemRow = tabItem[0]; + showItemDetail(true, itemRow, false); // verifico se ITEM sia o meno stato caricato sul CART x delivery finale - - // se caricato --> mostro che è già a posto - - // se non caricato --> controllo SecOp + if (!itemRow.IsOnCartDateNull()) + { + // se caricato --> mostro che è già a posto + displError($"{traduci("ErrPartAlreadyOnCart")} {rawData}, {traduci("ErrPleaseRetry")}", true); + } + else + { + // se non caricato --> controllo SecOp - // se non caricato --> controllo PAINT + // se non caricato --> controllo PAINT - // gestione doppia lettura x conferma OnCart + // gestione doppia lettura x conferma OnCart - // salvataggio di OnCartDate + // salvataggio di OnCartDate + } } @@ -476,7 +482,7 @@ namespace NKC_WF.WebUserControls // PRIMO: verifico SE ho delle righe valide... if (tabOKOI.Count == 0) { - displError($"PART: Code not found {rawData}, please retry", true); + displError($"{traduci("ErrPartNotFound")} {rawData}, {traduci("ErrPleaseRetry")}", true); // reset preliminare resetOtherItem(); } @@ -485,7 +491,7 @@ namespace NKC_WF.WebUserControls var listAvailable = tabOKOI.Where(x => x.IsOnCartDateNull()).ToList(); if (listAvailable.Count == 0) { - displError($"PART: No item available for pickup on target CART for code {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, please retry", true); + displError($"{traduci("ErrPartNoItemAvail")} {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, {traduci("ErrPleaseRetry")}", true); // reset preliminare resetOtherItem(); } @@ -495,7 +501,7 @@ namespace NKC_WF.WebUserControls var listCartAvailable = tabOKOI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList(); if (listCartAvailable.Count == 0) { - displError($"PART: No CART available to proceed: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}", true); + displError($"{traduci("ErrPartNoCartAvail")}: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}", true); // reset preliminare resetOtherItem(); } From ba6a96a9b8786fae7c30cf6d02553f32f7071d0f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 11 Aug 2020 13:04:20 +0200 Subject: [PATCH 3/5] Ancora modifiche gestione KIT smart (NON complete) --- NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_kittingSmart.ascx | 19 +++++- .../WebUserControls/cmp_kittingSmart.ascx.cs | 61 ++++++++++++++++--- .../cmp_kittingSmart.ascx.designer.cs | 54 ++++++++++++++++ 4 files changed, 125 insertions(+), 11 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs index 8e68db6..7f8c3ba 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_kittingBin : System.Web.UI.UserControl + public partial class cmp_kittingBin : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx index 80b59c2..6ec42ea 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx @@ -20,13 +20,14 @@
- - - + + +
+
@@ -39,6 +40,18 @@
+
+
+ <%: traduci("ItemNeedsSecOp") %> + <%: traduci("ItemNeedsPaint") %> +
+
+ <%: traduci("ConfirmItemKitOk") %> +
+
+ <%: traduci("CancelItemKitOk") %> +
+
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index a4493bc..5638dbf 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -458,16 +458,14 @@ namespace NKC_WF.WebUserControls { // se caricato --> mostro che è già a posto displError($"{traduci("ErrPartAlreadyOnCart")} {rawData}, {traduci("ErrPleaseRetry")}", true); + resetItem(); } else { - // se non caricato --> controllo SecOp - - - // se non caricato --> controllo PAINT - - // gestione doppia lettura x conferma OnCart - + bool needSecOp = !string.IsNullOrEmpty(itemRow.PostProcList); + bool needPaint = !string.IsNullOrEmpty(itemRow.ProcessesReq) && itemRow.ProcessesReq== "PaintFlag"; + // se non già valido mostro buttons conferma... + checkItemValidated(needSecOp, needPaint); // salvataggio di OnCartDate } @@ -521,6 +519,25 @@ namespace NKC_WF.WebUserControls } + /// + /// Veriofico item sia valido... + /// + /// + /// + private void checkItemValidated(bool needSecOp, bool needPaint) + { + bool showConfirmItem = false; + // se NON è già validato... + if(!itemValid) + { + showConfirmItem = needPaint || needSecOp; + } + divItemValid.Visible = showConfirmItem; + // moastro messaggi errore secondo caso + lblNeedSecOp.Visible = needSecOp; + lblNeedPaint.Visible = needPaint; + } + /// /// Imposta il codice OtherItem sugli oggetti dipendenti /// @@ -583,6 +600,12 @@ namespace NKC_WF.WebUserControls cmp_KS_OtherItemsCart.OtherItemID = 0; fixVisibility(); } + private void resetItem() + { + itemIdSelected = 0; + itemValid = false; + fixVisibility(); + } /// /// Mostra INFO ed effettua reset vari... @@ -631,6 +654,7 @@ namespace NKC_WF.WebUserControls } // elimino item sel... itemIdSelected = 0; + itemValid = false; resetShowData(); ComLib.resetItemPickup(SheetID, DeviceId); } @@ -708,6 +732,19 @@ namespace NKC_WF.WebUserControls lbtCancel.Visible = showBtn; } } + protected bool itemValid + { + get + { + bool answ = false; + bool.TryParse(hfItemValid.Value, out answ); + return answ; + } + set + { + hfItemValid.Value = value.ToString(); + } + } private void resetIcons() { @@ -769,5 +806,15 @@ namespace NKC_WF.WebUserControls showItemDetail(false, null, false); } } + + protected void lbtConfItemValid_Click(object sender, EventArgs e) + { + itemValid = true; + } + + protected void lbtCancelItemValid_Click(object sender, EventArgs e) + { + itemValid = false; + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs index 70265cf..925559a 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs @@ -122,6 +122,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfItemID; + /// + /// Controllo hfItemValid. + /// + /// + /// 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 hfItemValid; + /// /// Controllo lblItemCode. /// @@ -149,6 +158,51 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblItemDtmx; + /// + /// Controllo divItemValid. + /// + /// + /// 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 divItemValid; + + /// + /// Controllo lblNeedSecOp. + /// + /// + /// 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 lblNeedSecOp; + + /// + /// Controllo lblNeedPaint. + /// + /// + /// 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 lblNeedPaint; + + /// + /// Controllo lbtConfItemValid. + /// + /// + /// 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 lbtConfItemValid; + + /// + /// Controllo lbtCancelItemValid. + /// + /// + /// 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 lbtCancelItemValid; + /// /// Controllo divError. /// From af10328a3cdfd802a8e7b73c174b4257434d449a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 11 Aug 2020 13:22:58 +0200 Subject: [PATCH 4/5] Modifiche x gestione NUOVO componente x KS ed ITEM --- NKC_WF/NKC_WF.csproj | 8 + NKC_WF/WebUserControls/cmp_KS_Items.ascx | 20 +++ NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs | 137 ++++++++++++++++++ .../cmp_KS_Items.ascx.designer.cs | 116 +++++++++++++++ NKC_WF/WebUserControls/cmp_kittingSmart.ascx | 16 +- .../WebUserControls/cmp_kittingSmart.ascx.cs | 68 ++------- .../cmp_kittingSmart.ascx.designer.cs | 49 +------ 7 files changed, 301 insertions(+), 113 deletions(-) create mode 100644 NKC_WF/WebUserControls/cmp_KS_Items.ascx create mode 100644 NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e29fd86..e0d6297 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -454,6 +454,7 @@ + @@ -1120,6 +1121,13 @@ cmp_KS_currOI.ascx + + cmp_KS_Items.ascx + ASPXCodeBehind + + + cmp_KS_Items.ascx + cmp_KS_OkibBin.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx b/NKC_WF/WebUserControls/cmp_KS_Items.ascx new file mode 100644 index 0000000..099e924 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx @@ -0,0 +1,20 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_Items.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_Items" %> + + + + + + + +
+
+ <%: traduci("ItemNeedsSecOp") %> + <%: traduci("ItemNeedsPaint") %> +
+
+ <%: traduci("ConfirmItemKitOk") %> +
+
+ <%: traduci("CancelItemKitOk") %> +
+
diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs new file mode 100644 index 0000000..6eedb5a --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs @@ -0,0 +1,137 @@ +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_KS_Items : BaseUserControl + { + /// + /// Cart selezionato + /// + public int CartID + { + get + { + int answ = 0; + int.TryParse(hfCartID.Value, out answ); + return answ; + } + set + { + hfCartID.Value = value.ToString(); + } + } + /// + /// Matrix Bin selezionato + /// + public string CartDtmx + { + get + { + return hdCartDtmx.Value; + } + set + { + hdCartDtmx.Value = value; + } + } + public int ItemID + { + get + { + int answ = 0; + int.TryParse(hfItemID.Value, out answ); + return answ; + } + set + { + hfItemID.Value = value.ToString(); + // se 0 --> annullo validità + if(value == 0) + { + ItemValid = false; + } + } + } + protected bool ItemValid + { + get + { + bool answ = false; + bool.TryParse(hfItemValid.Value, out answ); + return answ; + } + set + { + hfItemValid.Value = value.ToString(); + } + } + public bool NeedSecOp + { + get + { + bool answ = false; + bool.TryParse(hfNeedSecOp.Value, out answ); + return answ; + } + set + { + hfNeedSecOp.Value = value.ToString(); + } + } + public bool NeedPaint + { + get + { + bool answ = false; + bool.TryParse(hfNeedPaint.Value, out answ); + return answ; + } + set + { + hfNeedPaint.Value = value.ToString(); + } + } + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Veriofico item sia valido... + /// + private void checkItemValidated() + { + bool showConfirmItem = false; + // se NON è già validato... + if (!ItemValid) + { + showConfirmItem = NeedPaint || NeedSecOp; + } + divItemValid.Visible = showConfirmItem; + // moastro messaggi errore secondo caso + lblNeedSecOp.Visible = NeedSecOp; + lblNeedPaint.Visible = NeedPaint; + } + + public void doUpdate() + { + // effettua controlli vari + + checkItemValidated(); + } + + protected void lbtConfItemValid_Click(object sender, EventArgs e) + { + ItemValid = true; + } + + protected void lbtCancelItemValid_Click(object sender, EventArgs e) + { + ItemValid = false; + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs new file mode 100644 index 0000000..c5310d3 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs @@ -0,0 +1,116 @@ +//------------------------------------------------------------------------------ +// +// 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_KS_Items + { + + /// + /// 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 hdCartDtmx. + /// + /// + /// 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 hdCartDtmx; + + /// + /// 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 hfNeedSecOp. + /// + /// + /// 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 hfNeedSecOp; + + /// + /// Controllo hfNeedPaint. + /// + /// + /// 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 hfNeedPaint; + + /// + /// Controllo hfItemValid. + /// + /// + /// 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 hfItemValid; + + /// + /// Controllo divItemValid. + /// + /// + /// 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 divItemValid; + + /// + /// Controllo lblNeedSecOp. + /// + /// + /// 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 lblNeedSecOp; + + /// + /// Controllo lblNeedPaint. + /// + /// + /// 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 lblNeedPaint; + + /// + /// Controllo lbtConfItemValid. + /// + /// + /// 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 lbtConfItemValid; + + /// + /// Controllo lbtCancelItemValid. + /// + /// + /// 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 lbtCancelItemValid; + } +} diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx index 6ec42ea..870c5e5 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx @@ -4,6 +4,8 @@ <%@ 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" %> +
@@ -27,7 +29,6 @@
-
@@ -40,18 +41,7 @@
-
-
- <%: traduci("ItemNeedsSecOp") %> - <%: traduci("ItemNeedsPaint") %> -
-
- <%: traduci("ConfirmItemKitOk") %> -
-
- <%: traduci("CancelItemKitOk") %> -
-
+
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 5638dbf..5e95cfa 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -100,6 +100,7 @@ namespace NKC_WF.WebUserControls // resetto BIN & CART resetBin(); resetCart(); + resetItem(); } private void cmp_KS_BinCart_eh_doRefresh(object sender, EventArgs e) @@ -108,6 +109,7 @@ namespace NKC_WF.WebUserControls // resetto BIN & CART resetBin(); resetCart(); + resetItem(); } private void resetShowData() @@ -115,6 +117,7 @@ namespace NKC_WF.WebUserControls cmp_KS_Cart.Visible = false; cmp_KS_BinCart.Visible = false; cmp_KS_OtherItemsCart.Visible = false; + cmp_KS_Items.Visible = false; } /// @@ -462,17 +465,14 @@ namespace NKC_WF.WebUserControls } else { - bool needSecOp = !string.IsNullOrEmpty(itemRow.PostProcList); - bool needPaint = !string.IsNullOrEmpty(itemRow.ProcessesReq) && itemRow.ProcessesReq== "PaintFlag"; - // se non già valido mostro buttons conferma... - checkItemValidated(needSecOp, needPaint); - // salvataggio di OnCartDate - + // 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... @@ -519,25 +519,6 @@ namespace NKC_WF.WebUserControls } - /// - /// Veriofico item sia valido... - /// - /// - /// - private void checkItemValidated(bool needSecOp, bool needPaint) - { - bool showConfirmItem = false; - // se NON è già validato... - if(!itemValid) - { - showConfirmItem = needPaint || needSecOp; - } - divItemValid.Visible = showConfirmItem; - // moastro messaggi errore secondo caso - lblNeedSecOp.Visible = needSecOp; - lblNeedPaint.Visible = needPaint; - } - /// /// Imposta il codice OtherItem sugli oggetti dipendenti /// @@ -579,6 +560,9 @@ namespace NKC_WF.WebUserControls cmp_KS_Cart.CartID = codeInt; cmp_KS_Cart.CartDtmx = rawData; cmp_KS_Cart.doUpdate(); + cmp_KS_Items.CartID = codeInt; + cmp_KS_Items.CartDtmx = rawData; + cmp_KS_Items.doUpdate(); fixVisibility(); } @@ -593,6 +577,7 @@ namespace NKC_WF.WebUserControls cmp_KS_BinCart.CartID = 0; cmp_KS_OtherItemsCart.CartID = 0; cmp_KS_Cart.CartID = 0; + cmp_KS_Items.CartID = 0; fixVisibility(); } private void resetOtherItem() @@ -603,7 +588,7 @@ namespace NKC_WF.WebUserControls private void resetItem() { itemIdSelected = 0; - itemValid = false; + cmp_KS_Items.ItemID = 0; fixVisibility(); } @@ -654,7 +639,6 @@ namespace NKC_WF.WebUserControls } // elimino item sel... itemIdSelected = 0; - itemValid = false; resetShowData(); ComLib.resetItemPickup(SheetID, DeviceId); } @@ -732,19 +716,6 @@ namespace NKC_WF.WebUserControls lbtCancel.Visible = showBtn; } } - protected bool itemValid - { - get - { - bool answ = false; - bool.TryParse(hfItemValid.Value, out answ); - return answ; - } - set - { - hfItemValid.Value = value.ToString(); - } - } private void resetIcons() { @@ -782,7 +753,7 @@ namespace NKC_WF.WebUserControls cmp_KS_Cart.Visible = cmp_KS_Cart.CartID > 0 && (cmp_KS_BinCart.BinID + cmp_KS_OtherItemsCart.OtherItemID == 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); } @@ -807,14 +778,5 @@ namespace NKC_WF.WebUserControls } } - protected void lbtConfItemValid_Click(object sender, EventArgs e) - { - itemValid = true; - } - - protected void lbtCancelItemValid_Click(object sender, EventArgs e) - { - itemValid = false; - } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs index 925559a..18eaf57 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs @@ -122,15 +122,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfItemID; - /// - /// Controllo hfItemValid. - /// - /// - /// 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 hfItemValid; - /// /// Controllo lblItemCode. /// @@ -159,49 +150,13 @@ namespace NKC_WF.WebUserControls protected global::System.Web.UI.WebControls.Label lblItemDtmx; /// - /// Controllo divItemValid. + /// 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::System.Web.UI.HtmlControls.HtmlGenericControl divItemValid; - - /// - /// Controllo lblNeedSecOp. - /// - /// - /// 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 lblNeedSecOp; - - /// - /// Controllo lblNeedPaint. - /// - /// - /// 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 lblNeedPaint; - - /// - /// Controllo lbtConfItemValid. - /// - /// - /// 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 lbtConfItemValid; - - /// - /// Controllo lbtCancelItemValid. - /// - /// - /// 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 lbtCancelItemValid; + protected global::NKC_WF.WebUserControls.cmp_KS_Items cmp_KS_Items; /// /// Controllo divError. From af1e53889e9e7e817b41bcffa1aaad76363f8eb6 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 11 Aug 2020 13:33:48 +0200 Subject: [PATCH 5/5] Update BaseUserControls generale --- NKC_WF/WebUserControls/cmp_ErrorsLog.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_footer.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_kitList.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs | 1 - NKC_WF/WebUserControls/cmp_login.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_numRow.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_searchItems.ascx.cs | 2 +- NKC_WF/WebUserControls/mod_righePag.ascx.cs | 2 +- NKC_WF/WebUserControls/tpl_WIP.ascx.cs | 2 +- 17 files changed, 16 insertions(+), 17 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_ErrorsLog.ascx.cs b/NKC_WF/WebUserControls/cmp_ErrorsLog.ascx.cs index ef53342..9648e81 100644 --- a/NKC_WF/WebUserControls/cmp_ErrorsLog.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_ErrorsLog.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_ErrorsLog : System.Web.UI.UserControl + public partial class cmp_ErrorsLog : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs index 0f7eea8..5324f58 100644 --- a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs @@ -3,7 +3,7 @@ using System; namespace NKC_WF.WebUserControls { - public partial class cmp_MU_Items : System.Web.UI.UserControl + public partial class cmp_MU_Items : BaseUserControl { /// /// Sheet corrente... diff --git a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs index af413f8..f7d3adf 100644 --- a/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_singleStat.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_MU_singleStat : System.Web.UI.UserControl + public partial class cmp_MU_singleStat : BaseUserControl { /// /// Batch corrente... diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs index b8d0b17..8ae1eb2 100644 --- a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs @@ -3,7 +3,7 @@ using System; namespace NKC_WF.WebUserControls { - public partial class cmp_MU_stats : System.Web.UI.UserControl + public partial class cmp_MU_stats : BaseUserControl { /// /// Batch corrente... diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs index 83992c7..114aab6 100644 --- a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_MU_suggestions : System.Web.UI.UserControl + public partial class cmp_MU_suggestions : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 6a3b99a..145d3e3 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -6,7 +6,7 @@ using System.Web.UI; namespace NKC_WF.WebUserControls { - public partial class cmp_MU_svgViewer : System.Web.UI.UserControl + public partial class cmp_MU_svgViewer : BaseUserControl { /// /// BatchId corrente... diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index e1f67c4..9ba201e 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -9,7 +9,7 @@ using System.Text; namespace NKC_WF.WebUserControls { - public partial class cmp_batchDetail : System.Web.UI.UserControl + public partial class cmp_batchDetail : BaseUserControl { public event EventHandler eh_doRefresh; protected void Page_Load(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_footer.ascx.cs b/NKC_WF/WebUserControls/cmp_footer.ascx.cs index 4728345..00af3f7 100644 --- a/NKC_WF/WebUserControls/cmp_footer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_footer.ascx.cs @@ -4,7 +4,7 @@ using System.Configuration; namespace NKC_WF.WebUserControls { - public partial class cmp_footer : System.Web.UI.UserControl + public partial class cmp_footer : BaseUserControl { public event EventHandler eh_doRefresh; protected void Page_Load(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs b/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs index 4980554..541bd38 100644 --- a/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs @@ -4,7 +4,7 @@ using System.Web.UI; namespace NKC_WF.WebUserControls { - public partial class cmp_homeButtons : System.Web.UI.UserControl + public partial class cmp_homeButtons : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_kitList.ascx.cs b/NKC_WF/WebUserControls/cmp_kitList.ascx.cs index ca66812..eaabb9f 100644 --- a/NKC_WF/WebUserControls/cmp_kitList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitList.ascx.cs @@ -4,7 +4,7 @@ using System.Web.UI.WebControls; namespace NKC_WF.WebUserControls { - public partial class cmp_kitList : System.Web.UI.UserControl + public partial class cmp_kitList : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 5e95cfa..e1d9dc4 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -359,7 +359,6 @@ namespace NKC_WF.WebUserControls } } } - } break; case codeType.BinProcessed: diff --git a/NKC_WF/WebUserControls/cmp_login.ascx.cs b/NKC_WF/WebUserControls/cmp_login.ascx.cs index aa666b7..522953f 100644 --- a/NKC_WF/WebUserControls/cmp_login.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_login.ascx.cs @@ -4,7 +4,7 @@ using System.Web.UI; namespace NKC_WF.WebUserControls { - public partial class cmp_login : System.Web.UI.UserControl + public partial class cmp_login : BaseUserControl { #region eventi pubblici esposti diff --git a/NKC_WF/WebUserControls/cmp_numRow.ascx.cs b/NKC_WF/WebUserControls/cmp_numRow.ascx.cs index f7bbd08..8542d92 100644 --- a/NKC_WF/WebUserControls/cmp_numRow.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_numRow.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_numRow : System.Web.UI.UserControl + public partial class cmp_numRow : BaseUserControl { public event EventHandler eh_doRefresh; protected void Page_Load(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs index 39cd0bd..3130db2 100644 --- a/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs @@ -3,7 +3,7 @@ using System; namespace NKC_WF.WebUserControls { - public partial class cmp_paint_bins : System.Web.UI.UserControl + public partial class cmp_paint_bins : BaseUserControl { /// /// Testo titolo... diff --git a/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs b/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs index 83cdbfc..b3cdfc6 100644 --- a/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_searchItems : System.Web.UI.UserControl + public partial class cmp_searchItems : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/mod_righePag.ascx.cs b/NKC_WF/WebUserControls/mod_righePag.ascx.cs index c5ca498..7163ade 100644 --- a/NKC_WF/WebUserControls/mod_righePag.ascx.cs +++ b/NKC_WF/WebUserControls/mod_righePag.ascx.cs @@ -4,7 +4,7 @@ using System.Web.UI; namespace NKC_WF.WebUserControls { - public partial class mod_righePag : System.Web.UI.UserControl + public partial class mod_righePag : BaseUserControl { /// /// indicato (nuovo) numero righe x pagina diff --git a/NKC_WF/WebUserControls/tpl_WIP.ascx.cs b/NKC_WF/WebUserControls/tpl_WIP.ascx.cs index eb7424b..ee1ce94 100644 --- a/NKC_WF/WebUserControls/tpl_WIP.ascx.cs +++ b/NKC_WF/WebUserControls/tpl_WIP.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class tpl_WIP : System.Web.UI.UserControl + public partial class tpl_WIP : BaseUserControl { protected void Page_Load(object sender, EventArgs e) {