From f1e5153fb59a637c814ce16fb676513c16aa8bfd Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 14:37:12 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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. --> - + - + - + + + - - - - - - - + + + + + + + - - + + - - - - - - + + + + + + - + - - - + + + - + - - - + + + - + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - - + + + + - + - + - + - - + From 8ee147edd6098229d145e1e0c6bb0c2c356dec6a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 15:38:39 +0200 Subject: [PATCH 08/10] Aggiunta preliminare nuove pagine... --- NKC_WF/NKC_WF.csproj | 16 +++++++++++ NKC_WF/WebUserControls/cmp_painting.ascx | 27 +++++++++---------- NKC_WF/site/MachineLoadSmart.aspx | 3 +++ NKC_WF/site/MachineLoadSmart.aspx.cs | 17 ++++++++++++ NKC_WF/site/MachineLoadSmart.aspx.designer.cs | 17 ++++++++++++ NKC_WF/site/Painting.aspx | 18 +++++++------ NKC_WF/site/PaintingSmart.aspx | 3 +++ NKC_WF/site/PaintingSmart.aspx.cs | 17 ++++++++++++ NKC_WF/site/PaintingSmart.aspx.designer.cs | 17 ++++++++++++ 9 files changed, 113 insertions(+), 22 deletions(-) create mode 100644 NKC_WF/site/MachineLoadSmart.aspx create mode 100644 NKC_WF/site/MachineLoadSmart.aspx.cs create mode 100644 NKC_WF/site/MachineLoadSmart.aspx.designer.cs create mode 100644 NKC_WF/site/PaintingSmart.aspx create mode 100644 NKC_WF/site/PaintingSmart.aspx.cs create mode 100644 NKC_WF/site/PaintingSmart.aspx.designer.cs diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index a2574ff..e167d7f 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -411,12 +411,14 @@ + + @@ -771,6 +773,13 @@ MachineLoad.aspx + + MachineLoadSmart.aspx + ASPXCodeBehind + + + MachineLoadSmart.aspx + MachineOffline.aspx ASPXCodeBehind @@ -813,6 +822,13 @@ Painting.aspx + + PaintingSmart.aspx + ASPXCodeBehind + + + PaintingSmart.aspx + PartValidation.aspx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_painting.ascx b/NKC_WF/WebUserControls/cmp_painting.ascx index 03ab0ae..6a226d2 100644 --- a/NKC_WF/WebUserControls/cmp_painting.ascx +++ b/NKC_WF/WebUserControls/cmp_painting.ascx @@ -3,20 +3,19 @@ <%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> -
-
- -
-
- READER
- - - +
+ +
+
+ READER
+ + + - <%: traduci("ConfirmPaint") %> -
-
- -
+ <%: traduci("ConfirmPaint") %> +
+
+ +
diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx new file mode 100644 index 0000000..34eb82e --- /dev/null +++ b/NKC_WF/site/MachineLoadSmart.aspx @@ -0,0 +1,3 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoadSmart.aspx.cs" Inherits="NKC_WF.site.MachineLoadSmart" %> + + diff --git a/NKC_WF/site/MachineLoadSmart.aspx.cs b/NKC_WF/site/MachineLoadSmart.aspx.cs new file mode 100644 index 0000000..712979e --- /dev/null +++ b/NKC_WF/site/MachineLoadSmart.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class MachineLoadSmart : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs new file mode 100644 index 0000000..7fcef9f --- /dev/null +++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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.site +{ + + + public partial class MachineLoadSmart + { + } +} diff --git a/NKC_WF/site/Painting.aspx b/NKC_WF/site/Painting.aspx index 5cad826..a2e9674 100644 --- a/NKC_WF/site/Painting.aspx +++ b/NKC_WF/site/Painting.aspx @@ -4,14 +4,16 @@ -
-

<%: traduci("Painting") %>

-
-
-
- +
+
+

<%: traduci("Painting") %>

+
+
+
+ +
+
+
-
-
diff --git a/NKC_WF/site/PaintingSmart.aspx b/NKC_WF/site/PaintingSmart.aspx new file mode 100644 index 0000000..780a943 --- /dev/null +++ b/NKC_WF/site/PaintingSmart.aspx @@ -0,0 +1,3 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PaintingSmart.aspx.cs" Inherits="NKC_WF.site.PaintingSmart" %> + + diff --git a/NKC_WF/site/PaintingSmart.aspx.cs b/NKC_WF/site/PaintingSmart.aspx.cs new file mode 100644 index 0000000..31bb9cf --- /dev/null +++ b/NKC_WF/site/PaintingSmart.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class PaintingSmart : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/PaintingSmart.aspx.designer.cs b/NKC_WF/site/PaintingSmart.aspx.designer.cs new file mode 100644 index 0000000..41358f7 --- /dev/null +++ b/NKC_WF/site/PaintingSmart.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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.site +{ + + + public partial class PaintingSmart + { + } +} From eaea62d1c15c81d5a5c8ad7689dd37a401816b88 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 15:49:35 +0200 Subject: [PATCH 09/10] Prima vers pagine SMART x LOAD e PAINTING --- NKC_WF/NKC_WF.csproj | 15 ++++++ NKC_WF/WebUserControls/cmp_ML_smart.ascx | 17 +++++++ NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs | 17 +++++++ .../cmp_ML_smart.ascx.designer.cs | 17 +++++++ NKC_WF/WebUserControls/cmp_paintingSmart.ascx | 17 +++++++ .../WebUserControls/cmp_paintingSmart.ascx.cs | 17 +++++++ .../cmp_paintingSmart.ascx.designer.cs | 17 +++++++ NKC_WF/site/MachineLoadSmart.aspx | 7 +++ NKC_WF/site/MachineLoadSmart.aspx.cs | 49 ++++++++++++++++++- NKC_WF/site/MachineLoadSmart.aspx.designer.cs | 15 ++++-- NKC_WF/site/Painting.aspx.cs | 5 +- NKC_WF/site/PaintingSmart.aspx | 6 +++ NKC_WF/site/PaintingSmart.aspx.cs | 49 ++++++++++++++++++- NKC_WF/site/PaintingSmart.aspx.designer.cs | 15 ++++-- 14 files changed, 252 insertions(+), 11 deletions(-) create mode 100644 NKC_WF/WebUserControls/cmp_ML_smart.ascx create mode 100644 NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs create mode 100644 NKC_WF/WebUserControls/cmp_paintingSmart.ascx create mode 100644 NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_paintingSmart.ascx.designer.cs diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e167d7f..c9262d2 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -463,6 +463,7 @@ + @@ -477,6 +478,7 @@ + @@ -1186,6 +1188,13 @@ cmp_ML_ShDet.ascx + + cmp_ML_smart.ascx + ASPXCodeBehind + + + cmp_ML_smart.ascx + cmp_MU_carts.ascx ASPXCodeBehind @@ -1284,6 +1293,12 @@ cmp_painting.ascx + + cmp_paintingSmart.ascx + + + cmp_paintingSmart.ascx + cmp_paint_bins.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_ML_smart.ascx b/NKC_WF/WebUserControls/cmp_ML_smart.ascx new file mode 100644 index 0000000..3726c24 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ML_smart.ascx @@ -0,0 +1,17 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ML_smart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_ML_smart" %> + +
+
+

<%: traduci("MachineLoadSmart") %>

+
+
+
+ BARCODE +
+
+ out messages +
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs b/NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs new file mode 100644 index 0000000..b5a7214 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs @@ -0,0 +1,17 @@ +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_ML_smart : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs new file mode 100644 index 0000000..353a9cc --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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_ML_smart + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx new file mode 100644 index 0000000..2d30eab --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx @@ -0,0 +1,17 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_paintingSmart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_paintingSmart" %> + +
+
+

<%: traduci("PaintingSmart") %>

+
+
+
+ BARCODE +
+
+ out messages +
+
+
+
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs new file mode 100644 index 0000000..35e9062 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs @@ -0,0 +1,17 @@ +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_paintingSmart : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.designer.cs new file mode 100644 index 0000000..330c839 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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_paintingSmart + { + } +} diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx index 34eb82e..5efe691 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx +++ b/NKC_WF/site/MachineLoadSmart.aspx @@ -1,3 +1,10 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoadSmart.aspx.cs" Inherits="NKC_WF.site.MachineLoadSmart" %> + +<%@ Register Src="~/WebUserControls/cmp_ML_smart.ascx" TagPrefix="uc1" TagName="cmp_ML_smart" %> + + +
+ +
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.cs b/NKC_WF/site/MachineLoadSmart.aspx.cs index 712979e..1724f9c 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx.cs +++ b/NKC_WF/site/MachineLoadSmart.aspx.cs @@ -7,11 +7,56 @@ using System.Web.UI.WebControls; namespace NKC_WF.site { - public partial class MachineLoadSmart : System.Web.UI.Page + public partial class MachineLoadSmart : BasePage { protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = false; +#if false + doUpdate(); +#endif + } } +#if false + /// + /// Batch corrente... + /// + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } + /// + /// Aggiorna componente principale e child components + /// + private void doUpdate() + { + setCurrData(); + // aggiorno child + cmp_unloadSmart.BatchId = BatchId; + } + /// + /// Imposta dati correnti (Bunk / Sheet) + /// + private void setCurrData() + { + // recupero bunk corrente... + DS_App.StackListRow currBunk = ComLib.getCurrBunk(); + if (currBunk != null) + { + BatchId = currBunk.BatchID; + } + } +#endif } } \ No newline at end of file diff --git a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs index 7fcef9f..b175025 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs +++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace NKC_WF.site @@ -13,5 +13,14 @@ namespace NKC_WF.site public partial class MachineLoadSmart { + + /// + /// Controllo cmp_ML_smart. + /// + /// + /// 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_ML_smart cmp_ML_smart; } } diff --git a/NKC_WF/site/Painting.aspx.cs b/NKC_WF/site/Painting.aspx.cs index 6cebd41..14c5ae8 100644 --- a/NKC_WF/site/Painting.aspx.cs +++ b/NKC_WF/site/Painting.aspx.cs @@ -6,7 +6,10 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { - ((SiteContent)this.Master).showSearch = false; + if (!Page.IsPostBack) + { + ((SiteContent)this.Master).showSearch = false; + } } } } \ No newline at end of file diff --git a/NKC_WF/site/PaintingSmart.aspx b/NKC_WF/site/PaintingSmart.aspx index 780a943..005aefe 100644 --- a/NKC_WF/site/PaintingSmart.aspx +++ b/NKC_WF/site/PaintingSmart.aspx @@ -1,3 +1,9 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PaintingSmart.aspx.cs" Inherits="NKC_WF.site.PaintingSmart" %> + +<%@ Register Src="~/WebUserControls/cmp_paintingSmart.ascx" TagPrefix="uc1" TagName="cmp_paintingSmart" %> + +
+ +
diff --git a/NKC_WF/site/PaintingSmart.aspx.cs b/NKC_WF/site/PaintingSmart.aspx.cs index 31bb9cf..6180106 100644 --- a/NKC_WF/site/PaintingSmart.aspx.cs +++ b/NKC_WF/site/PaintingSmart.aspx.cs @@ -7,11 +7,56 @@ using System.Web.UI.WebControls; namespace NKC_WF.site { - public partial class PaintingSmart : System.Web.UI.Page + public partial class PaintingSmart : BasePage { protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = false; +#if false + doUpdate(); +#endif + } } +#if false + /// + /// Batch corrente... + /// + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } + /// + /// Aggiorna componente principale e child components + /// + private void doUpdate() + { + setCurrData(); + // aggiorno child + cmp_unloadSmart.BatchId = BatchId; + } + /// + /// Imposta dati correnti (Bunk / Sheet) + /// + private void setCurrData() + { + // recupero bunk corrente... + DS_App.StackListRow currBunk = ComLib.getCurrBunk(); + if (currBunk != null) + { + BatchId = currBunk.BatchID; + } + } +#endif } } \ No newline at end of file diff --git a/NKC_WF/site/PaintingSmart.aspx.designer.cs b/NKC_WF/site/PaintingSmart.aspx.designer.cs index 41358f7..84b07b1 100644 --- a/NKC_WF/site/PaintingSmart.aspx.designer.cs +++ b/NKC_WF/site/PaintingSmart.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace NKC_WF.site @@ -13,5 +13,14 @@ namespace NKC_WF.site public partial class PaintingSmart { + + /// + /// Controllo cmp_paintingSmart. + /// + /// + /// 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_paintingSmart cmp_paintingSmart; } } From 4fbd9b0713b52ae5ad3116565af22b1b29ff0857 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 6 Aug 2020 15:50:47 +0200 Subject: [PATCH 10/10] refresh --- NKC_WF/NKC_WF.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index c9262d2..0abf02b 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -1295,6 +1295,7 @@ cmp_paintingSmart.ascx + ASPXCodeBehind cmp_paintingSmart.ascx