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

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

@@ -327,6 +327,7 @@ namespace Siger.ApiACC.Controllers
                         location.route = download ? "" : taskObj.route.ToString();
                         location.sn = download ? "" : taskObj.sn;
                         location.status = (int)LocationStatus.In;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
 
                         sectionProperty.upload = 0;
@@ -352,6 +353,7 @@ namespace Siger.ApiACC.Controllers
                         location.route = taskObj.route.ToString();
                         location.routeid = taskObj.route;
                         location.status = (int)LocationStatus.Out;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
 
                         //上下料位状态 为后台控制
@@ -374,6 +376,7 @@ namespace Siger.ApiACC.Controllers
                         }
 
                         location.status = (int)LocationStatus.Out;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
 
                     }
@@ -393,6 +396,7 @@ namespace Siger.ApiACC.Controllers
                     if (taskObj.action == TaskAction.Step_LK_JGZX)
                     {
                         location.status = (int)LocationStatus.Out;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
                     }
                     if(taskObj.action== TaskAction.Step_JGZX_QXJ)
@@ -436,6 +440,7 @@ namespace Siger.ApiACC.Controllers
                     if (taskObj.action == TaskAction.Step_LK_CJT)
                     {
                         location.status = (int)LocationStatus.Out;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
                     }
                     if (taskObj.action == TaskAction.Step_CJT_SXLW)
@@ -517,6 +522,7 @@ namespace Siger.ApiACC.Controllers
                         location.route = taskObj.route.ToString();
                         location.routeid = taskObj.route;
                         location.status = (int)LocationStatus.Out;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
 
                         if (machineStatusObj != null)
@@ -538,6 +544,7 @@ namespace Siger.ApiACC.Controllers
                     if (taskObj.action == TaskAction.Step_LK_JGZX)
                     {
                         location.status = (int)LocationStatus.Out;
+                        location.updatetime = DateTime.Now;
                         _automationLocation.Update(location);
                     }
 

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

@@ -154,23 +154,23 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(CommonEnum.RecordNotFound);
             }
-            var monitor = _automationTaskList.GetList(f =>f.sectionid==section ,"id",true).FirstOrDefault();
+            var monitor = _automationFixtureMonitor.Get(f =>f.section==section );
             var img = string.Empty;
             if (monitor!=null)
             {
-                var pd = _sigerProjectProduct.Get(f => f.code == monitor.productcode);
+                var pd = _sigerProjectProduct.Get(f => f.code == monitor.productCode);
                 img = pd != null ? pd.image : "";
             }
             var result = new ResponsePlanlFixtureInfo
             {
-                OrderNumber = monitor!=null? monitor.ordercode:"",
+                OrderNumber = monitor!=null? monitor.ordernumber : "",
                 FixtureGuid = monitor != null ? monitor.fixtureguid:"",
                 FixtureCode = monitor != null ? monitor.fixturename:"",
-                ProductCode = monitor != null ? monitor.productcode:"",
-                ProductName = monitor != null ? monitor.productname:"",
+                ProductCode = monitor != null ? monitor.productCode:"",
+                ProductName = monitor != null ? monitor.productName:"",
                 Sn = monitor != null ? monitor.sn:"",
                 status = monitor != null ? monitor.status : 0,
-                Location = monitor != null ? monitor.locationid:0,
+                Location = monitor != null ? monitor.locationId:0,
                 Url=img
             };
             return new ObjectResult(result);
@@ -762,6 +762,7 @@ namespace Siger.ApiACC.Controllers
                 sn = monitor.sn,
                 ordercode = monitor.ordernumber,
                 fixtureguid = monitor.fixtureguid,
+                fixturename=monitor.fixturename,
                 locationid = monitor.locationId,
                 productcode = monitor.productCode,
                 productname=monitor.productName,

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

@@ -226,13 +226,13 @@ namespace Siger.ApiACC.Controllers
                         //去抽检台
                         if (record.extend1.ToInt()==perperty.sectionid && record.action == Automation.TaskAction.Step_LK_CJT)
                         {
-                            perperty.upload = 0;
+                            perperty.down = 0;
                             _automationSectionProperty.Update(perperty);
                         }
                         //去下料位
                         if (record.extend1.ToInt()==perperty.sectionid && record.action== Automation.TaskAction.Step_LK_SXLW)
                         {
-                            perperty.upload = 0;
+                            perperty.down = 0;
                             _automationSectionProperty.Update(perperty);
                         }
                     }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationLocationRepository.cs

@@ -272,7 +272,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             materialsn = q.sn,
                             productcode = tp.productcode,
                             routeid = q.routeid,
-                            route = r!=null?r.name:""
+                            route = r!=null?r.name:"",
+                            update=q.updatetime
                         };
             Expression<Func<ResponseAutomationLocationList, bool>> locationidFullExpression = f => true;
             if (full == 1)
@@ -288,7 +289,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 productExpression = f => f.productcode.Contains(productCode);
             }
             var expression = locationidFullExpression.And(productExpression);
-            return query.Where(expression);
+            return query.Where(expression).OrderBy(q=>q.update);
 
 
         }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseAutomationLocation.cs

@@ -107,5 +107,6 @@ namespace Siger.Middlelayer.AccRepository.Response
         public string productcode { get; set; }
         public int routeid { get; set; }
         public string route { get; set; }
+        public DateTime? update { get; set; }
     }
 }