From 16cb7f97f8378a6004ea76c55dbc55206ce5f3cd Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sun, 26 Jan 2020 10:35:05 +0100 Subject: [PATCH 1/4] Inizio fix area lettura disegni... --- Jenkinsfile | 18 ------------------ NKC_WF/Web.Release.config | 7 ++++--- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f840ea5..5253fbf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,28 +84,10 @@ pipeline { sleep 3 } }, - // SITE_IIS01: { - // if(env.enableIIS01 == "Y") - // { - // sleep 3 - // // SITE - // bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj" - // sleep 1 - // } - // }, failFast: false) } else if (env.BRANCH_NAME == "develop") { parallel ( - // SITE_IIS02: { - // if(env.enableIIS02 == "Y") - // { - // sleep 1 - // // SITE - // bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj" - // sleep 3 - // } - // }, SITE_IIS01: { if(env.enableIIS01 == "Y") { diff --git a/NKC_WF/Web.Release.config b/NKC_WF/Web.Release.config index 6831f9c..07351d3 100644 --- a/NKC_WF/Web.Release.config +++ b/NKC_WF/Web.Release.config @@ -5,11 +5,12 @@ - + - - + + + From 3caba4ab6c2750ca55119fecc5c5fca537ccd907 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sun, 26 Jan 2020 11:11:14 +0100 Subject: [PATCH 2/4] semplificati metodi visualizzazione SVG --- NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx | 1 - .../WebUserControls/cmp_MU_svgViewer.ascx.cs | 59 ------------------- .../cmp_MU_svgViewer.ascx.designer.cs | 9 --- NKC_WF/site/MachineUnload.aspx.cs | 14 ++++- 4 files changed, 13 insertions(+), 70 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx index 2fb9c67..f2bca66 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx @@ -22,6 +22,5 @@ - \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 4bb2091..25b7a0f 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -12,24 +12,6 @@ namespace NKC_WF.WebUserControls { public partial class cmp_MU_svgViewer : System.Web.UI.UserControl { - /// - /// Batch corrente... - /// - public int BatchId - { - set - { - hfBatchID.Value = value.ToString(); - calcSheet(); - doUpdate(); - } - get - { - int answ = 0; - int.TryParse(hfBatchID.Value, out answ); - return answ; - } - } /// /// Foglio corrente... /// @@ -61,53 +43,12 @@ namespace NKC_WF.WebUserControls hfFilename.Value = value; } } - protected void calcSheet() - { - // base path - string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower(); - string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower(); - //SOLO SE ho batch != 0... - if (BatchId > 0) - { - // FORSE 5/5?!? - var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5); - if (sheetList.Count > 0) - { - SheetId = sheetList[0].SheetID; -#if false - 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); -#endif - } - } -#if false - else if (SheetId > 0) - { - filename = DataLayer.man.taSHL.getByItemID(SheetId)[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); - } -#endif - } public void doUpdate() { // recupero ID del foglio corrente string answ = ""; try { -#if false - // FORSE 5/5?!? - 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); - } -#endif string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower(); string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower(); var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs index e9c5721..52b6bbd 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs @@ -23,15 +23,6 @@ namespace NKC_WF.WebUserControls /// 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; - /// /// Controllo hfSheetId. /// diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index 39ceaea..1a21799 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -38,9 +38,21 @@ namespace NKC_WF BatchId = 242; // fixed x test! // aggiorno child cmp_MU_stats.BatchId = BatchId; - cmp_MU_svgViewer.BatchId = BatchId; cmp_MU_bins.BatchId = BatchId; cmp_MU_carts.BatchId = BatchId; + // calcolo sheet x SVG viewer... + int SheetId = 0; + //SOLO SE ho batch != 0... + if (BatchId > 0) + { + // FORSE 5/5?!? + var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5); + if (sheetList.Count > 0) + { + SheetId = sheetList[0].SheetID; + } + } + cmp_MU_svgViewer.SheetId = SheetId; } } } \ No newline at end of file From 7055d3a7c124e3fb57fef0074e1c05a1d96d8636 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sun, 26 Jan 2020 11:43:17 +0100 Subject: [PATCH 3/4] Ancora fix x resettare vecchi NESTING in caso di ripetizione --- AppData/ComLib.cs | 12 +++++++++++- NKC_WF/Controllers/BatchProcController.cs | 14 ++++++++------ NKC_WF/WebUserControls/cmp_BP_bunkList.ascx | 7 ++++++- NKC_WF/WebUserControls/cmp_MU_stats.ascx | 10 +++++----- NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs | 6 ++++-- NKC_WF/site/BatchPreview.aspx | 6 +++--- NKC_WF/site/DBG_QRCode_Unload.aspx | 3 --- NKC_WF/site/MachineUnload.aspx | 6 +++--- 8 files changed, 40 insertions(+), 24 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 2bb8917..34c9a53 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -738,7 +738,17 @@ namespace AppData return answ; } /// - /// Salvo dati su PartList ricevuti da Nesting (COMPETATO) + /// Resetto i dati PRIMA di salvare i nuovi dati dal nesting + /// + /// + /// + public static void resetPrevDataFromNesting(int BatchID) + { + //elimino dati child MA NON il batch... + DataLayer.man.taBL.deleteTree(BatchID, 0); + } + /// + /// Salvo dati Bunks/Sheets/Parts ricevuti da Nesting (COMPETATO) /// /// /// diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index c08bf1b..c223ff8 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -104,7 +104,7 @@ namespace NKC_WF.Controllers // deserializzo. baseNestAnsw batchProcAnsw = JsonConvert.DeserializeObject(content); - // se ho errori inizioa salvarli... + // se ho errori inizio a salvarli... if (batchProcAnsw.ErrorList.Count > 0) { // procedura idempotente: elimino eventuali dati della "busta" precedente... @@ -122,8 +122,8 @@ namespace NKC_WF.Controllers /************************************************* * IN BASE al tipo di risposta saprò se * - è BatchReq / OfflineOrder - * - è stima iniziale o dettaglio (x batch) - * - si tratta di una stima di validazione o meno... + * - è stima iniziale o NEST dettagliato + * - si tratta di una stima di validazione ITEM ... * *************************************************/ if (batchProcAnsw.OrderType == oType.BatchRequest) @@ -137,7 +137,7 @@ namespace NKC_WF.Controllers // 2020.01.16 salvo su mongoDb la risposta... ComLib.man.saveEstAnsw(rispStima); - // recupero info sul batch /KIT specifico x capire se sia di tipo "validation" + // recupero info sul batch / KIT specifico x capire se sia di tipo "validation" bool isValidation = false; var tabOrd = DataLayer.man.taOL.getByBatch(rispStima.BatchID); if (tabOrd.Count > 0) @@ -255,17 +255,19 @@ namespace NKC_WF.Controllers bStatus = 2; break; } - // SALVO info riguardo al batch completato - DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60); // aggiorno il resto SOLO SE status == completo... if (rispNest.ProcessStatus == procStatus.completed) { + // resetto le precedenti elaborazioni: elimino dati child MA NON il batch... + DataLayer.man.taBL.deleteTree(rispNest.BatchID, 0); // salvo info riguardo ai vari Bunk / Sheets / Items... ComLib.updateBunksFromNesting(rispNest.BatchID, rispNest.BunkList); // salvo info x CART & BINS previsti ComLib.updateBinsFromNesting(rispNest.BatchID, rispNest.BinList); ComLib.updateCartsFromNesting(rispNest.BatchID, rispNest.CartList); } + // SALVO info riguardo al batch completato + DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60); // registro OK answ = "OK"; } diff --git a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx index ec850c4..05377b7 100644 --- a/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx +++ b/NKC_WF/WebUserControls/cmp_BP_bunkList.ascx @@ -19,7 +19,12 @@ - + + +
+ + +
diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx b/NKC_WF/WebUserControls/cmp_MU_stats.ascx index cff9501..d463d19 100644 --- a/NKC_WF/WebUserControls/cmp_MU_stats.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx @@ -5,23 +5,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 25b7a0f..77ee4b6 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -47,10 +47,10 @@ namespace NKC_WF.WebUserControls { // recupero ID del foglio corrente string answ = ""; + string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower(); + string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower(); try { - string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower(); - string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower(); var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); if (tabSheets.Count > 0) { @@ -62,6 +62,8 @@ namespace NKC_WF.WebUserControls { } if (answ == "") { + // loggo... + logger.lg.scriviLog($"SVG not found | filename: {filename} | baseOrig: {baseOrig} | baseCurr: {baseCurr} | used default SVG"); // leggo SVG DI DEFAULT che indica NON PRESENTE... filename = Server.MapPath("~/Images/NoData.svg"); answ = File.ReadAllText(filename); diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx index 3c06a36..c0df410 100644 --- a/NKC_WF/site/BatchPreview.aspx +++ b/NKC_WF/site/BatchPreview.aspx @@ -6,15 +6,15 @@ -
-
+
+

Batch preview - start | pause | stop

-
+
diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx b/NKC_WF/site/DBG_QRCode_Unload.aspx index f783b8f..9b653e3 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx @@ -4,9 +4,6 @@ <%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %> <%@ Register Src="~/WebUserControls/cmp_MU_Items.ascx" TagPrefix="uc1" TagName="cmp_MU_Items" %> - - - diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index e83fc30..e95aec6 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -17,13 +17,13 @@
-
+
-
+
-
+
From fdb5e44ae2ca4efc7008ff4a4bd230cd7776d406 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sun, 26 Jan 2020 11:43:32 +0100 Subject: [PATCH 4/4] Update vers numb --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5253fbf..2181ebe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=223']) { + withEnv(['NEXT_BUILD_NUMBER=225']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')