From f1e5153fb59a637c814ce16fb676513c16aa8bfd Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 14:37:12 +0200 Subject: [PATCH 1/6] Clkeanup unused function labels print + new rel --- Jenkinsfile | 2 +- .../WebUserControls/cmp_labelsPrint.ascx.cs | 80 ++----------------- 2 files changed, 7 insertions(+), 75 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57e4f4e..c45b1af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=308']) { + withEnv(['NEXT_BUILD_NUMBER=309']) { // 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}') diff --git a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs index 8d4789f..b8863c3 100644 --- a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs @@ -196,12 +196,14 @@ namespace NKC_WF.WebUserControls processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.ItemGeneric: - cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}"); - processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + cmp_barcode.showOutput("badge badge-success", $"IG Code - ignored: {decoData.rawData}"); + resetDisplay(true); + doRaiseEv = true; break; case codeType.OtherItem: - cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}"); - processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); + cmp_barcode.showOutput("badge badge-success", $"Generic PART Code - ignored: {decoData.rawData}"); + resetDisplay(true); + doRaiseEv = true; break; case codeType.Material: cmp_barcode.showOutput("badge badge-warning", $"MATERIAL - ignored: {decoData.description}"); @@ -226,10 +228,6 @@ namespace NKC_WF.WebUserControls case codeType.Cart: cmp_barcode.showOutput("badge badge-warning", $"CART - ignored: {decoData.description}"); resetDisplay(true); -#if false - cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}"); - processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); -#endif doRaiseEv = true; break; case codeType.Bin: @@ -240,10 +238,6 @@ namespace NKC_WF.WebUserControls case codeType.BinProcessed: cmp_barcode.showOutput("badge badge-warning", $"BIN PAINTED - ignored: {decoData.description}"); resetDisplay(true); -#if false - cmp_barcode.showOutput("badge badge-success", $"Valid BP Code: {decoData.description}"); - processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); -#endif doRaiseEv = true; break; default: @@ -282,68 +276,6 @@ namespace NKC_WF.WebUserControls // mostro print! lbtPrintLabels.Visible = true; break; - case codeType.ItemGeneric: - //// PRIMA CERCA SE ne ho in stato 1..3 - //tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 3); - //if (tabItem.Count == 0) - //{ - // // se NON ne trovo cerci FINO a stato 5... - // tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 5); - //} - //if (tabItem.Count == 1) - //{ - // showItemDetail(true, tabItem[0], false); - //} - //else if (tabItem.Count == 0) - //{ - // showItemDetail(false, null, true); - //} - - // mostro print! - lbtPrintLabels.Visible = true; - break; - case codeType.OtherItem: -#if false - // recupero la tab OKOI x iniziare a controllare i dati... - var tabOKOI = DataLayer.man.taOKOI.getByOtherItemDtmx(rawData); - // PRIMO: verifico SE ho delle righe valide... - if (tabOKOI.Count == 0) - { - displError($"PART: Code not found {rawData}, please retry", true); - // reset preliminare - resetOtherItem(); - } - else - { - 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); - // 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($"PART: No CART available to proceed: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}", true); - // reset preliminare - resetOtherItem(); - } - else - { - // mostro OtherItem! - setOtherItem(rawData, codeInt); - - } - } - } -#endif - // mostro print! - lbtPrintLabels.Visible = true; - break; default: lastObject = ""; // nascondo print! From dcc637ed6b3fed28475d90e2cecd27294fd08172 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 14:47:16 +0200 Subject: [PATCH 2/6] Code Cleanup --- .../WebUserControls/cmp_labelsPrint.ascx.cs | 114 ------------------ 1 file changed, 114 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs index b8863c3..1b98364 100644 --- a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs @@ -304,80 +304,6 @@ namespace NKC_WF.WebUserControls raiseEvent(); } - /// - /// Imposta il codice OtherItem sugli oggetti dipendenti - /// - /// - /// - private void setOtherItem(string rawData, int codeInt) - { -#if false - cmp_KS_OtherItemsCart.OtherItemID = codeInt; - cmp_KS_OtherItemsCart.OtherItemDtmx = rawData; - cmp_KS_OtherItemsCart.doUpdate(); -#endif - fixVisibility(); - } - - /// - /// Imposta il bin sugli oggetti dipendenti - /// - /// - /// - private void setBin(string rawData, int codeInt) - { -#if false - cmp_KS_BinCart.BinID = codeInt; - cmp_KS_BinCart.BinDtmx = rawData; - cmp_KS_BinCart.doUpdate(); -#endif - fixVisibility(); - } - /// - /// Imposta il cart sugli oggetti dipendenti - /// - /// - /// - private void setCart(string rawData, int codeInt) - { -#if false - cmp_KS_BinCart.CartID = codeInt; - cmp_KS_BinCart.CartDtmx = rawData; - cmp_KS_BinCart.doUpdate(); - cmp_KS_OtherItemsCart.CartID = codeInt; - cmp_KS_OtherItemsCart.CartDtmx = rawData; - cmp_KS_OtherItemsCart.doUpdate(); - cmp_KS_Cart.CartID = codeInt; - cmp_KS_Cart.CartDtmx = rawData; - cmp_KS_Cart.doUpdate(); -#endif - fixVisibility(); - } - - private void resetBin() - { -#if false - cmp_KS_BinCart.BinID = 0; -#endif - fixVisibility(); - } - - private void resetCart() - { -#if false - cmp_KS_BinCart.CartID = 0; - cmp_KS_OtherItemsCart.CartID = 0; - cmp_KS_Cart.CartID = 0; -#endif - fixVisibility(); - } - private void resetOtherItem() - { -#if false - cmp_KS_OtherItemsCart.OtherItemID = 0; -#endif - fixVisibility(); - } /// /// Mostra errore ed effettua reset vari... @@ -440,39 +366,6 @@ namespace NKC_WF.WebUserControls lblItemDesc.Text = itemRow.ItemDesc; lblItemDtmx.Text = itemRow.ItemDtmx; itemIdSelected = itemRow.ItemID; - // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... - switch (itemRow.StatusID) - { - case 0: - displError("ERROR: Item not ready", false); - break; - case 1: - case 2: - case 100: - // salvo che è in STATO 2 (picked up) - DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId); - doUpdate(); - break; - case 3: - displError("Item already on CART!", false); - break; - case 4: - // fino a concorrenza qta richiesta sposto, POI do errori - displError("ALL Item already scanned on BIN!", false); - break; - case 5: - displError("Item already at KIT STATION!", false); - break; - case 990: - displError("Item declared SCRAP!", false); - break; - case 991: - displError("Item declared SCRAP with CNC program created!", false); - break; - default: - displError("ERROR: Item status UNKNOWN!", false); - break; - } } lbtResetSel.Visible = (itemIdSelected != 0); } @@ -526,13 +419,6 @@ namespace NKC_WF.WebUserControls private void fixVisibility() { - // reset grafico -#if false - 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; -#endif - // fix btn reset! lbtResetSel.Visible = (itemIdSelected != 0); } From c2558d057387f3824edfc9c23581a825203bc4fc Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 14:47:31 +0200 Subject: [PATCH 3/6] update package steamwarelibs --- NKC_WF/NKC_WF.csproj | 4 +- NKC_WF/Web.config | 409 ++++++++++++++++++++--------------------- NKC_WF/packages.config | 2 +- 3 files changed, 201 insertions(+), 214 deletions(-) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 74ce879..7fa649f 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -125,8 +125,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.0.2003.734\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index fcd2f04..10349df 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -6,392 +6,379 @@ -
-
-
-
+
+
+
+
- - + + - + - - + + - + - - - + + + - + - - - - - - - + + + + + + + - - + + - - - - - - + + + + + + - + - - - + + + - + - - - + + + - + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - - + + + + @@ -399,20 +386,20 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - +