From f0b543440af09d04624ebcc0607c69a06018a03f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:11:38 +0100 Subject: [PATCH 1/8] Update struttura colori --- NKC_WF/Content/SheetColor.css | 12 ++++++------ NKC_WF/Content/SheetColor.less | 6 +++--- NKC_WF/Content/SheetColor.min.css | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NKC_WF/Content/SheetColor.css b/NKC_WF/Content/SheetColor.css index 9d2539f..3680df5 100644 --- a/NKC_WF/Content/SheetColor.css +++ b/NKC_WF/Content/SheetColor.css @@ -1,20 +1,20 @@ /* ANIMAZIONE */ .strokeThick { - stroke-width: 5px !important; + stroke-width: 50px !important; } /* Animazione per richiamo attenzione*/ .flashStroke { stroke: blue; /* Safari 4.0 - 8.0 */ -webkit-animation-name: blueFlash; - -webkit-animation-duration: 0.5s; + -webkit-animation-duration: 0.8s; -webkit-animation-timing-function: linear; -webkit-animation-delay: 0s; -webkit-animation-iteration-count: infinite; -webkit-animation-direction: alternate; /* Standard syntax */ animation-name: blueFlash; - animation-duration: 0.5s; + animation-duration: 0.8s; animation-timing-function: linear; animation-delay: 0s; animation-iteration-count: infinite; @@ -81,19 +81,19 @@ stroke: blue; /* Safari 4.0 - 8.0 */ -webkit-animation-name: blueFlash; - -webkit-animation-duration: 0.5s; + -webkit-animation-duration: 0.8s; -webkit-animation-timing-function: linear; -webkit-animation-delay: 0s; -webkit-animation-iteration-count: infinite; -webkit-animation-direction: alternate; /* Standard syntax */ animation-name: blueFlash; - animation-duration: 0.5s; + animation-duration: 0.8s; animation-timing-function: linear; animation-delay: 0s; animation-iteration-count: infinite; animation-direction: alternate; - stroke-width: 5px !important; + stroke-width: 50px !important; } #BLK-BIN { fill: #28a745; diff --git a/NKC_WF/Content/SheetColor.less b/NKC_WF/Content/SheetColor.less index b4330c0..2437d38 100644 --- a/NKC_WF/Content/SheetColor.less +++ b/NKC_WF/Content/SheetColor.less @@ -1,5 +1,5 @@ /* ANIMAZIONE */ -@borderThick: 5px; +@borderThick: 50px; .strokeThick { stroke-width: @borderThick !important; @@ -9,14 +9,14 @@ stroke: blue; /* Safari 4.0 - 8.0 */ -webkit-animation-name: blueFlash; - -webkit-animation-duration: 0.5s; + -webkit-animation-duration: 0.8s; -webkit-animation-timing-function: linear; -webkit-animation-delay: 0s; -webkit-animation-iteration-count: infinite; -webkit-animation-direction: alternate; /* Standard syntax */ animation-name: blueFlash; - animation-duration: 0.5s; + animation-duration: 0.8s; animation-timing-function: linear; animation-delay: 0s; animation-iteration-count: infinite; diff --git a/NKC_WF/Content/SheetColor.min.css b/NKC_WF/Content/SheetColor.min.css index f6b23d9..840c089 100644 --- a/NKC_WF/Content/SheetColor.min.css +++ b/NKC_WF/Content/SheetColor.min.css @@ -1 +1 @@ -.strokeThick{stroke-width:5px !important;}.flashStroke{stroke:blue;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{stroke:#c4dbff;}25%{stroke:#9dc4ff;}50%{stroke:#5ca5ff;}75%{stroke:#1b82ff;}100%{stroke:#005ccc;}}.SFONDO{fill:#dedede;}.GRIGIO{fill:#acacac;}.VERDE{fill:#28a745;}.BLU{fill:#007bff;}.ARANCIO{fill:orange;}.GIALLO{fill:yellow;}.PURPLE{fill:purple;}.TESTO{fill:white;}#BLK-BCK{fill:#dedede;}#BLK-CUT{fill:#acacac;}#BLK-SEL{fill:orange;stroke:blue;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;stroke-width:5px !important;}#BLK-BIN{fill:#28a745;}#BLK-CART{fill:#007bff;}#BLK-SEC-OP{fill:purple;} \ No newline at end of file +.strokeThick{stroke-width:50px !important;}.flashStroke{stroke:blue;-webkit-animation-name:blueFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{stroke:#c4dbff;}25%{stroke:#9dc4ff;}50%{stroke:#5ca5ff;}75%{stroke:#1b82ff;}100%{stroke:#005ccc;}}.SFONDO{fill:#dedede;}.GRIGIO{fill:#acacac;}.VERDE{fill:#28a745;}.BLU{fill:#007bff;}.ARANCIO{fill:orange;}.GIALLO{fill:yellow;}.PURPLE{fill:purple;}.TESTO{fill:white;}#BLK-BCK{fill:#dedede;}#BLK-CUT{fill:#acacac;}#BLK-SEL{fill:orange;stroke:blue;-webkit-animation-name:blueFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;stroke-width:50px !important;}#BLK-BIN{fill:#28a745;}#BLK-CART{fill:#007bff;}#BLK-SEC-OP{fill:purple;} \ No newline at end of file From 75210a9ae70d56b682eef04ad85c9bb8947e6e09 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:12:00 +0100 Subject: [PATCH 2/8] Spostato visualizzaizone svg in componente interno (da prendere da DB!!!) --- NKC_WF/WebUserControls/cmp_svgViewer.ascx | 22 +++++++++ NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs | 20 ++++++++ .../cmp_svgViewer.ascx.designer.cs | 26 ++++++++++ NKC_WF/site/MachineUnload.aspx | 39 +++------------ NKC_WF/site/MachineUnload.aspx.cs | 7 --- NKC_WF/site/MachineUnload.aspx.designer.cs | 48 ++++++++++--------- 6 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 NKC_WF/WebUserControls/cmp_svgViewer.ascx create mode 100644 NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_svgViewer.ascx new file mode 100644 index 0000000..f08d903 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_svgViewer.ascx @@ -0,0 +1,22 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_svgViewer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_svgViewer" %> + +
+ +
+ + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs new file mode 100644 index 0000000..25b6527 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_svgViewer : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + string filename = Server.MapPath("~/Images/test.svg"); + string answ = File.ReadAllText(filename); + svgTable.InnerHtml = answ; + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs new file mode 100644 index 0000000..fa20881 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.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.WebUserControls +{ + + + public partial class cmp_svgViewer + { + + /// + /// Controllo svgTable. + /// + /// + /// 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 svgTable; + } +} diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index 1eabd98..1a3a4a4 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -1,37 +1,9 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineUnload.aspx.cs" Inherits="NKC_WF.MachineUnload" %> - - <%-- - - - - - --%> - <%-- - - - - - --%> -
- -
- +<%@ Register Src="~/WebUserControls/cmp_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_svgViewer" %> + +
@@ -283,8 +255,9 @@
- - + + <%-- + --%>
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index 219215e..aacc82a 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -7,14 +7,7 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { - string filename = Server.MapPath("~/Images/test.svg"); - string answ = File.ReadAllText(filename); - svgTable.InnerHtml = answ; } - protected void timReloadCss_Tick(object sender, EventArgs e) - { - - } } } \ No newline at end of file diff --git a/NKC_WF/site/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs index b6f5512..7058661 100644 --- a/NKC_WF/site/MachineUnload.aspx.designer.cs +++ b/NKC_WF/site/MachineUnload.aspx.designer.cs @@ -7,27 +7,29 @@ // //------------------------------------------------------------------------------ -namespace NKC_WF { - - - public partial class MachineUnload { - - /// - /// Controllo upnlDrawings. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.UpdatePanel upnlDrawings; - - /// - /// Controllo svgTable. - /// - /// - /// 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 svgTable; - } +namespace NKC_WF +{ + + + public partial class MachineUnload + { + + /// + /// Controllo upnlDrawings. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlDrawings; + + /// + /// Controllo cmp_svgViewer. + /// + /// + /// 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_svgViewer cmp_svgViewer; + } } From 34a680a18555f825671f5b64a61ad3fb823f9c17 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:12:13 +0100 Subject: [PATCH 3/8] pulizia e test nuovo svg (fix x ora) --- .../Batch/B20190916.0/ST0000001/SH0000002.svg | 25 ---- NKC_WF/Images/test.svg | 107 ++++++++++++++---- .../ST0000001/SH0000001.svg => test_a.svg} | 0 3 files changed, 83 insertions(+), 49 deletions(-) delete mode 100644 NKC_WF/Images/Batch/B20190916.0/ST0000001/SH0000002.svg rename NKC_WF/Images/{Batch/B20190916.0/ST0000001/SH0000001.svg => test_a.svg} (100%) diff --git a/NKC_WF/Images/Batch/B20190916.0/ST0000001/SH0000002.svg b/NKC_WF/Images/Batch/B20190916.0/ST0000001/SH0000002.svg deleted file mode 100644 index 1f44c04..0000000 --- a/NKC_WF/Images/Batch/B20190916.0/ST0000001/SH0000002.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - IT000001 - - - - - - IT000002 - - - IT000003 - - - - - - - - - - - \ No newline at end of file diff --git a/NKC_WF/Images/test.svg b/NKC_WF/Images/test.svg index 1f44c04..fb0c2a2 100644 --- a/NKC_WF/Images/test.svg +++ b/NKC_WF/Images/test.svg @@ -1,25 +1,84 @@ - - - - IT000001 - - - - - - IT000002 - - - IT000003 - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + 2 + + + diff --git a/NKC_WF/Images/Batch/B20190916.0/ST0000001/SH0000001.svg b/NKC_WF/Images/test_a.svg similarity index 100% rename from NKC_WF/Images/Batch/B20190916.0/ST0000001/SH0000001.svg rename to NKC_WF/Images/test_a.svg From 08860ceefb0e7fb74e12a2351b4d06076c789ba2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:12:35 +0100 Subject: [PATCH 4/8] Update gen --- Jenkinsfile | 2 +- NKC_WF/NKC_WF.csproj | 23 ++++-- .../WebUserControls/cmp_batchDetail.ascx.cs | 80 ++++++++++++++++++- 3 files changed, 95 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe88b7a..dbede6a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=193']) { + withEnv(['NEXT_BUILD_NUMBER=195']) { // env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.8.${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 6b4a835..d2160fe 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -233,8 +233,15 @@ + + SheetColor.less + + + SheetColor.css + + @@ -256,12 +263,6 @@ fonts.css - - SheetColor.less - - - SheetColor.css - @@ -271,7 +272,7 @@ - + @@ -312,6 +313,7 @@ + @@ -825,6 +827,13 @@ cmp_stackNextloading.ascx + + cmp_svgViewer.ascx + ASPXCodeBehind + + + cmp_svgViewer.ascx + cmp_taktList.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 62512d3..b5e9dc6 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -2,6 +2,7 @@ using NKC_SDK; using SteamWare; using System; +using System.Collections.Generic; using System.Text; namespace NKC_WF.WebUserControls @@ -29,18 +30,93 @@ namespace NKC_WF.WebUserControls sb.AppendLine("DEBUG INFO:"); if (estimAnsw != null) { + // elenchi x ricerca duplicati + List partListEstim = new List(); + List partListEstimDupl = new List(); try { - sb.AppendLine($"ESTIM: EnvNum: {estimAnsw.EnvNum} | Worktime: {estimAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {estimAnsw.ProcessingRuntime / 60:N2} min | Parts #: {estimAnsw.PartList.Count}"); + foreach (var part in estimAnsw.PartList) + { + if (partListEstim.Contains(part.PartId)) + { + partListEstimDupl.Add(part.PartId); + } + else + { + partListEstim.Add(part.PartId); + } + } + } + catch + { } + try + { + sb.AppendLine($"ESTIM: EnvNum: {estimAnsw.EnvNum} | Worktime: {estimAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {estimAnsw.ProcessingRuntime / 60:N2} min | Parts #: {estimAnsw.PartList.Count} | Distinct Part # {partListEstim.Count}"); + // se ho duplicati indico: + if (partListEstimDupl.Count > 0) + { + sb.AppendLine("---------------------"); + sb.AppendLine($"ESTIM: FOUND {partListEstimDupl.Count} duplicate:"); + foreach (var partId in partListEstimDupl) + { + sb.AppendLine($"{partId}"); + } + sb.AppendLine("---------------------"); + } } catch { } } if (nestAnsw != null) { + // elenchi x ricerca duplicati + List partListNest = new List(); + List partListNestDupl = new List(); try { - sb.AppendLine($"NEST: EnvNum: {nestAnsw.EnvNum} | Worktime: {nestAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {nestAnsw.ProcessingRuntime / 60:N2} min | Bunks #: {nestAnsw.BunkList.Count} | Carts #: {nestAnsw.CartList.Count}"); + foreach (var bunk in nestAnsw.BunkList) + { + foreach (var sheet in bunk.SheetList) + { + foreach (var part in sheet.PartList) + { + if (partListNest.Contains(part.PartId)) + { + partListNestDupl.Add(part.PartId); + } + else + { + partListNest.Add(part.PartId); + } + } + } + } + } + catch + { } + //il tot delle part è in bunk > Sheet > part + int totPartNum = 0; + foreach (var bunk in nestAnsw.BunkList) + { + foreach (var sheet in bunk.SheetList) + { + totPartNum += sheet.PartList.Count; + } + } + try + { + sb.AppendLine($"NEST: EnvNum: {nestAnsw.EnvNum} | Worktime: {nestAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {nestAnsw.ProcessingRuntime / 60:N2} min | Bunks #: {nestAnsw.BunkList.Count} | Carts #: {nestAnsw.CartList.Count} | Parts #: {totPartNum}"); + // se ho duplicati indico: + if (partListNestDupl.Count > 0) + { + sb.AppendLine("---------------------"); + sb.AppendLine($"ESTIM: FOUND {partListNestDupl.Count} duplicate:"); + foreach (var partId in partListNestDupl) + { + sb.AppendLine($"{partId}"); + } + sb.AppendLine("---------------------"); + } } catch { } From 474778da8e0a4fb952e91d3bbc82eba677a52597 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:40:31 +0100 Subject: [PATCH 5/8] pulizia dati --- NKC_WF/Images/Test11.svg | 25 -- NKC_WF/Images/test_b.svg | 45 --- NKC_WF/Images/test_bis.svg | 111 ------ NKC_WF/Images/test_quadrato.svg | 658 -------------------------------- 4 files changed, 839 deletions(-) delete mode 100644 NKC_WF/Images/Test11.svg delete mode 100644 NKC_WF/Images/test_b.svg delete mode 100644 NKC_WF/Images/test_bis.svg delete mode 100644 NKC_WF/Images/test_quadrato.svg diff --git a/NKC_WF/Images/Test11.svg b/NKC_WF/Images/Test11.svg deleted file mode 100644 index 6a88b42..0000000 --- a/NKC_WF/Images/Test11.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Part 1 - - - - - - Part 2 - - - Part 3 - - - - - - - - - - - \ No newline at end of file diff --git a/NKC_WF/Images/test_b.svg b/NKC_WF/Images/test_b.svg deleted file mode 100644 index ed10a30..0000000 --- a/NKC_WF/Images/test_b.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/NKC_WF/Images/test_bis.svg b/NKC_WF/Images/test_bis.svg deleted file mode 100644 index 2508d79..0000000 --- a/NKC_WF/Images/test_bis.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/NKC_WF/Images/test_quadrato.svg b/NKC_WF/Images/test_quadrato.svg deleted file mode 100644 index 047d55b..0000000 --- a/NKC_WF/Images/test_quadrato.svg +++ /dev/null @@ -1,658 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 2eba6f022218c8d03cae374dc124385ec9506d85 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:40:53 +0100 Subject: [PATCH 6/8] Aggiunto segnaposto "nodata" da usare... --- NKC_WF/Images/{test_no.svg => NoData.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename NKC_WF/Images/{test_no.svg => NoData.svg} (100%) diff --git a/NKC_WF/Images/test_no.svg b/NKC_WF/Images/NoData.svg similarity index 100% rename from NKC_WF/Images/test_no.svg rename to NKC_WF/Images/NoData.svg From de8c9659e2a8d919044bde28533c3050fed99177 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:41:06 +0100 Subject: [PATCH 7/8] Continuata selezione in unload macchina --- NKC_WF/NKC_WF.csproj | 6 +- NKC_WF/Web.config | 2 + NKC_WF/WebUserControls/cmp_svgViewer.ascx | 5 +- NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs | 56 +++++++++++++++++-- .../cmp_svgViewer.ascx.designer.cs | 9 +++ NKC_WF/site/MachineUnload.aspx | 1 + NKC_WF/site/MachineUnload.aspx.cs | 31 +++++++++- NKC_WF/site/MachineUnload.aspx.designer.cs | 9 +++ 8 files changed, 107 insertions(+), 12 deletions(-) diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index d2160fe..01d06bf 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -268,12 +268,8 @@ - - - - + - diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index c411594..afd11a6 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -63,6 +63,8 @@ + + diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_svgViewer.ascx index f08d903..dce4502 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx +++ b/NKC_WF/WebUserControls/cmp_svgViewer.ascx @@ -5,7 +5,7 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs index 25b6527..8d0234c 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs @@ -1,4 +1,6 @@ -using System; +using AppData; +using SteamWare; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -10,11 +12,57 @@ namespace NKC_WF.WebUserControls { public partial class cmp_svgViewer : System.Web.UI.UserControl { + /// + /// Batch corrente... + /// + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + doUpdate(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + } + public void doUpdate() + { + // recupero ID del foglio corrente + int sheetId = 0; + string answ = ""; + string filename = ""; + try + { + var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5); + if (sheetList.Count > 0) + { + sheetId = sheetList[0].SheetID; + // lo leggo da file + string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower(); + string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower(); + filename = sheetList[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); + // NON DOVREBEB SERVIRE MAP se è già share di rete... anche se è su MEDESIMA macchina + //filename = Server.MapPath(filename); + answ = File.ReadAllText(filename); + } + } + catch + { } + if (answ == "") + { + // leggo SVG DI DEFAULT che indica NON PRESENTE... + filename = Server.MapPath("~/Images/NoData.svg"); + answ = File.ReadAllText(filename); + } + // update componente svg! + svgTable.InnerHtml = answ; + } protected void Page_Load(object sender, EventArgs e) { - string filename = Server.MapPath("~/Images/test.svg"); - string answ = File.ReadAllText(filename); - svgTable.InnerHtml = answ; } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs index fa20881..24e6393 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs @@ -22,5 +22,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl svgTable; + + /// + /// Controllo hfBatchID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfBatchID; } } diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index 1a3a4a4..b9f9c12 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -4,6 +4,7 @@ +
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index aacc82a..f0b0701 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -7,7 +7,36 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + doUpdate(); + } + } + /// + /// 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() + { + //!!!FIXME!!! fare calcolo del VERO batch corrente... + BatchId = 242; // fixed x test! + // aggiorno child + cmp_svgViewer.BatchId = BatchId; } - } } \ No newline at end of file diff --git a/NKC_WF/site/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs index 7058661..139ec91 100644 --- a/NKC_WF/site/MachineUnload.aspx.designer.cs +++ b/NKC_WF/site/MachineUnload.aspx.designer.cs @@ -14,6 +14,15 @@ namespace NKC_WF public partial class MachineUnload { + /// + /// Controllo hfBatchID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + /// /// Controllo upnlDrawings. /// From a4403b49384cbd09e53bcc97dab0decc72cb155d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 18 Jan 2020 17:57:07 +0100 Subject: [PATCH 8/8] Abbozzata suddivisione in componenti x MachineUnload --- Jenkinsfile | 2 +- NKC_WF/NKC_WF.csproj | 42 +- NKC_WF/WebUserControls/cmp_MU_bins.ascx | 92 ++++ NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs | 17 + .../cmp_MU_bins.ascx.designer.cs | 17 + NKC_WF/WebUserControls/cmp_MU_carts.ascx | 92 ++++ NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs | 17 + .../cmp_MU_carts.ascx.designer.cs | 17 + NKC_WF/WebUserControls/cmp_MU_stats.ascx | 124 +++++ NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs | 17 + .../cmp_MU_stats.ascx.designer.cs | 17 + .../WebUserControls/cmp_MU_suggestions.ascx | 64 +++ .../cmp_MU_suggestions.ascx.cs | 17 + .../cmp_MU_suggestions.ascx.designer.cs | 17 + ...p_svgViewer.ascx => cmp_MU_svgViewer.ascx} | 2 +- ...iewer.ascx.cs => cmp_MU_svgViewer.ascx.cs} | 3 +- ...r.cs => cmp_MU_svgViewer.ascx.designer.cs} | 2 +- NKC_WF/site/MachineUnload.aspx | 443 +----------------- NKC_WF/site/MachineUnload.aspx.cs | 2 +- NKC_WF/site/MachineUnload.aspx.designer.cs | 40 +- 20 files changed, 604 insertions(+), 440 deletions(-) create mode 100644 NKC_WF/WebUserControls/cmp_MU_bins.ascx create mode 100644 NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_carts.ascx create mode 100644 NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_stats.ascx create mode 100644 NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_suggestions.ascx create mode 100644 NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs create mode 100644 NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.designer.cs rename NKC_WF/WebUserControls/{cmp_svgViewer.ascx => cmp_MU_svgViewer.ascx} (89%) rename NKC_WF/WebUserControls/{cmp_svgViewer.ascx.cs => cmp_MU_svgViewer.ascx.cs} (94%) rename NKC_WF/WebUserControls/{cmp_svgViewer.ascx.designer.cs => cmp_MU_svgViewer.ascx.designer.cs} (96%) diff --git a/Jenkinsfile b/Jenkinsfile index dbede6a..7233ce2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=195']) { + withEnv(['NEXT_BUILD_NUMBER=197']) { // env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.8.${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 01d06bf..634b45d 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -299,6 +299,10 @@ + + + + @@ -309,7 +313,7 @@ - + @@ -753,6 +757,34 @@ cmp_ML_ShDet.ascx + + cmp_MU_carts.ascx + ASPXCodeBehind + + + cmp_MU_carts.ascx + + + cmp_MU_stats.ascx + ASPXCodeBehind + + + cmp_MU_stats.ascx + + + cmp_MU_bins.ascx + ASPXCodeBehind + + + cmp_MU_bins.ascx + + + cmp_MU_suggestions.ascx + ASPXCodeBehind + + + cmp_MU_suggestions.ascx + cmp_numRow.ascx ASPXCodeBehind @@ -823,12 +855,12 @@ cmp_stackNextloading.ascx - - cmp_svgViewer.ascx + + cmp_MU_svgViewer.ascx ASPXCodeBehind - - cmp_svgViewer.ascx + + cmp_MU_svgViewer.ascx cmp_taktList.ascx diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx new file mode 100644 index 0000000..e8553a2 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -0,0 +1,92 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_bins.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_bins" %> + +
+
BINS
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CodD/T%
BIN0000850/50100%
BIN0000950/50100%
BIN0001050/50100%
BIN0001150/50100%
BIN0001212/5024%
BIN0001310/5020%
BIN000141/502%
BIN000150/500%
BIN000160/500%
BIN000170/500%
BIN000180/500%
BIN000190/500%
BIN000200/500%
BIN000210/500%
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs new file mode 100644 index 0000000..c1caa0c --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_bins.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_MU_bins : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs new file mode 100644 index 0000000..0c0dfba --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_bins.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_MU_bins + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx new file mode 100644 index 0000000..c5a955d --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -0,0 +1,92 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_carts.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_carts" %> + +
+
CARTS
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CodD/T%
CR0000750/50100%
CR0000850/50100%
CR0000950/50100%
CR0001050/50100%
CR0001150/50100%
CR0001212/5024%
CR0001310/5020%
CR000140/500%
CR000150/500%
CR000160/500%
CR000170/500%
CR000180/500%
CR000190/500%
CR000200/500%
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs new file mode 100644 index 0000000..99da0a5 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_carts.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_MU_carts : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs new file mode 100644 index 0000000..904580f --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_carts.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_MU_carts + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx b/NKC_WF/WebUserControls/cmp_MU_stats.ascx new file mode 100644 index 0000000..4ece5a3 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx @@ -0,0 +1,124 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_stats.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_stats" %> + + +
+
+
+
BINS
+
+ + + + + + + + + + + + + + + +
WAITWIPDONE
1235
+
+
+
+
+
+
SHEET SH00000123
+
+ + + + + + + + + + + + + + + +
DONETOTRATIO
52520%
+
+
+
+
+
+
+
+
BUNK ST00000A2
+
+ + + + + + + + + + + + + + + +
DONETOTRATIO
31225%
+
+
+
+
+
+
+
+
SHIFT B20190916.0
+
+ + + + + + + + + + + + + + + +
DONETOTRATIO
2540%
+
+
+
+
+
+
CARTS
+
+ + + + + + + + + + + + + + + +
WAITWIPDONE
2426
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs new file mode 100644 index 0000000..c6cf7bf --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_stats.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_MU_stats : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs new file mode 100644 index 0000000..93aede4 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_stats.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_MU_stats + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx new file mode 100644 index 0000000..d250e45 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx @@ -0,0 +1,64 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_suggestions.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_suggestions" %> + +
+
+
+
TO BIN
+
+
+
+ BIN00010 +
+
+ +
+
+ IT000002 +
+
+
+
+
+
+
+
+
+
+
+
+
+
TO CART
+
+
+
+ IT000001 +
+
+ +
+
+ CR00007 +
+
+
+
+
+
+
+
TO CART
+
+
+
+ IT000003 +
+
+ +
+
+ CR00012 +
+
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs new file mode 100644 index 0000000..cc34ba7 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.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_MU_suggestions : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.designer.cs new file mode 100644 index 0000000..827bf22 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.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_MU_suggestions + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx similarity index 89% rename from NKC_WF/WebUserControls/cmp_svgViewer.ascx rename to NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx index dce4502..6696e5c 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_svgViewer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_svgViewer" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_svgViewer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_svgViewer" %>
diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs similarity index 94% rename from NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs rename to NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 8d0234c..b0b2b7b 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -10,7 +10,7 @@ using System.Web.UI.WebControls; namespace NKC_WF.WebUserControls { - public partial class cmp_svgViewer : System.Web.UI.UserControl + public partial class cmp_MU_svgViewer : System.Web.UI.UserControl { /// /// Batch corrente... @@ -37,6 +37,7 @@ namespace NKC_WF.WebUserControls string filename = ""; try { + // FORSE 5/5?!? var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5); if (sheetList.Count > 0) { diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs similarity index 96% rename from NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs rename to NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs index 24e6393..131f885 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs @@ -11,7 +11,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_svgViewer + public partial class cmp_MU_svgViewer { /// diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index b9f9c12..e6f488f 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -1,450 +1,37 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineUnload.aspx.cs" Inherits="NKC_WF.MachineUnload" %> -<%@ Register Src="~/WebUserControls/cmp_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_svgViewer" %> +<%@ Register Src="~/WebUserControls/cmp_MU_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_MU_svgViewer" %> +<%@ Register Src="~/WebUserControls/cmp_MU_stats.ascx" TagPrefix="uc1" TagName="cmp_MU_stats" %> +<%@ Register Src="~/WebUserControls/cmp_MU_suggestions.ascx" TagPrefix="uc1" TagName="cmp_MU_suggestions" %> +<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %> +<%@ Register Src="~/WebUserControls/cmp_MU_carts.ascx" TagPrefix="uc1" TagName="cmp_MU_carts" %> + + + + - +

<%: traduci("MachineUnload") %>

-
-
-
-
BINS
-
- - - - - - - - - - - - - - - -
WAITWIPDONE
1235
-
-
-
-
-
-
SHEET SH00000123
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
52520%
-
-
-
-
-
-
-
-
BUNK ST00000A2
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
31225%
-
-
-
-
-
-
-
-
SHIFT B20190916.0
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
2540%
-
-
-
-
-
-
CARTS
-
- - - - - - - - - - - - - - - -
WAITWIPDONE
2426
-
-
-
-
+
-
-
BINS
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CodD/T%
BIN0000750/50100%
BIN0000850/50100%
BIN0000950/50100%
BIN0001050/50100%
BIN0001150/50100%
BIN0001212/5024%
BIN0001310/5020%
BIN000141/502%
BIN000150/500%
BIN000160/500%
BIN000170/500%
BIN000180/500%
BIN000190/500%
BIN000200/500%
BIN000210/500%
BIN000220/500%
BIN000230/500%
BIN000240/500%
BIN000250/500%
BIN000260/500%
-
-
-
-
+
- - <%-- - --%> +
-
-
CARTS
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CodD/T%
CR0000650/50100%
CR0000750/50100%
CR0000850/50100%
CR0000950/50100%
CR0001050/50100%
CR0001150/50100%
CR0001212/5024%
CR0001310/5020%
CR000140/500%
CR000150/500%
CR000160/500%
CR000170/500%
CR000180/500%
CR000190/500%
CR000200/500%
CR000210/500%
CR000220/500%
CR000230/500%
CR000240/500%
CR000250/500%
-
-
-
-
-
-
-
-
-
-
TO BIN
-
-
-
- BIN00010 -
-
- -
-
- IT000002 -
-
-
-
-
-
-
-
-
-
-
-
-
-
TO CART
-
-
-
- IT000001 -
-
- -
-
- CR00007 -
-
-
-
-
-
-
-
TO CART
-
-
-
- IT000003 -
-
- -
-
- CR00012 -
-
-
-
+
+
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index f0b0701..a097a87 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -36,7 +36,7 @@ namespace NKC_WF //!!!FIXME!!! fare calcolo del VERO batch corrente... BatchId = 242; // fixed x test! // aggiorno child - cmp_svgViewer.BatchId = BatchId; + cmp_MU_svgViewer.BatchId = BatchId; } } } \ No newline at end of file diff --git a/NKC_WF/site/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs index 139ec91..14b0e32 100644 --- a/NKC_WF/site/MachineUnload.aspx.designer.cs +++ b/NKC_WF/site/MachineUnload.aspx.designer.cs @@ -33,12 +33,48 @@ namespace NKC_WF protected global::System.Web.UI.UpdatePanel upnlDrawings; /// - /// Controllo cmp_svgViewer. + /// Controllo cmp_MU_stats. /// /// /// 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_svgViewer cmp_svgViewer; + protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats; + + /// + /// Controllo cmp_MU_bins. + /// + /// + /// 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_MU_bins cmp_MU_bins; + + /// + /// Controllo cmp_MU_svgViewer. + /// + /// + /// 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_MU_svgViewer cmp_MU_svgViewer; + + /// + /// Controllo cmp_MU_carts. + /// + /// + /// 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_MU_carts cmp_MU_carts; + + /// + /// Controllo cmp_MU_suggestions. + /// + /// + /// 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_MU_suggestions cmp_MU_suggestions; } }