fixedbug

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);

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);
                         }
                     }