Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

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

@@ -328,12 +328,17 @@ namespace Siger.ApiACC.Controllers
                 if (monitor != null)
                 {
                     monitor.section = 0;
+                   
+
                 }
             }
            
             if (monitor != null)
             {
                 monitor.status = status;
+                monitor.route = taskObj.route;
+                monitor.fixtureguid = taskObj.fixtureguid;
+                monitor.fixturename = taskObj.fixturename;
                 _automationFixtureMonitor.Update(monitor);
             }
 

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

@@ -91,14 +91,14 @@ namespace Siger.ApiACC.Controllers
             return new ObjectResult(output);
         }
         [HttpGet]
-        public IActionResult GetTasklist(int section, int tasktype, string productCode, string taskno, string sn, int status, int actionType, string triggertime, string complatetime,int page,int pageSize)
+        public IActionResult GetTasklist(int section, int tasktype, string productCode, string taskno, string sn, int status, int actionType, string triggerbegin,string triggerend, string complatebegin,string complatend,int page,int pageSize)
         {
             var ids = new List<int>();
             if (section != 0)
             {
                 ids = _sigerProjectLevelSection.GetLevelSectionIds(section, ProjectId).ToList();
             }
-            var resulst = _automationTaskList.GetTasklistPagedList(ids, tasktype, productCode, taskno, sn, status, actionType, triggertime, complatetime,ProjectId,page,pageSize);
+            var resulst = _automationTaskList.GetTasklistPagedList(ids, tasktype, productCode, taskno, sn, status, actionType, triggerbegin, triggerend, complatebegin, complatend, ProjectId,page,pageSize);
 
             return new PagedObjectResult(resulst, resulst.Total, page, pageSize);
         }