From c9e78fca04024395024f8f99ca34a2696877e61f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 21 Apr 2017 10:49:17 +0200 Subject: [PATCH] aggiunto check presenza persistenceDataLayer x FANUC pre needSave --- MTC_Adapter/MTC_Adapter/AdapterFanuc.cs | 37 +++++++++++++------------ MTC_Adapter/MTC_Adapter/AdapterOsai.cs | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs index 80afece..c2f3bf8 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs @@ -1043,24 +1043,27 @@ namespace MTC_Adapter } } - // verifica se si debba aggiornare XML (e salva in adapter dati vari) - needSave = procOreMaccOn(needSave); - needSave = procOreMaccLav(needSave); - needSave = procProgrName(needSave); - needSave = procPartId(needSave); - needSave = procPzProd(needSave); - needSave = procGiriTotUnOp(needSave); - needSave = procNumCU(needSave); - needSave = procMovTotAssi(needSave); - needSave = procAccTimeAssi(needSave); - needSave = procNumInvAssi(needSave); - needSave = procVacPump(needSave); - needSave = procVacAct(needSave); - needSave = procLubro(needSave); + if (persistenceLayer != null) + { + // verifica se si debba aggiornare XML (e salva in adapter dati vari) + needSave = procOreMaccOn(needSave); + needSave = procOreMaccLav(needSave); + needSave = procProgrName(needSave); + needSave = procPartId(needSave); + needSave = procPzProd(needSave); + needSave = procGiriTotUnOp(needSave); + needSave = procNumCU(needSave); + needSave = procMovTotAssi(needSave); + needSave = procAccTimeAssi(needSave); + needSave = procNumInvAssi(needSave); + needSave = procVacPump(needSave); + needSave = procVacAct(needSave); + needSave = procLubro(needSave); - // salvo se necessario! - if (needSave) parentForm.persistData(); - // ------------------------------------------- + // salvo se necessario! + if (needSave) parentForm.persistData(); + // ------------------------------------------- + } } diff --git a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs index e5b6d90..197d70c 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs @@ -1308,8 +1308,8 @@ namespace MTC_Adapter // salvo se necessario! if (needSave) parentForm.persistData(); + // ------------------------------------------- } - // ------------------------------------------- } ///