fixedbug

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

@@ -260,6 +260,7 @@ namespace Siger.ApiACC.Controllers
             var section = _sigerProjectLevelSection.Get(f => f.id == taskObj.sectionid);
             if (section != null)
             {
+                Logger.WriteLineInfo($" 设备{section.title} 任务编号:{taskObj.no} 状态:{request.status} ");
                 AutoProcess(section.parentid, stationDicts, taskObj);
             }
 
@@ -314,7 +315,6 @@ namespace Siger.ApiACC.Controllers
                     machineStatus.status = (int)Automation.MachineStatus.Waiting;
                     _automationMachineStatus.Update(machineStatus);
                 }
-
             }
             
             if (monitor != null)
@@ -325,9 +325,6 @@ namespace Siger.ApiACC.Controllers
                 monitor.fixturename = taskObj.fixturename;
                 _automationFixtureMonitor.Update(monitor);
             }
-
-
-
         }
 
         /// <summary>

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

@@ -476,16 +476,11 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.MachineDisable);
             }
-            if (machineStatus.status == (int)Automation.MachineStatus.Waiting)
-            {
-                throw new BadRequestException(AccEnum.MachineOnFree);
-            }
-            if (machineStatus.status == (int)Automation.MachineStatus.Complated)
-            {
-                throw new BadRequestException(AccEnum.MachineProCompalate);
-            }
 
+            if (machineStatus.auto == 0)
+            {
                 machineStatus.status = (int)Automation.MachineStatus.Waiting;
+            }
 
             //创建 安装完成动作
             var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == assemble.section);
@@ -495,6 +490,7 @@ namespace Siger.ApiACC.Controllers
             }
             //移出 上料位
         
+
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -666,7 +662,10 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.MachineDisable);
             }
-
+            if (machineStatus.auto==0)
+            {
+                machineStatus.status = 1;
+            }
             if (!_automationTaskList.CanTask(ProjectId, disassemble.section))
             {
                 throw new BadRequestException(AccEnum.TaskProcessing);