someupdate

Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
 using Siger.Middlelayer.AccRepository.Entities;
 using Siger.Middlelayer.AccRepository.Repositories.Interface;
 using Siger.Middlelayer.AccRepository.Request;
@@ -212,13 +213,36 @@ namespace Siger.ApiACC.Controllers
                  ordercode=plandts.OrderNumber,
                  fixtureguid= fixtureToolsObj.FixtureGuid,
                  locationid=fixtureToolsObj.Location,
-                 
+                
                  remark ="手动任务",
                  
             });
 
 
-          //  var monitor= _automationFixtureMonitor.Get()
+            var monitor = _automationFixtureMonitor.Get(f => f.fixtureguid == fixtureToolsObj.FixtureGuid);
+            if (monitor==null)
+            {
+                _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
+                {
+                     fixtureguid=fixtureToolsObj.FixtureGuid,
+                     projectId=ProjectId,
+                     section=loading.section,
+                     sn=sn,
+                     createtime=DateTime.Now,
+                     updatetime=DateTime.Now,
+                     status=(int)Automation.MachineStatus.Produce,
+                     
+                });
+            }
+            else
+            {
+                monitor.sn = sn;
+                monitor.section = loading.section;
+                monitor.updatetime = DateTime.Now;
+                monitor.status = (int)Automation.MachineStatus.Produce;
+                _automationFixtureMonitor.Update(monitor);
+            }
+
 
             if (_unitOfWork.Commit() > 0)
                 return new ObjectResult(CommonEnum.Succefull);

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_fixture_tools_monitor.cs

@@ -9,7 +9,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// <summary>
         /// 工装ID
         /// </summary>
-        public int fixtureId { get; set; }
+        public string fixtureguid { get; set; }
         /// <summary>
         /// 当前工站ID
         /// </summary>