someupdate

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

@@ -325,11 +325,9 @@ namespace Siger.ApiACC.Controllers
                     }
                    
                 }
-                if (monitor != null)
+                if (monitor != null && taskObj.action != TaskAction.Step_SXLW_LK)
                 {
                     monitor.section = 0;
-                   
-
                 }
             }
            

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

@@ -344,10 +344,10 @@ namespace Siger.ApiACC.Controllers
                     throw new BadRequestException(AccEnum.MachineBusy);
                 }
             }
-            if (!_automationTaskList.CanTask(ProjectId,loading.section))
-            {
-                throw new BadRequestException(AccEnum.TaskProcessing);
-            }
+            //if (!_automationTaskList.CanTask(ProjectId,loading.section))
+            //{
+            //    throw new BadRequestException(AccEnum.TaskProcessing);
+            //}
 
             var plandts = _planDetails.Get(f => f.projectId == ProjectId && f.OrderNumber == loading.code);
             if (plandts==null)
@@ -474,19 +474,21 @@ 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 (!_automationTaskList.CanTask(ProjectId, assemble.section))
+            if (machineStatus.status == (int)Automation.MachineStatus.Waiting)
             {
-                throw new BadRequestException(AccEnum.TaskProcessing);
+                throw new BadRequestException(AccEnum.MachineOnFree);
+            }
+            if (machineStatus.status == (int)Automation.MachineStatus.Complated)
+            {
+                throw new BadRequestException(AccEnum.MachineProCompalate);
             }
+
+            machineStatus.status = (int)Automation.MachineStatus.Complated;
+
+            //if (!_automationTaskList.CanTask(ProjectId, assemble.section))
+            //{
+            //    throw new BadRequestException(AccEnum.TaskProcessing);
+            //}
             //创建 安装完成动作
             var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == assemble.section);
             if (monitor==null)
@@ -711,7 +713,6 @@ namespace Siger.ApiACC.Controllers
 
             if (_unitOfWork.Commit() > 0)
             {
-                Logger.WriteLineError($"手动任务-拆卸完成-{Siger.Middlelayer.Common.Helpers.EnumHelper.GetEnumDesc(Automation.TaskAction.Step_SXLW_LK)}");
                 return new ObjectResult(CommonEnum.Succefull);
             }
             else

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

@@ -10,19 +10,23 @@ using Siger.Middlelayer.AccRepository.Response;
 using Siger.ApiCommon.Result;
 using Siger.Middlelayer.Common;
 using Siger.Middlelayer.Share.Enum.ModuleEnum;
+using Siger.Middlelayer.Repository;
+using Siger.Middlelayer.Log;
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
 namespace Siger.ApiACC.Controllers
 {
     public class AutomationStateController : BaseController
     {
+        private readonly IUnitOfWork _unitOfWork;
         private readonly ISigerProjectLevelSectionRepository _sigerProjectLevelSection;
         private readonly IAutomationMachineStatus _automationMachineStatus;
         private readonly IAutomationTaskListRepository _automationTaskList;
         private readonly IAutomationFixtureMonitor _automationFixtureMonitor;
 
-        public AutomationStateController(ISigerProjectLevelSectionRepository sigerProjectLevelSection, IAutomationMachineStatus automationMachineStatus, IAutomationTaskListRepository automationTaskList, IAutomationFixtureMonitor automationFixtureMonitor)
+        public AutomationStateController(IUnitOfWork unitOfWork, ISigerProjectLevelSectionRepository sigerProjectLevelSection, IAutomationMachineStatus automationMachineStatus, IAutomationTaskListRepository automationTaskList, IAutomationFixtureMonitor automationFixtureMonitor)
         {
+            _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
             _automationMachineStatus = automationMachineStatus;
             _automationTaskList = automationTaskList;
@@ -102,5 +106,24 @@ namespace Siger.ApiACC.Controllers
 
             return new PagedObjectResult(resulst, resulst.Total, page, pageSize);
         }
+        public IActionResult DeleteTask(int id)
+        {
+            var record = _automationTaskList.Get(f => f.id == id);
+            if (record == null)
+            {
+                throw new BadRequestException(CommonEnum.RecordNotFound);
+            }
+            _automationTaskList.Delete(record);
+
+            if (_unitOfWork.Commit() > 0)
+            {
+                Logger.WriteLineError($"手动任务创建成功-{Siger.Middlelayer.Common.Helpers.EnumHelper.GetEnumDesc(Automation.TaskAction.Step_LK_SXLW)}");
+                return new ObjectResult(CommonEnum.Succefull);
+            }
+            else
+            {
+                throw new BadRequestException(CommonEnum.Fail);
+            }
+        }
     }
 }