diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 1f9aa0e4..e7212f06 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Model/DatabaseModels/NcMagazinePositionModel.cs b/Step.Model/DatabaseModels/NcMagazinePositionModel.cs index f9a4a233..8078a91e 100644 --- a/Step.Model/DatabaseModels/NcMagazinePositionModel.cs +++ b/Step.Model/DatabaseModels/NcMagazinePositionModel.cs @@ -26,7 +26,7 @@ namespace Step.Model.DatabaseModels { MagazineId = obj.MagazineId, PositionId = (ushort)obj.PositionId, - Disabled = obj.Disabled ? (byte)1 : (byte)0, + // Disabled = obj.Disabled ? (byte)1 : (byte)0, Type = obj.Type }; } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 1fdcca50..4da543c3 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -1562,7 +1562,7 @@ namespace Step.NC magazineStatus = new DTOMagazineActionModel(); MagazineActionModel libModel = new MagazineActionModel(); // Read status from NC - CmsError cmsError = numericalControl.TOOLS_GetMagazinesStatus(ref libModel); + CmsError cmsError = numericalControl.TOOLS_RMagazineAction(ref libModel); if (cmsError.IsError()) return cmsError; @@ -2464,7 +2464,7 @@ namespace Step.NC Value = new DTOScadaValueModel() { IsVisible = Convert.ToBoolean(val), - Value = Convert.ToBoolean(val) + Value = val2 } }); } @@ -2479,6 +2479,7 @@ namespace Step.NC private SCADA_MEM_TYPE GetMemTypeFromString(string memType) { + memType = memType.ToUpper(); switch (memType) { case "BOOL": diff --git a/Step/Controllers/WebApi/ScadaController.cs b/Step/Controllers/WebApi/ScadaController.cs index 25404c9c..e654cb63 100644 --- a/Step/Controllers/WebApi/ScadaController.cs +++ b/Step/Controllers/WebApi/ScadaController.cs @@ -17,7 +17,7 @@ namespace Step.Controllers.WebApi [Route("list")] public IHttpActionResult GetScadaList() { - using (NcHandler ncHandler = new NcHandler()) + using (NcHandler ncHandler = new NcHandler()) { ncHandler.Connect(); CmsError cmsError = ncHandler.ReadScadaData(out List values); @@ -35,7 +35,6 @@ namespace Step.Controllers.WebApi } } - [Route("production/list")] public IHttpActionResult GetProductionPageList() { diff --git a/Step/wwwroot/src/config.ts b/Step/wwwroot/src/config.ts index d9fbf31b..07c70d37 100644 --- a/Step/wwwroot/src/config.ts +++ b/Step/wwwroot/src/config.ts @@ -5,8 +5,8 @@ export const CONFIGURATION_DEMO = ""; // stabilise quale configurazione deve leggere il client per andare in DEBUG -export const DEBUG_CONFIGURATION = CONFIGURATION_SIEMENS; +export const DEBUG_CONFIGURATION = CONFIGURATION_OSAI; // stabilisce se leggere la configurazione dal server o // se utilizzare la configurazione locale -export const USE_RUNTIME_CONFIGURATION = false; \ No newline at end of file +export const USE_RUNTIME_CONFIGURATION = true; \ No newline at end of file