From df7fa95a627951992ecde18e3756b5c666c46d85 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 8 Mar 2024 17:19:02 +0100 Subject: [PATCH] Miglioramento fase di log in caso errori dal PROD --- NKC_WF/Controllers/SheetController.cs | 103 +++++++++++++++----------- 1 file changed, 58 insertions(+), 45 deletions(-) diff --git a/NKC_WF/Controllers/SheetController.cs b/NKC_WF/Controllers/SheetController.cs index c2d1cbf..0b50a10 100644 --- a/NKC_WF/Controllers/SheetController.cs +++ b/NKC_WF/Controllers/SheetController.cs @@ -142,28 +142,30 @@ namespace NKC_WF.Controllers return answ; } - - /// - /// Effettua la chiamata di update x SINGOLO foglio - /// - /// - /// *********************************** - /// METODI PUT - /// - /// per abilitare è necessario agire sulla conf di IIS: - /// - /// - modificare il file applicationHost.config che si trova in C:\Windows\System32\inetsrv\config - /// - disinstallare webDav oppure commentare le righe - /// - /// - /// - /// - aggiungere PUT/DELETE a handler: - /// - /// - /// - /// *************************************/ - /// - /// Oggetto con Elenco fogli da aggiornare + /// Effettua la chiamata di update x SINGOLO foglio + /// + /// + /// *********************************** METODI PUT + /// + /// per abilitare è necessario agire sulla conf di IIS: + /// + /// - modificare il file applicationHost.config che si trova in C:\Windows\System32\inetsrv\config + /// - disinstallare webDav oppure commentare le righe + /// + /// - aggiungere PUT/DELETE a handler: + /// + /// *************************************/ Oggetto con + /// Elenco fogli da aggiornare /// PUT: api/Sheet/machine_ID [HttpPut] public void Put(SheetWorkList sheetUpdated) @@ -250,7 +252,6 @@ namespace NKC_WF.Controllers #endregion Private Fields - #region Private Methods /// @@ -266,47 +267,59 @@ namespace NKC_WF.Controllers if (!fixSheet.Waiting || !fixSheet.Done) { // calcolo SE sia in errore secondo i 4 punti di controllo work/unload - if (fixSheet.Unloading.OkE && dfUnlEnd) + if (fixSheet.Unloading.OkE) { // loggo LogSheetError(fixSheet); - // sistemo... - fixSheet.Unloading.DtStart = fixSheet.Unloading.OkS ? fixSheet.Unloading.DtStart : fixSheet.Unloading.DtEnd; - fixSheet.Machining.DtEnd = fixSheet.Machining.OkE ? fixSheet.Machining.DtEnd : fixSheet.Unloading.DtEnd; - fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + if (dfUnlEnd) + { + // sistemo... + fixSheet.Unloading.DtStart = fixSheet.Unloading.OkS ? fixSheet.Unloading.DtStart : fixSheet.Unloading.DtEnd; + fixSheet.Machining.DtEnd = fixSheet.Machining.OkE ? fixSheet.Machining.DtEnd : fixSheet.Unloading.DtEnd; + fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + } } - else if (fixSheet.Unloading.OkS && dfUnlStart && (!fixSheet.Printing.Done || !fixSheet.Machining.Done)) + else if (fixSheet.Unloading.OkS && (!fixSheet.Printing.Done || !fixSheet.Machining.Done)) { // loggo LogSheetError(fixSheet); - // sistemo... - fixSheet.Machining.DtEnd = fixSheet.Machining.OkE ? fixSheet.Machining.DtEnd : fixSheet.Unloading.DtEnd; - fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + if (dfUnlStart) + { + // sistemo... + fixSheet.Machining.DtEnd = fixSheet.Machining.OkE ? fixSheet.Machining.DtEnd : fixSheet.Unloading.DtEnd; + fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + } } - else if (fixSheet.Machining.OkE && dfWrkEnd && (!fixSheet.Printing.Done || !fixSheet.Machining.Done)) + else if (fixSheet.Machining.OkE && (!fixSheet.Printing.Done || !fixSheet.Machining.Done)) { // loggo LogSheetError(fixSheet); - // sistemo... - fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + if (dfWrkEnd) + { + // sistemo... + fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + } } - else if (fixSheet.Machining.OkS && dfWrkStart && !fixSheet.Printing.Done) + else if (fixSheet.Machining.OkS && !fixSheet.Printing.Done) { // loggo LogSheetError(fixSheet); - // sistemo... - fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; - fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + if (dfWrkStart) + { + // sistemo... + fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd; + fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd; + } } }