- introduzione ProdId su log macchina e correzzioni

EgtBEAMWALL.DataLayer/Controllers/DbController.cs

@@ -78,7 +78,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
             // in primis refresh delle view
             string sqlCommand = @"CREATE OR REPLACE VIEW v_expProdRaw AS
-                                    SELECT DbId, AlarmDtEvent AS DtEvent, VarValue,
+                                    SELECT DbId, DtEvent, VarValue,
                                     SUBSTRING_INDEX(VarValue, ';', 1) AS Prod,
                                     SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', 2), ';', -1) AS MachGroupId,
                                     SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', -2), ';', 1) AS PartId,

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -28,10 +28,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int projCloudId = 0;
             // calcolo projCloudId da ProjDbId...
-            using (var locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (var localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // Add to database
-                var projRec = locallocalDbCtx.ProjList.Where(x => x.ProdDbId == coreMacLog.ProdId).FirstOrDefault();
+                var projRec = localDbCtx.ProdList.Where(x => x.ProdId == coreMacLog.ProdId).FirstOrDefault();
                 if (projRec != null)
                 {
                     projCloudId = projRec.ProjCloudId;
@@ -60,7 +60,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.MachLog ConvertToCore(LogMachineModel dbLog)
         {
-            var newRecord = (Core.MachLog)Core.MachLog.CreateMachLog(dbLog.EvType, dbLog.DtEvent, dbLog.VarValue, dbLog.SupervId);
+            var newRecord = (Core.MachLog)Core.MachLog.CreateMachLog(dbLog.EvType, dbLog.DtEvent, dbLog.VarValue,dbLog.ProjId, dbLog.SupervId);
             return newRecord;
         }
 
@@ -124,7 +124,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
 
             // converto record
-            var dbLogModel = ConvertFromCore(newMachLog, projCloudId);
+            var dbLogModel = ConvertFromCore(newMachLog);
             return Create(dbLogModel);
         }
 
@@ -256,7 +256,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // retrieve
                 return localDbCtx
                         .LogMachineList
-                        .Where(x => x.DtSent == null)
+                        .Where(x => x.DtSent == null || x.DtSent < x.DtEvent)
                         .OrderBy(x => x.DtEvent)
                         .Take(numMax)
                         .ToList();
@@ -278,15 +278,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 {
                     var currRec = localDbCtx
                         .LogMachineList
-                        .Where(x => x.DtSent == null && x.LogDbId == item.LogDbId)
+                        .Where(x => (x.DtSent == null || x.DtSent < x.DtEvent) && x.LogDbId == item.LogDbId)
                         .FirstOrDefault();
                     if (currRec != null)
                     {
                         currRec.DtSent = adesso;
+                       // indico modificato
+                       localDbCtx.Entry(currRec).State = System.Data.Entity.EntityState.Modified;
                     }
-
-                    // indico modificato
-                    localDbCtx.Entry(currRec).State = System.Data.Entity.EntityState.Modified;
                 }
                 // Salvataggio finale
                 localDbCtx.SaveChanges();

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -161,7 +161,7 @@
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
     <Reference Include="EgwProxy.MagMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwProxy.MagMan.1.0.2403.2611\lib\EgwProxy.MagMan.dll</HintPath>
+      <HintPath>..\packages\EgwProxy.MagMan.1.0.2404.2913\lib\EgwProxy.MagMan.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>

EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb

@@ -151,6 +151,7 @@ Public Class MainWindowVM
       End If
       ' forzo aggiornamento eventuali dati non inviati su Db
       DbControllers.m_MagmanController.ForceSyncroSend()
+      DbControllers.m_MagmanController.CloudLogMaccSyncro(100, 5000)
    End Sub
 
    Friend Function ProcessCommandLine(ByRef nCommandType As Integer, ByRef nProdId As Integer) As Boolean

EgtBEAMWALL.Supervisor/Utility/LogEvent.vb

@@ -185,7 +185,7 @@ Public Class LogEvent
    End Sub
 
    Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, SupervisorID As String)
-      Return MachLog.CreateMachLog(EventType, EventDateTime, Value, SupervisorID)
+      Return MachLog.CreateMachLog(EventType, EventDateTime, Value, Map.refSupervisorManagerVM.CurrProd.nProdId, SupervisorID)
    End Function
 
    Public Shared Function CreatePartStateLog(dtEvent As DateTime, Prod As Integer, MachGroup As Integer, Part As Integer, State As Integer, SupervisorID As String)

EgtBEAMWALL.Supervisor/packages.config

@@ -3,7 +3,7 @@
   <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="Csv" version="1.0.31" targetFramework="net472" />
   <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
-  <package id="EgwProxy.MagMan" version="1.0.2403.2611" targetFramework="net472" />
+  <package id="EgwProxy.MagMan" version="1.0.2404.2913" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="FluentFTP" version="19.2.2" targetFramework="net472" />
   <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />