fixedbug

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

@@ -134,23 +134,27 @@ namespace Siger.ApiACC.Controllers
         [HttpGet]
         public IActionResult GetLoadingState(int section)
         {
-            var monitor = _automationFixtureMonitor.Get(f => f.section == section);
-            var state = (int)Automation.TaskResultStatus.Waiting;
-            if (monitor!=null)
+           
+            var sectionProperty = _sectionPropertyRepository.Get(f=>f.sectionid==section);
+            if (sectionProperty==null)
             {
-                var taskobj = _automationTaskList.Get(f => f.no == monitor.taskno);
-                state = taskobj != null ? taskobj.status : (int)Automation.TaskResultStatus.Waiting;
+                throw new BadRequestException(CommonEnum.RecordNotFound);
             }
+            if (sectionProperty.upload==0 && sectionProperty.down==0)
+            {
+                throw new BadRequestException(CommonEnum.RecordNotFound);
+            }
+            var monitor = _automationTaskList.GetList(f =>f.sectionid==section ,"id",true).FirstOrDefault();
             var result = new ResponsePlanlFixtureInfo
             {
-                OrderNumber = monitor!=null? monitor.ordernumber:"",
+                OrderNumber = monitor!=null? monitor.ordercode:"",
                 FixtureGuid = monitor != null ? monitor.fixtureguid:"",
                 FixtureName = 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 = state,
-                Location = monitor != null ? monitor.locationId:0,
+                status = monitor != null ? monitor.status : 0,
+                Location = monitor != null ? monitor.locationid:0,
             };
             return new ObjectResult(result);
         }
@@ -406,7 +410,11 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.Station_Null);
             }
-            if (upload.upload <=2 )
+            if (upload.upload==0)
+            {
+                throw new BadRequestException(AccEnum.MachineOnFree); 
+            }
+            if (upload.upload !=2 )
             {
                 throw new BadRequestException(AccEnum.TaskProcessing);
             }
@@ -593,29 +601,32 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult Disassemble([FromBody]Requestdisassemble disassemble)
         {
-            if (!_automationTaskList.CanTask(ProjectId, disassemble.section))
-            {
-                throw new BadRequestException(AccEnum.TaskProcessing);
-            }
-            //创建 安装完成动作
-            var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == disassemble.section);
-            if (monitor == null)
-            {
-                throw new BadRequestException(AccEnum.MonitorNotfound);
-            }
+          
+
  
             var upload = _sectionPropertyRepository.Get(f => f.sectionid == disassemble.section);
             if (upload == null)
             {
                 throw new BadRequestException(AccEnum.Station_Null);
             }
-            if (upload.down < 2)
+            if(upload.down==0)
+            {
+                throw new BadRequestException(AccEnum.MachineOnFree);
+            }
+            if (upload.down != 2)
             {
                 throw new BadRequestException(AccEnum.TaskProcessing);
             }
             upload.down += 1;
             _sectionPropertyRepository.Update(upload);
 
+            //创建 安装完成动作
+            var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == disassemble.section);
+            if (monitor == null)
+            {
+                throw new BadRequestException(AccEnum.MonitorNotfound);
+            }
+
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             _automationTaskList.Insert(new siger_automation_task_list
             {