Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/MoonPro.net into develop

MP-IO/Controllers/BENCH.cs

@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Web.Mvc;
-
 using MP_IO.Interfaces;
 
 namespace MP_IO.Controllers

MP-IO/Controllers/HomeController.cs

@@ -1,11 +1,10 @@
-using System;
+using MP_IO.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 
-using MP_IO.Interfaces;
-
 namespace MP_IO.Controllers
 {
     public class HomeController : Controller, IHomeService

MP-IO/Controllers/IOBController.cs

@@ -1,6 +1,7 @@
 using MagData;
 using MapoDb;
 using MapoSDK;
+using MP_IO.Interfaces;
 using Newtonsoft.Json;
 using StackExchange.Redis;
 using SteamWare;

MP-IO/Interfaces/IHomeService.cs

@@ -1,3 +1,6 @@
+
+using System.Web.Mvc;
+
 namespace MP_IO.Interfaces
 {
     public interface IHomeService
@@ -5,6 +8,6 @@ namespace MP_IO.Interfaces
         /// <summary>
         /// GET: Home
         /// </summary>
-        string Index();
+        RedirectResult Index();
     }
 }

MP-IO/Interfaces/IIOBService.cs

@@ -365,6 +365,7 @@ namespace MP_IO.Interfaces
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
+        string getOdlAtDate(string id, string dateRif);
         string getOptPar(string id);
 
         /// <summary>
@@ -373,6 +374,8 @@ namespace MP_IO.Interfaces
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
+        string getPODL(string id, int idxPODL);
+        string getPOdlAct(string id);
         string getPOdlNext(string id);
 
         /// <summary>
@@ -381,38 +384,33 @@ namespace MP_IO.Interfaces
         /// <param name="id"></param>
         /// <returns></returns>
         string getTask2Exe(string id);
-
-        /// <summary>
-        /// Disabilita/Abilita macchina:
-        /// GET: IOB/insDisab/SIMUL_03?stato=true
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="stato"></param>
-        /// <returns></returns>
-        bool insDisab(string id, bool stato);
-
-        /// <summary>
-        /// Processa input evento:
-        /// GET: IOB/processInput/SIMUL_03?valore=123&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="valore"></param>
-        /// <param name="dtEve"></param>
-        /// <param name="dtCurr"></param>
-        /// <param name="cnt"></param>
-        /// <returns></returns>
-        string processInput(string id, int valore, string dtEve, string dtCurr, string cnt);
-
-        /// <summary>
-        /// SET programma/articolo/commissione x macchina:
-        /// GET: IOB/setProg/SIMUL_03?prog=P0001&art=ART001&comm=ODL001
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="prog"></param>
-        /// <param name="art"></param>
-        /// <param name="comm"></param>
-        /// <param name="disabKA">Disabilitazione scrittura record KeepAlive</param>
-        /// <returns></returns>
-        string setProg(string id, string prog, string art, string comm, string disabKA = "false");
+        string getXdlNum(string id, string CodXdl = "");
+        string Index();
+        string input(string id, string valore, string dtEve, string dtCurr, string cnt);
+        string liveJson(string id);
+        string liveRec(string id, string liveData);
+        string rawTransfJson(string id);
+        string remOptPar(string id, string pName);
+        string remTask2Exe(string id, string taskName);
+        string resetCurrODL(string id);
+        string saveConf(string id);
+        string saveConfYaml(string id);
+        string saveDataItems(string id);
+        string saveMachineIobConf(string id);
+        string savePzCountInc(string id, string qty);
+        string savePzCountIncAtDate(string id, string qty, string dtEve = "", string dtCurr = "");
+        string sendAlarmBankUpdate(string id, string memAddr, int index, int currStatus);
+        string sendReboot(string id, string mac);
+        string sendRebootGateway(string GWIP);
+        string setCounter(string id, string counter);
+        string setM2IOB(string id, string IOB_name);
+        string setObjItems(string id);
+        string setRedisHashDict(string id);
+        string slog(string id);
+        string takeFlogSnapshot(string id);
+        string ulog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt, string matrOpr, string label, string valNum);
+        string ulogJson(string id);
+        string uploadFile(string id);
+        string upsertObjItems(string id);
     }
 }

MP-IO/MP-IO.csproj

@@ -350,6 +350,9 @@
     <Compile Include="inputIOB.aspx.designer.cs">
       <DependentUpon>inputIOB.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Interfaces\IBENCHService.cs" />
+    <Compile Include="Interfaces\IHomeService.cs" />
+    <Compile Include="Interfaces\IIOBService.cs" />
     <Compile Include="lastUpdate.aspx.cs">
       <DependentUpon>lastUpdate.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>