Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 6 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 10a732221..1bb025217 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -160,6 +160,8 @@ namespace Tango.MachineService.Controllers
                 tangoUpdate.UpdateStatus = TangoUpdateStatuses.SetupStarted;
                 db.TangoUpdates.Add(tangoUpdate);
 
+                machine.ProductionDate = DateTime.UtcNow;
+
                 db.SaveChanges();
 
                 _pendingUpdates.Add(new PPCPendingUpdate()
@@ -328,6 +330,10 @@ namespace Tango.MachineService.Controllers
                     var hardwareVersions = db.HardwareVersions.Select(x => new { x.Guid, x.LastUpdated }).ToList();
                     var catalogs = db.ColorCatalogs.Select(x => new { x.Guid, x.LastUpdated }).ToList();
 
+                    var arr = request.UsedRmlsGuids.ToArray();
+                    var existingRml = db.Rmls.Where(x => arr.Contains(x.Guid)).Select(x => x.Guid).Distinct().ToList();
+                    response.UsedNotExistingRmlsGuids = arr.Where(x => !existingRml.Exists(y => y == x)).ToList();
+
                     bool hasDatabaseUpdates = false;
 
                     hasDatabaseUpdates = machine.LastUpdated > request.MachineLastUpdated;