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 { }