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/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 74ce879..0abf02b 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -67,8 +67,8 @@ ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - ..\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll + + ..\packages\DnsClient.1.3.1\lib\net45\DnsClient.dll ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll @@ -82,6 +82,9 @@ ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -89,14 +92,14 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.10.2\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.0\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.10.2\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.11.0\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.10.2\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.0\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -105,7 +108,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.6.8\lib\net45\NLog.dll + ..\packages\NLog.4.7.3\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -114,7 +117,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -123,13 +126,13 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.1.58\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 + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -139,14 +142,22 @@ ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - - ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + + + ..\packages\System.IO.Pipelines.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll @@ -155,7 +166,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -163,12 +174,32 @@ True + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + ..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -253,6 +284,9 @@ SheetColor.css + + + @@ -377,12 +411,14 @@ + + @@ -427,6 +463,7 @@ + @@ -441,6 +478,7 @@ + @@ -737,6 +775,13 @@ MachineLoad.aspx + + MachineLoadSmart.aspx + ASPXCodeBehind + + + MachineLoadSmart.aspx + MachineOffline.aspx ASPXCodeBehind @@ -779,6 +824,13 @@ Painting.aspx + + PaintingSmart.aspx + ASPXCodeBehind + + + PaintingSmart.aspx + PartValidation.aspx ASPXCodeBehind @@ -1136,6 +1188,13 @@ cmp_ML_ShDet.ascx + + cmp_ML_smart.ascx + ASPXCodeBehind + + + cmp_ML_smart.ascx + cmp_MU_carts.ascx ASPXCodeBehind @@ -1234,6 +1293,13 @@ cmp_painting.ascx + + cmp_paintingSmart.ascx + ASPXCodeBehind + + + cmp_paintingSmart.ascx + cmp_paint_bins.ascx ASPXCodeBehind @@ -1499,6 +1565,7 @@ + + @@ -363,6 +363,14 @@ + + + + + + + + @@ -396,7 +404,7 @@ @@ -414,13 +422,13 @@ - 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_labelsPrint.ascx.cs b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs index 8d4789f..1b98364 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! @@ -372,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... @@ -508,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); } @@ -594,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); } 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/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/packages.config b/NKC_WF/packages.config index 7008d54..d8172e2 100644 --- a/NKC_WF/packages.config +++ b/NKC_WF/packages.config @@ -7,7 +7,7 @@ - + @@ -32,6 +32,7 @@ + @@ -42,29 +43,35 @@ - - - + + + - + - + - - - + + + - + + + - + - - + + + + + + \ No newline at end of file diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx new file mode 100644 index 0000000..5efe691 --- /dev/null +++ b/NKC_WF/site/MachineLoadSmart.aspx @@ -0,0 +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 new file mode 100644 index 0000000..1724f9c --- /dev/null +++ b/NKC_WF/site/MachineLoadSmart.aspx.cs @@ -0,0 +1,62 @@ +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 : 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 new file mode 100644 index 0000000..b175025 --- /dev/null +++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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 + { + + /// + /// 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 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/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 new file mode 100644 index 0000000..005aefe --- /dev/null +++ b/NKC_WF/site/PaintingSmart.aspx @@ -0,0 +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 new file mode 100644 index 0000000..6180106 --- /dev/null +++ b/NKC_WF/site/PaintingSmart.aspx.cs @@ -0,0 +1,62 @@ +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 : 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 new file mode 100644 index 0000000..84b07b1 --- /dev/null +++ b/NKC_WF/site/PaintingSmart.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 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 + { + + /// + /// 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; + } +}