diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 77cdc4a..4d96a9a 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.2210.308
+ 1.2.2210.314
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index f7c73bc..961c3ac 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2210.308
+ Version: 1.2.2210.314
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index f2b2b7c..a53de99 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.308
+1.2.2210.314
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index 938d5f1..653d135 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.308
+ 1.2.2210.314
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.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index b29c86d..b0de21d 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.2210.308
+ 1.2.2210.314
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index f7c73bc..961c3ac 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.308
+ Version: 1.2.2210.314
Release Note:
-
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index f2b2b7c..a53de99 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.308
+1.2.2210.314
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 0481607..5217382 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.308
+ 1.2.2210.314
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.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs
new file mode 100644
index 0000000..b05638d
--- /dev/null
+++ b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.Designer.cs
@@ -0,0 +1,1584 @@
+//
+using System;
+using MP.MONO.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace MP.MONO.Data.Migrations
+{
+ [DbContext(typeof(MapoMonoContext))]
+ [Migration("20221003124504_UpdateDatalogModel")]
+ partial class UpdateDatalogModel
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "6.0.2")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmListModel", b =>
+ {
+ b.Property("AlarmId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("FullValue")
+ .IsRequired()
+ .HasColumnType("longtext");
+
+ b.HasKey("AlarmId");
+
+ b.ToTable("AlarmList");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmLogModel", b =>
+ {
+ b.Property("AlarmLogId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Index")
+ .HasColumnType("int");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("MemAddress")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Status")
+ .HasColumnType("int unsigned");
+
+ b.Property("ValDecoded")
+ .IsRequired()
+ .HasColumnType("longtext");
+
+ b.HasKey("AlarmLogId");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("AlarmLog");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmRecModel", b =>
+ {
+ b.Property("AlarmRecId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("AlarmId")
+ .HasColumnType("int");
+
+ b.Property("DtEnd")
+ .HasColumnType("datetime(6)");
+
+ b.Property("DtStart")
+ .HasColumnType("datetime(6)");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.HasKey("AlarmRecId");
+
+ b.HasIndex("AlarmId");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("AlarmRec");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.AnKeyValModel", b =>
+ {
+ b.Property("KeyName")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Descript")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("ValFloat")
+ .HasColumnType("int");
+
+ b.Property("ValInt")
+ .HasColumnType("int");
+
+ b.Property("ValString")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("KeyName");
+
+ b.ToTable("AnKeyVal");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.ConfigModel", b =>
+ {
+ b.Property("KeyName")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Note")
+ .IsRequired()
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)");
+
+ b.Property("Val")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("ValStd")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("KeyName");
+
+ b.ToTable("Config");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.CounterModel", b =>
+ {
+ b.Property("CCode")
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("ActualVal")
+ .HasColumnType("double");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)");
+
+ b.Property("LastReset")
+ .HasColumnType("datetime(6)");
+
+ b.HasKey("CCode");
+
+ b.ToTable("Counter");
+
+ b.HasData(
+ new
+ {
+ CCode = "MacPowerOn",
+ ActualVal = 0.0,
+ Description = "Machine Power On",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ },
+ new
+ {
+ CCode = "CycleProc01",
+ ActualVal = 0.0,
+ Description = "Process 1 on Cycle state",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ },
+ new
+ {
+ CCode = "SpindleTorque01",
+ ActualVal = 0.0,
+ Description = "Spindle 01 Torque % > 0",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ },
+ new
+ {
+ CCode = "SpindleTorque02",
+ ActualVal = 0.0,
+ Description = "Spindle 02 Torque % > 0",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ },
+ new
+ {
+ CCode = "SpindleTorque03",
+ ActualVal = 0.0,
+ Description = "Spindle 03 Torque % > 0",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ },
+ new
+ {
+ CCode = "SpindleTorque04",
+ ActualVal = 0.0,
+ Description = "Spindle 04 Torque % > 0",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ },
+ new
+ {
+ CCode = "LMCheckElapsed",
+ ActualVal = 0.0,
+ Description = "Time Elapsed from last full Manufacturer Check",
+ LastReset = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.DataLogModel", b =>
+ {
+ b.Property("DataLogId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("DataType")
+ .HasColumnType("int");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("FluxType")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("ValNum")
+ .HasColumnType("double");
+
+ b.Property("ValStr")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("DataLogId");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("DataLog");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.DataStAgModel", b =>
+ {
+ b.Property("DataStAgId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("FluxType")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("NumRec")
+ .HasColumnType("double");
+
+ b.Property("ValNumAvg")
+ .HasColumnType("double");
+
+ b.Property("ValNumMax")
+ .HasColumnType("double");
+
+ b.Property("ValNumMin")
+ .HasColumnType("double");
+
+ b.Property("ValStr")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("DataStAgId");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("DataStAg");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.EventLogModel", b =>
+ {
+ b.Property("EventLogId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("CodEvent")
+ .IsRequired()
+ .HasColumnType("varchar(255)");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("ValStr")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("EventLogId");
+
+ b.HasIndex("CodEvent");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("EventLog");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.EventModel", b =>
+ {
+ b.Property("CodEvent")
+ .HasColumnType("varchar(255)");
+
+ b.Property("Active")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("IsUser")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("CodEvent");
+
+ b.ToTable("Event");
+
+ b.HasData(
+ new
+ {
+ CodEvent = "",
+ Active = true,
+ Description = "NA",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "Run",
+ Active = true,
+ Description = "Running",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "Setup",
+ Active = true,
+ Description = "Machine Setup",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "ProgEdit",
+ Active = true,
+ Description = "Program Editing",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "Fill",
+ Active = true,
+ Description = "Machine Fill",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "SetError",
+ Active = true,
+ Description = "Error",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "WuCd",
+ Active = true,
+ Description = "Warm Up / CoolDown Machine",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "ContrPwr",
+ Active = true,
+ Description = "Controlled PowerOn / ShutDown",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "ProgMiss",
+ Active = true,
+ Description = "Program Missing",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "HRMiss",
+ Active = true,
+ Description = "HR Missing",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "Maint",
+ Active = true,
+ Description = "Maintenance",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "Clean",
+ Active = true,
+ Description = "Machine CleanUp",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "SetPwrOff",
+ Active = true,
+ Description = "Power OFF Declaration",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "Init",
+ Active = true,
+ Description = "Init",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "PowerOff",
+ Active = true,
+ Description = "Power OFF",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "PowerOn",
+ Active = true,
+ Description = "Power ON",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "Cycle",
+ Active = true,
+ Description = "Machining",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "EndCycle",
+ Active = true,
+ Description = "End machining",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "Error",
+ Active = true,
+ Description = "Error",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "PzCount",
+ Active = true,
+ Description = "Item Count(+1)",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "StartPall",
+ Active = true,
+ Description = "Start pallet",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "EndPall",
+ Active = true,
+ Description = "End pallet",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "Manual",
+ Active = true,
+ Description = "Manual",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "LOutFull",
+ Active = true,
+ Description = "Line Out Full",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "LInEmpty",
+ Active = true,
+ Description = "Line In Empty",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "CycleTOut",
+ Active = true,
+ Description = "Timeout Std CycleTime",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "RMatMiss",
+ Active = true,
+ Description = "Raw Material Missing",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "Emergency",
+ Active = true,
+ Description = "Emergency",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "ToolRepl",
+ Active = true,
+ Description = "Tool Replacement",
+ IsUser = true
+ },
+ new
+ {
+ CodEvent = "CncAlam",
+ Active = true,
+ Description = "CNC Alarm",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "PlcAlam",
+ Active = true,
+ Description = "PLC Alarm",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "Warning",
+ Active = true,
+ Description = "Warning State",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "Message",
+ Active = true,
+ Description = "Machine Message",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "PzIncr",
+ Active = true,
+ Description = "Item Count Increment",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "PzSet",
+ Active = true,
+ Description = "Item Count Set",
+ IsUser = false
+ },
+ new
+ {
+ CodEvent = "UserComm",
+ Active = true,
+ Description = "User Comment",
+ IsUser = true
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.MachineModel", b =>
+ {
+ b.Property("MachineId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("BuildYear")
+ .HasColumnType("int");
+
+ b.Property("Code")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Model")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Serial")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("MachineId");
+
+ b.ToTable("Machine");
+
+ b.HasData(
+ new
+ {
+ MachineId = 1,
+ BuildYear = 2022,
+ Code = "",
+ Description = "Default SIM Machine",
+ Model = "Egalware SIM",
+ Name = "EGW-SIM-Machine",
+ Serial = "SN-0000-0000-0000"
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PendingMaintModel", b =>
+ {
+ b.Property("SMTaskId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("CCode")
+ .IsRequired()
+ .HasColumnType("varchar(250)");
+
+ b.Property("CountStartVal")
+ .HasColumnType("double");
+
+ b.Property("DtCreation")
+ .HasColumnType("datetime(6)");
+
+ b.Property("DtExecution")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ElapsedVal")
+ .HasColumnType("double");
+
+ b.Property("ExpiryVal")
+ .HasColumnType("double");
+
+ b.Property("PMTaskId")
+ .HasColumnType("int");
+
+ b.Property("UserCode")
+ .IsRequired()
+ .HasColumnType("longtext");
+
+ b.HasKey("SMTaskId");
+
+ b.HasIndex("CCode");
+
+ b.HasIndex("PMTaskId");
+
+ b.ToTable("PendingMaintTask");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PMMGroupModel", b =>
+ {
+ b.Property("PMMGCode")
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)");
+
+ b.HasKey("PMMGCode");
+
+ b.ToTable("MachineGroup");
+
+ b.HasData(
+ new
+ {
+ PMMGCode = "Whole",
+ Description = "Whole Machine"
+ },
+ new
+ {
+ PMMGCode = "Load",
+ Description = "Part loader/unloader"
+ },
+ new
+ {
+ PMMGCode = "MovBelts",
+ Description = "Part moving belts"
+ },
+ new
+ {
+ PMMGCode = "MovRoll",
+ Description = "Part moving rollers"
+ },
+ new
+ {
+ PMMGCode = "Axis",
+ Description = "Machining axis"
+ },
+ new
+ {
+ PMMGCode = "Spindles",
+ Description = "Tool spindles"
+ },
+ new
+ {
+ PMMGCode = "ToolChange",
+ Description = "Automatic tool changer"
+ },
+ new
+ {
+ PMMGCode = "Cabinet",
+ Description = "Electrical cabinet"
+ },
+ new
+ {
+ PMMGCode = "ChipConv",
+ Description = "Chips conveyor"
+ },
+ new
+ {
+ PMMGCode = "DustSuct",
+ Description = "Dust suction"
+ },
+ new
+ {
+ PMMGCode = "OpPanel",
+ Description = "Operator pannel"
+ },
+ new
+ {
+ PMMGCode = "Access",
+ Description = "Accessories"
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PMTaskTopicModel", b =>
+ {
+ b.Property("PMTCode")
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)");
+
+ b.HasKey("PMTCode");
+
+ b.ToTable("TaskTopic");
+
+ b.HasData(
+ new
+ {
+ PMTCode = "Mechanical",
+ Description = "Mechanical system"
+ },
+ new
+ {
+ PMTCode = "Electro",
+ Description = "Electrical system"
+ },
+ new
+ {
+ PMTCode = "Lubro",
+ Description = "Lubrication system"
+ },
+ new
+ {
+ PMTCode = "Coolant",
+ Description = "Coolant system"
+ },
+ new
+ {
+ PMTCode = "Preumo",
+ Description = "Pneumatic system"
+ },
+ new
+ {
+ PMTCode = "Hydro",
+ Description = "Hydraulic system"
+ },
+ new
+ {
+ PMTCode = "Safety",
+ Description = "Enclosure/Safety system"
+ },
+ new
+ {
+ PMTCode = "Suction",
+ Description = "Suction system"
+ },
+ new
+ {
+ PMTCode = "GeoAdj",
+ Description = "Geometrical system"
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PMUTModel", b =>
+ {
+ b.Property("PMUTCode")
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)");
+
+ b.HasKey("PMUTCode");
+
+ b.ToTable("UserTeam");
+
+ b.HasData(
+ new
+ {
+ PMUTCode = "TrainOp",
+ Description = "Trained Operator"
+ },
+ new
+ {
+ PMUTCode = "MaintServ",
+ Description = "Maintenance Service"
+ },
+ new
+ {
+ PMUTCode = "DevSupp",
+ Description = "Device Supplier"
+ },
+ new
+ {
+ PMUTCode = "MultiaxServ",
+ Description = "Multiax Service"
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PrevMaintTaskModel", b =>
+ {
+ b.Property("PMTaskId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("CCode")
+ .IsRequired()
+ .HasColumnType("varchar(250)");
+
+ b.Property("ExpiryVal")
+ .HasColumnType("double");
+
+ b.Property("ExtIdx")
+ .HasColumnType("int");
+
+ b.Property("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("JobDescription")
+ .IsRequired()
+ .HasColumnType("longtext");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("NumTaskDone")
+ .HasColumnType("int");
+
+ b.Property("PMMGCode")
+ .IsRequired()
+ .HasColumnType("varchar(250)");
+
+ b.Property("PMTCode")
+ .IsRequired()
+ .HasColumnType("varchar(250)");
+
+ b.Property("PMUTCode")
+ .IsRequired()
+ .HasColumnType("varchar(250)");
+
+ b.Property("Protected")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("PMTaskId");
+
+ b.HasIndex("CCode");
+
+ b.HasIndex("MachineId");
+
+ b.HasIndex("PMMGCode");
+
+ b.HasIndex("PMTCode");
+
+ b.HasIndex("PMUTCode");
+
+ b.ToTable("PrevMaintTask");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.ProdLogModel", b =>
+ {
+ b.Property("ProdLogId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("EvType")
+ .IsRequired()
+ .HasColumnType("longtext");
+
+ b.Property("ExtRef")
+ .IsRequired()
+ .HasColumnType("longtext");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("ValNum")
+ .HasColumnType("double");
+
+ b.Property("ValStr")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("ProdLogId");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("ProdLog");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.StatusLogModel", b =>
+ {
+ b.Property("EventLogId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("CodStatus")
+ .IsRequired()
+ .HasColumnType("varchar(255)");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Duration")
+ .HasColumnType("float");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("ValStr")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("EventLogId");
+
+ b.HasIndex("CodStatus");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("StatusLog");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.StatusModel", b =>
+ {
+ b.Property("CodStatus")
+ .HasColumnType("varchar(255)");
+
+ b.Property("CssClass")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("CssClassOvr")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.Property("Group")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("GroupOvr")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)");
+
+ b.Property("Prior")
+ .HasColumnType("int");
+
+ b.Property("ShowProdItem")
+ .HasColumnType("tinyint(1)");
+
+ b.HasKey("CodStatus");
+
+ b.ToTable("Status");
+
+ b.HasData(
+ new
+ {
+ CodStatus = "",
+ CssClass = "dark",
+ CssClassOvr = "",
+ Description = "NA",
+ Group = "NA",
+ GroupOvr = "",
+ Prior = 0,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Error",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "Error",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 5,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Emergency",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "Emergency",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 5,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Manual",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Manual",
+ Group = "ManYellow",
+ GroupOvr = "",
+ Prior = 4,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "PzProd",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Item Produced",
+ Group = "MicroYellow",
+ GroupOvr = "",
+ Prior = 4,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Unkn",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Unknown Stop",
+ Group = "MicroYellow",
+ GroupOvr = "",
+ Prior = 4,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "ProgMissing",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "Program Missing",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "HRMissing",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "HR Missing",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Maint",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Maintenance",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "LineOutFull",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "Line Out Full",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "LineInEmpty",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "Line In Empty",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "RawMatMiss",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "Raw Material Missing",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "CncAlam",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "CNC Alarm",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "PlcAlam",
+ CssClass = "danger",
+ CssClassOvr = "",
+ Description = "PLC Alarm",
+ Group = "StopRed",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "WUpCDown",
+ CssClass = "primary",
+ CssClassOvr = "",
+ Description = "Warm Up / CoolDown Machine",
+ Group = "WaitBlue",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "ContrPOnSDown",
+ CssClass = "primary",
+ CssClassOvr = "",
+ Description = "Controller PowerOn / ShutDown",
+ Group = "WaitBlue",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Init",
+ CssClass = "primary",
+ CssClassOvr = "",
+ Description = "Init",
+ Group = "WaitBlue",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "PowerOn",
+ CssClass = "primary",
+ CssClassOvr = "",
+ Description = "Power ON",
+ Group = "WaitBlue",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "TimeoutCycle",
+ CssClass = "primary",
+ CssClassOvr = "",
+ Description = "Timeout Std CycleTime",
+ Group = "WaitBlue",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Waiting",
+ CssClass = "primary",
+ CssClassOvr = "",
+ Description = "Waiting State",
+ Group = "WaitBlue",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "ProgEdit",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Program Editing",
+ Group = "ManYellow",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Setup",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Machine Setup",
+ Group = "ManYellow",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Clean",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Machine CleanUp",
+ Group = "ManYellow",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Fill",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Machine Fill",
+ Group = "MicroYellow",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "ToolReplace",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Tool Replacement",
+ Group = "MicroYellow",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Warning",
+ CssClass = "warning",
+ CssClassOvr = "",
+ Description = "Warning State",
+ Group = "MicroYellow",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "PowerOff",
+ CssClass = "secondary",
+ CssClassOvr = "",
+ Description = "Power OFF",
+ Group = "Gray",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Run",
+ CssClass = "success",
+ CssClassOvr = "",
+ Description = "Running",
+ Group = "Green",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ },
+ new
+ {
+ CodStatus = "Cycle",
+ CssClass = "success",
+ CssClassOvr = "",
+ Description = "Machining",
+ Group = "Green",
+ GroupOvr = "",
+ Prior = 1,
+ ShowProdItem = true
+ });
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.StatusStAgModel", b =>
+ {
+ b.Property("DataStAgId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ b.Property("CodStatus")
+ .IsRequired()
+ .HasColumnType("varchar(255)");
+
+ b.Property("DtRif")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Duration")
+ .HasColumnType("float");
+
+ b.Property("MachineId")
+ .HasColumnType("int");
+
+ b.Property("ValStr")
+ .IsRequired()
+ .HasMaxLength(250)
+ .HasColumnType("varchar(250)");
+
+ b.HasKey("DataStAgId");
+
+ b.HasIndex("CodStatus");
+
+ b.HasIndex("MachineId");
+
+ b.ToTable("StatusStAg");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmLogModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.AlarmRecModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.AlarmListModel", "AlarmListNav")
+ .WithMany()
+ .HasForeignKey("AlarmId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("AlarmListNav");
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.DataLogModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.DataStAgModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.EventLogModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.EventModel", "CodEventNav")
+ .WithMany()
+ .HasForeignKey("CodEvent")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("CodEventNav");
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PendingMaintModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.CounterModel", "CounterNav")
+ .WithMany()
+ .HasForeignKey("CCode")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.PrevMaintTaskModel", "PMTaskeNav")
+ .WithMany()
+ .HasForeignKey("PMTaskId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("CounterNav");
+
+ b.Navigation("PMTaskeNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.PrevMaintTaskModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.CounterModel", "CounterNav")
+ .WithMany()
+ .HasForeignKey("CCode")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.PMMGroupModel", "MachGroupNav")
+ .WithMany()
+ .HasForeignKey("PMMGCode")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.PMTaskTopicModel", "TopicNav")
+ .WithMany()
+ .HasForeignKey("PMTCode")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.PMUTModel", "UserTeamNav")
+ .WithMany()
+ .HasForeignKey("PMUTCode")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("CounterNav");
+
+ b.Navigation("MachGroupNav");
+
+ b.Navigation("MachineNav");
+
+ b.Navigation("TopicNav");
+
+ b.Navigation("UserTeamNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.ProdLogModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.StatusLogModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.StatusModel", "CodStatusNav")
+ .WithMany()
+ .HasForeignKey("CodStatus")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("CodStatusNav");
+
+ b.Navigation("MachineNav");
+ });
+
+ modelBuilder.Entity("MP.MONO.Data.DbModels.StatusStAgModel", b =>
+ {
+ b.HasOne("MP.MONO.Data.DbModels.StatusModel", "CodStatusNav")
+ .WithMany()
+ .HasForeignKey("CodStatus")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.HasOne("MP.MONO.Data.DbModels.MachineModel", "MachineNav")
+ .WithMany()
+ .HasForeignKey("MachineId")
+ .OnDelete(DeleteBehavior.Restrict)
+ .IsRequired();
+
+ b.Navigation("CodStatusNav");
+
+ b.Navigation("MachineNav");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs
new file mode 100644
index 0000000..52462d2
--- /dev/null
+++ b/MP.MONO.Data/Migrations/20221003124504_UpdateDatalogModel.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MP.MONO.Data.Migrations
+{
+ public partial class UpdateDatalogModel : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "DataType",
+ table: "DataLog",
+ type: "int",
+ nullable: false,
+ defaultValue: 1);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "DataType",
+ table: "DataLog");
+ }
+ }
+}
diff --git a/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs b/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs
index 73e23e2..a379dc3 100644
--- a/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs
+++ b/MP.MONO.Data/Migrations/MapoMonoContextModelSnapshot.cs
@@ -227,6 +227,9 @@ namespace MP.MONO.Data.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("int");
+ b.Property("DataType")
+ .HasColumnType("int");
+
b.Property("DtRif")
.HasColumnType("datetime(6)");
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index cac66b3..018cc50 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.308
+ 1.2.2210.314
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index f7c73bc..961c3ac 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.308
+ Version: 1.2.2210.314
Release Note:
-
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index f2b2b7c..a53de99 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.308
+1.2.2210.314
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index 28530a8..3afa2bd 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.308
+ 1.2.2210.314
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.UI/Components/ParamPlot.razor.cs b/MP.MONO.UI/Components/ParamPlot.razor.cs
index aa3a28f..5e9bbf4 100644
--- a/MP.MONO.UI/Components/ParamPlot.razor.cs
+++ b/MP.MONO.UI/Components/ParamPlot.razor.cs
@@ -2,6 +2,7 @@
using MP.MONO.Data;
using MP.MONO.Data.DTO;
using MP.MONO.UI.Data;
+using static MP.MONO.Core.Enums;
namespace MP.MONO.UI.Components
{
@@ -118,7 +119,7 @@ namespace MP.MONO.UI.Components
isLoading = true;
ListRecords = null;
await Task.Delay(1);
- ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, SelectedParam, StartDate, EndDate);
+ ListRecords = await MMDataService.DataLogDtoGetFilt(MachineId, DataLogType.Parameter, SelectedParam, StartDate, EndDate);
await Task.Delay(1);
// converto in plotdata
LevelVal = ListRecords.Select(l => new chartJsData.chartJsTSerie() { x = l.DtRif, y = l.ValNum }).ToList();
diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs
index 6a3edfa..4bf970c 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -268,11 +268,20 @@ namespace MP.MONO.UI.Data
Log.Info($"DataLogGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb");
return dbResult;
}
- public async Task> DataLogDtoGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine)
+ ///
+ /// TimeSearie in formato DataLogDTO
+ ///
+ /// ID macchina
+ /// Tipologia di dato richiesto da enum
+ /// Tipo di Flusso
+ /// DT Inizio estrazione
+ /// DT Fine estrazione
+ ///
+ public async Task> DataLogDtoGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine)
{
string source = "DB";
List dbResult = new List();
- string currKey = $"{Constants.DATA_LOG_DTO_KEY}:{machineId}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}";
+ string currKey = $"{Constants.DATA_LOG_DTO_KEY}:{machineId}:{dataType}:{fluxType.Replace(" ", "_")}:{inizio:yyyyMMdd}:{fine:yyyyMMdd}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string rawData = await redisDb.StringGetAsync(currKey);
@@ -291,14 +300,14 @@ namespace MP.MONO.UI.Data
}
else
{
- dbResult = dbController.DataLogDtoGetFilt(machineId, fluxType, inizio, fine);
+ dbResult = dbController.DataLogDtoGetFilt(machineId, dataType, fluxType, inizio, fine);
// salvo per 2 min...
rawData = JsonConvert.SerializeObject(dbResult);
await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromSeconds(120));
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
- Log.Info($"DataLogDtoGetFilt | {machineId} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb");
+ Log.Info($"DataLogDtoGetFilt | {machineId} | {dataType} | {fluxType} | {inizio:yyyyMMdd}-{fine:yyyyMMdd} | {source} | {ts.TotalMilliseconds} ms | {rawData.Length / 1024} kb");
return dbResult;
}
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 5a717e5..b5c970d 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.2210.312
+ 1.2.2210.314
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 3734d4c..961c3ac 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.312
+ Version: 1.2.2210.314
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index d16ccd8..a53de99 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.312
+1.2.2210.314
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index d50a008..130018f 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.312
+ 1.2.2210.314
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