diff --git a/MP.MONO.ADAPTER.OPC/UAClient.cs b/MP.MONO.ADAPTER.OPC/UAClient.cs
index d43ac4e..701fed5 100644
--- a/MP.MONO.ADAPTER.OPC/UAClient.cs
+++ b/MP.MONO.ADAPTER.OPC/UAClient.cs
@@ -199,17 +199,7 @@ namespace MP.MONO.ADAPTER.OPC
browser.NodeClassMask = (int)NodeClass.Object | (int)NodeClass.Variable;
browser.ReferenceTypeId = ReferenceTypeIds.HierarchicalReferences;
- //NodeId nodeToBrowse = ObjectIds.Server;
- //NodeId nodeToBrowse = new NodeId("ns=4;i=5001");
NodeId nodeToBrowse = new NodeId(browsePath);
- //nodeToBrowse = ObjectIds.Server;
- //nodeToBrowse = new NodeId("Calibratrice_L1", 4);
- //nodeToBrowse = new NodeId("Dati_Mes", 4);
- //nodeToBrowse = new NodeId(5001, 2);
- //nodeToBrowse = new NodeId("ns=4;s=NxController");
- //nodeToBrowse = new NodeId("ns=4;s=Dati_Mes");
- //nodeToBrowse = new NodeId("NxController.GlobalVars", 4);
- //nodeToBrowse = new NodeId("Dati_Mes", 4);
// Call Browse service
lg.Trace($"Browsing {nodeToBrowse} node...");
diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 1af18da..1163a19 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2918
+ 1.2.2303.3008
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 6c0cfba..f738928 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2303.2918
+ Version: 1.2.2303.3008
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 4236344..f4b8ff5 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2918
+1.2.2303.3008
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index 5b6feac..96daab2 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2918
+ 1.2.2303.3008
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.Core/Constants.cs b/MP.MONO.Core/Constants.cs
index c4c0971..ebd48e9 100644
--- a/MP.MONO.Core/Constants.cs
+++ b/MP.MONO.Core/Constants.cs
@@ -51,6 +51,7 @@ namespace MP.MONO.Core
public static readonly string ALARM_RECEIV_KEY = $"{BASE_HASH}:Current:AlarmsReceived";
public static readonly string ALARM_PEND_KEY = $"{BASE_HASH}:Current:AlarmsPendingClose";
public static readonly string EVENT_LOG_CURR_KEY = $"{BASE_HASH}:Current:EventsLog";
+ public static readonly string MACH_DAY_DUR_CURR_KEY = $"{BASE_HASH}:Current:MachDayDur";
public static readonly string MACH_STATS_CURR_KEY = $"{BASE_HASH}:Current:MachStats";
public static readonly string MAINT_STATS_CURR_KEY = $"{BASE_HASH}:Current:Maintenance";
public static readonly string PARAMS_ACT_KEY = $"{BASE_HASH}:Current:ParamsVal";
@@ -72,7 +73,8 @@ namespace MP.MONO.Core
// REDIS Channels messaggi (verso UI)
public static readonly string ACT_LOG_M_QUEUE = $"ActivityLog";
public static readonly string ALARM_M_QUEUE = $"Alarms";
- public static readonly string EVENT_LOG_M_QUEUE = $"EventsLog";
+ public static readonly string EVENT_LOG_M_QUEUE = $"EventsLog";
+ public static readonly string MACH_DAY_DUR_M_QUEUE = $"MachDayDur";
public static readonly string MACH_STATS_M_QUEUE = $"MachStats";
public static readonly string MAINT_STATS_M_QUEUE = $"Maintenance";
public static readonly string PARAMS_M_QUEUE = $"Params";
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 02a0943..0f5d266 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2918
+ 1.2.2303.3009
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index cf0d0b4..3db8a06 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -114,6 +114,7 @@ Random rand = new Random();
* ----------------------------------------------------------------*/
MessagePipe mpStatusParetoSendPipe = new MessagePipe(redisConn, Constants.STATUS_PAR_QUEUE);
MessagePipe mpStatsSendPipe = new MessagePipe(redisConn, Constants.MACH_STATS_M_QUEUE);
+MessagePipe mpDayDurSendPipe = new MessagePipe(redisConn, Constants.MACH_DAY_DUR_M_QUEUE);
Thread threadStatus = new Thread(calcParetoStatus);
threadStatus.Start();
Thread threadDbMaint = new Thread(dbMaintenance);
@@ -533,7 +534,7 @@ void calcParetoStatus()
// recupero pareto da DB
var newStatus = dbController.ParetoStatusMach(MachineId, inizio, fine);
// riordino e aggiungo i dati di status...
- var statusDTO = machineStatusConf
+ var statusAllDTO = machineStatusConf
.Select(x => new ParetoStatusDTO()
{
CodStatus = $"MS_{x.MStatusID:000}",
@@ -546,7 +547,7 @@ void calcParetoStatus()
// ora ciclo tra i valori trovati...
foreach (var item in newStatus)
{
- var recStatus = statusDTO.Where(x => x.CodStatus == item.CodStatus).FirstOrDefault();
+ var recStatus = statusAllDTO.Where(x => x.CodStatus == item.CodStatus).FirstOrDefault();
if (recStatus != null)
{
recStatus.TotDuration = item.TotDuration;
@@ -554,16 +555,25 @@ void calcParetoStatus()
}
// salvo i dati insieme alla traduzione degli stati relativa...
- statusDTO = statusDTO
+ var statusActDTO = statusAllDTO
.Where(x => x.TotDuration > 0)
.OrderByDescending(x => x.TotDuration).ToList();
- // serializzo e salvo
- string rawData = JsonConvert.SerializeObject(statusDTO);
+ // serializzo e salvo i valori x pareto
+ string rawData = JsonConvert.SerializeObject(statusActDTO);
mpStatusParetoSendPipe.saveAndSendMessage(Constants.STATUS_PARETO_KEY, rawData);
- // calcolo Current:MachStats (OEE e status macchina...)
- var currMStatDTO = getMachStatDTO(statusDTO);
+ // calcolo le daily duration e invio
+ List currMDayDurDTO = getMachDayDurDTO(statusAllDTO);
+ if (currMDayDurDTO.Count > 0)
+ {
+ // serializzo e salvo
+ rawData = JsonConvert.SerializeObject(currMDayDurDTO);
+ mpDayDurSendPipe.saveAndSendMessage(Constants.MACH_DAY_DUR_CURR_KEY, rawData);
+ }
+
+ // calcolo Current:MachStats (pareto status macchina...)
+ List currMStatDTO = getMachStatDTO(statusActDTO);
if (currMStatDTO.Count > 0)
{
// serializzo e salvo
@@ -602,17 +612,43 @@ void dbMaintenance()
} while (true);
}
+List getMachDayDurDTO(List currStatus)
+{
+ List dayDurList = new List();
+ // calcolo in minuti assoluti
+ int i = 0;
+ dayDurList = currStatus
+ .Select(x => new DisplayDataDTO()
+ {
+ Order = i++,
+ Type = "TIME",
+ Title = $"{x.Group} | {x.Description}",
+ ValueNum = x.TotDuration,
+ Value = $"{x.TotDuration:N2}",
+ DisplFormat = "N0",
+ MinVal = 0,
+ MaxVal = 1,
+ IsNumeric = true,
+ EnablePlot = true,
+ ShowBar = true,
+ HLShow = x.TotDuration > 5,
+ CssClass = x.CssClass
+ })
+ .ToList();
+ return dayDurList;
+}
+
List getMachStatDTO(List currStatus)
{
List machStatList = new List();
- // calcolo OEE come % tempo RUN sul totale...
+ // calcolo come % tempo RUN sul totale...
float globDur = currStatus.Sum(x => x.TotDuration);
int i = 0;
machStatList = currStatus
.Select(x => new DisplayDataDTO()
{
Order = i++,
- Type = "TIME",
+ Type = "PERC",
Title = $"{x.Group} | {x.Description}",
ValueNum = x.TotDuration / globDur,
Value = $"{x.TotDuration / globDur:P1}",
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 6c0cfba..d9f6c0a 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2303.2918
+ Version: 1.2.2303.3009
Release Note:
-
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 4236344..1f6e279 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2918
+1.2.2303.3009
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 64f86ce..6142bc7 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2918
+ 1.2.2303.3009
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.DECODER/lua/StatusDecoder.lua b/MP.MONO.DECODER/lua/StatusDecoder.lua
index 81dd074..2af9915 100644
--- a/MP.MONO.DECODER/lua/StatusDecoder.lua
+++ b/MP.MONO.DECODER/lua/StatusDecoder.lua
@@ -80,7 +80,7 @@ local function doCalc()
-- calcolo dello statusId
if(dataList["MACHINE STATUS"] == 0) then
- statusId = 7
+ statusId = 1
else
if(dataList["PROCESS MODE"] == 1) then
statusId = 8
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index d4a67ab..dbc8c76 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2303.2918
+ 1.2.2303.3009
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 6c0cfba..d9f6c0a 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2303.2918
+ Version: 1.2.2303.3009
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 4236344..1f6e279 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2303.2918
+1.2.2303.3009
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index cc2108b..66f5018 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2303.2918
+ 1.2.2303.3009
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false