fixedbug

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

@@ -381,20 +381,31 @@ namespace Siger.ApiACC.Controllers
                     if (tasklist == null)
                     {
                         Logger.WriteLineError($"AutoProcess Tasklist 为空");
-                        return;
+
+                        Logger.WriteLineError($"AutoProcess Tasklist 为空，查找设备Monitor{cleanMachine.section }状态");
+                        var machineMonitor = _automationFixtureMonitor.Get(f => f.section == cleanMachine.section);
+                        if (machineMonitor == null)
+                        {
+                            Logger.WriteLineError($"AutoProcess Tasklist 为空");
+                            return;
+                        }
+                        CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, machineMonitor.fixtureguid, machineMonitor.ordernumber, machineMonitor.sn, "", machineMonitor.productId, machineMonitor.productCode, machineMonitor.locationId, machineMonitor.route);
                     }
-                    var locationObj = _automationLocation.Get(f =>f.projectId==PID&& f.locationid == tasklist.locationid);
-                    if (locationObj==null)
+                    else
                     {
-                        Logger.WriteLineError($"AutoProcess 立库 为空");
-                        return;
-                    }
-                    //工件回到立库
-                    locationObj.status = (int)LocationStatus.In;
-                    _automationLocation.Update(locationObj);
+                        var locationObj = _automationLocation.Get(f => f.projectId == PID && f.locationid == tasklist.locationid);
+                        if (locationObj == null)
+                        {
+                            Logger.WriteLineError($"AutoProcess 立库 为空");
+                            return;
+                        }
+                        //工件回到立库
+                        locationObj.status = (int)LocationStatus.In;
+                        _automationLocation.Update(locationObj);
 
-                    CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, "无程序", tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
-                    return; //完成当前任务 退出
+                        CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, "无程序", tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
+                        return; //完成当前任务 退出
+                    }
                 }
             }
             //优先级2 ：其他设备待上料 (立库->加工中心)
@@ -443,10 +454,20 @@ namespace Siger.ApiACC.Controllers
                     Logger.WriteLineError($"AutoProcess 清洗机空闲，创建普通设备下料到清洗机Task ");
                     if (tasklist==null)
                     {
-                        Logger.WriteLineError($"AutoProcess Tasklist 为空");
-                        return;
+                        Logger.WriteLineError($"AutoProcess Tasklist 为空，查找设备Monitor{fullMachine.section }状态");
+                        var machineMonitor = _automationFixtureMonitor.Get(f => f.section == fullMachine.section);
+                        if(machineMonitor==null)
+                        {
+                            Logger.WriteLineError($"AutoProcess Tasklist 为空");
+                            return;
+                        }
+                        CreateTask(fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, machineMonitor.fixtureguid, machineMonitor.ordernumber, machineMonitor.sn,"", machineMonitor.productId, machineMonitor.productCode, machineMonitor.locationId, machineMonitor.route);
+                    }
+                    else
+                    {
+                        CreateTask(fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
                     }
-                    CreateTask(fullMachine.section,TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid,tasklist.ordercode, tasklist.sn,tasklist.programnumber,tasklist.productid,tasklist.productcode,tasklist.locationid,tasklist.route);
+                   
 
                     return; //完成当前任务 退出
                 }

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

@@ -23,6 +23,7 @@ using Siger.Middlelayer.Common.Helpers;
 using Newtonsoft.Json;
 using NPOI.SS.Formula;
 using static Siger.Middlelayer.Share.Enum.ModuleEnum.Automation;
+using Siger.ApiCommon.Result;
 
 namespace Siger.ApiACC.Controllers
 {
@@ -232,8 +233,7 @@ namespace Siger.ApiACC.Controllers
             var result = PushTask(host, sendToPLC, out string message);
             if (!result)
             {
-                Logger.WriteLineError($"TASK 下发失败 : {message}");
-                throw new BadRequestException(CommonEnum.Fail);
+                return new ImportObjectResult((int)CommonEnum.Fail, message);
             }
             taskobj.send = 1;
             _automationTaskList.Update(taskobj);