server: begin work on adding parts to pallet cycles

SeedTactics · Nov 22, 2024 · f534616 · f534616
1 parent face45b
commit f534616
Show file tree

Hide file tree

Showing 9 changed files with 253 additions and 43 deletions.
diff --git a/server/lib/BlackMaple.MachineFramework/backend/BuildCellState.cs b/server/lib/BlackMaple.MachineFramework/backend/BuildCellState.cs
@@ -992,6 +992,8 @@ DateTime nowUTC
     var newEvts = db.RecordLoadUnloadComplete(
       toLoad: matsToLoad.Select((m) => m.Item1).ToImmutableList(),
       toUnload: toUnload,
+      previouslyLoaded: null, // TODO: previouslyLoaded
+      previouslyUnloaded: null, // TODO: previouslyUnloaded
       lulNum: loadNum,
       pallet: pal.PalletNum,
       totalElapsed: nowUTC - (LoadUnloadStartTime(pal) ?? nowUTC),

diff --git a/server/lib/BlackMaple.MachineFramework/db/EventLog.cs b/server/lib/BlackMaple.MachineFramework/db/EventLog.cs
@@ -1593,7 +1593,9 @@ IReadOnlyDictionary<string, string> externalQueues
 
     public IEnumerable<LogEntry> RecordLoadUnloadComplete(
       IReadOnlyList<MaterialToLoadOntoFace> toLoad,
+      IReadOnlyList<EventLogMaterial> previouslyLoaded,
       IReadOnlyList<MaterialToUnloadFromFace> toUnload,
+      IReadOnlyList<EventLogMaterial> previouslyUnloaded,
       int lulNum,
       int pallet,
       TimeSpan totalElapsed,
@@ -1650,7 +1652,46 @@ IReadOnlyDictionary<string, string> externalQueues
           sendToExternal: sendToExternal,
           trans: trans
         );
-        RecordPalletCycle(pallet: pallet, timeUTC: timeUTC, logs: logs, trans: trans, foreignId: null);
+
+        var allUnload = (previouslyUnloaded ?? []).Concat(
+          (toUnload ?? []).SelectMany(u =>
+            u.MaterialIDToQueue.Keys.Select(mid => new EventLogMaterial()
+            {
+              MaterialID = mid,
+              Process = u.Process,
+              Face = u.FaceNum,
+            })
+          )
+        );
+        if (allUnload.Any())
+        {
+          RecordPalletCycleEnd(pallet: pallet, mats: allUnload, timeUTC: timeUTC, logs: logs, trans: trans);
+        }
+
+        RecordLoadMaterialPaths(toLoad: toLoad, trans: trans);
+
+        var allLoad = (previouslyLoaded ?? []).Concat(
+          (toLoad ?? []).SelectMany(l =>
+            l.MaterialIDs.Select(mid => new EventLogMaterial()
+            {
+              MaterialID = mid,
+              Process = l.Process,
+              Face = l.FaceNum,
+            })
+          )
+        );
+        if (allLoad.Any())
+        {
+          RecordPalletCycleStart(
+            pallet: pallet,
+            mats: allLoad,
+            timeUTC: timeUTC,
+            logs: logs,
+            trans: trans,
+            foreignId: null
+          );
+        }
+
         RecordLoadEnd(
           toLoad: toLoad,
           lulNum: lulNum,
@@ -1679,7 +1720,14 @@ public IEnumerable<LogEntry> RecordEmptyPallet(int pallet, DateTime timeUTC, str
         trans =>
         {
           var logs = new List<LogEntry>();
-          RecordPalletCycle(pallet: pallet, timeUTC: timeUTC, logs: logs, trans: trans, foreignId: foreignId);
+          RecordPalletCycleStart(
+            pallet: pallet,
+            mats: [],
+            timeUTC: timeUTC,
+            logs: logs,
+            trans: trans,
+            foreignId: foreignId
+          );
           return logs;
         },
         foreignId: foreignId
@@ -1785,13 +1833,45 @@ IDbTransaction trans
       }
     }
 
-    private void RecordPalletCycle(
+    private void RecordPalletCycleStart(
       int pallet,
+      IEnumerable<EventLogMaterial> mats,
       DateTime timeUTC,
       List<LogEntry> logs,
       IDbTransaction trans,
       string foreignId
     )
+    {
+      logs.Add(
+        AddLogEntry(
+          trans,
+          new NewEventLogEntry()
+          {
+            Material = mats,
+            Pallet = pallet,
+            LogType = LogType.PalletCycle,
+            LocationName = "Pallet Cycle",
+            LocationNum = 1,
+            Program = "",
+            StartOfCycle = true,
+            EndTimeUTC = timeUTC,
+            Result = "PalletCycle",
+            ElapsedTime = TimeSpan.Zero,
+            ActiveOperationTime = TimeSpan.Zero,
+          },
+          foreignID: foreignId,
+          null
+        )
+      );
+    }
+
+    private void RecordPalletCycleEnd(
+      int pallet,
+      IEnumerable<EventLogMaterial> mats,
+      DateTime timeUTC,
+      List<LogEntry> logs,
+      IDbTransaction trans
+    )
     {
       using var lastTimeCmd = _connection.CreateCommand();
       lastTimeCmd.CommandText =
@@ -1809,7 +1889,7 @@ string foreignId
           trans,
           new NewEventLogEntry()
           {
-            Material = [],
+            Material = mats,
             Pallet = pallet,
             LogType = LogType.PalletCycle,
             LocationName = "Pallet Cycle",
@@ -1821,12 +1901,26 @@ string foreignId
             ElapsedTime = elapsedTime,
             ActiveOperationTime = TimeSpan.Zero,
           },
-          foreignID: foreignId,
+          null,
           null
         )
       );
     }
 
+    private void RecordLoadMaterialPaths(IEnumerable<MaterialToLoadOntoFace> toLoad, IDbTransaction trans)
+    {
+      foreach (var face in toLoad ?? [])
+      {
+        if (face.Path.HasValue)
+        {
+          foreach (var mat in face.MaterialIDs)
+          {
+            RecordPathForProcess(mat, face.Process, face.Path.Value, trans);
+          }
+        }
+      }
+    }
+
     private void RecordLoadEnd(
       IEnumerable<MaterialToLoadOntoFace> toLoad,
       int lulNum,
@@ -1860,14 +1954,6 @@ IDbTransaction trans
           );
         }
 
-        if (face.Path.HasValue)
-        {
-          foreach (var mat in face.MaterialIDs)
-          {
-            RecordPathForProcess(mat, face.Process, face.Path.Value, trans);
-          }
-        }
-
         TimeSpan elapsed;
         if (totalActive.HasValue)
         {
@@ -2742,7 +2828,7 @@ public SwapMaterialResult SwapMaterialInCurrentPalletCycle(
           }
 
           // load old events
-          var oldEvents = CurrentPalletLog(pallet, includeLastPalletCycleEvt: false, trans);
+          var oldEvents = CurrentPalletLog(pallet, includeLastPalletCycleEvt: true, trans);
           var oldMatProcM = oldEvents
             .SelectMany(e => e.Material)
             .Where(m => m.MaterialID == oldMatId)

diff --git a/server/lib/BlackMaple.MachineFramework/db/IRepository.cs b/server/lib/BlackMaple.MachineFramework/db/IRepository.cs
@@ -102,7 +102,9 @@ IReadOnlyDictionary<string, string> externalQueues
     );
     IEnumerable<LogEntry> RecordLoadUnloadComplete(
       IReadOnlyList<MaterialToLoadOntoFace> toLoad,
+      IReadOnlyList<EventLogMaterial> previouslyLoaded,
       IReadOnlyList<MaterialToUnloadFromFace> toUnload,
+      IReadOnlyList<EventLogMaterial> previouslyUnloaded,
       int lulNum,
       int pallet,
       TimeSpan totalElapsed,

diff --git a/server/machines/makino/LogBuilder.cs b/server/machines/makino/LogBuilder.cs
@@ -375,7 +375,9 @@ ref bool newLogEntries
       {
         logDb.RecordLoadUnloadComplete(
           toLoad: toLoad,
+          previouslyLoaded: [],
           toUnload: toUnload,
+          previouslyUnloaded: [],
           lulNum: loc.Num,
           pallet: ws.Key.PalletID,
           totalElapsed: elapsed,

diff --git a/server/machines/mazak/sync/LogTranslation.cs b/server/machines/mazak/sync/LogTranslation.cs
@@ -255,7 +255,9 @@ private void HandleLoadEnd(IReadOnlyList<LogEntry> es)
 
       repo.RecordLoadUnloadComplete(
         toLoad: toLoad,
+        previouslyLoaded: null,
         toUnload: toUnload,
+        previouslyUnloaded: null,
         pallet: pallet,
         lulNum: es[0].StationNumber,
         totalElapsed: CalculateElapsed(es[0].TimeUTC, LogType.LoadUnloadCycle, cycle, es[0].StationNumber),

diff --git a/server/machines/niigata/CellState.cs b/server/machines/niigata/CellState.cs
@@ -979,7 +979,9 @@ IRepository logDB
 
       var lulEvts = logDB.RecordLoadUnloadComplete(
         toLoad: toLoad,
+        previouslyLoaded: null,
         toUnload: toUnload,
+        previouslyUnloaded: null,
         lulNum: loadBegin.LocationNum,
         pallet: pallet.Status.Master.PalletNum,
         totalElapsed: nowUtc.Subtract(loadBegin.EndTimeUTC),

diff --git a/server/test/InspectionTest.cs b/server/test/InspectionTest.cs
@@ -482,6 +482,8 @@ private void AddCycle(LogMaterial[] mat, int pal, LogType loc, int statNum)
             },
           ],
           toUnload: null,
+          previouslyLoaded: null,
+          previouslyUnloaded: null,
           lulNum: statNum,
           totalElapsed: TimeSpan.FromMinutes(10),
           pallet: pal,