someupdate

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

@@ -245,16 +245,13 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(CommonEnum.Fail);
             }
 
-            //是否还有未完成任务
-            var taskDone = _automationTaskList.Get(f => f.projectId == PID && f.status < (int)TaskResultStatus.Complated);
-            if(taskDone!=null)
+            //还有未完成任务 退出 等待任务下发
+            if (!_automationTaskList.CanTask(PID, taskObj.sectionid))
             {
-                //还有未完成任务 退出 等待任务下发
                 return new ObjectResult(CommonEnum.Succefull);
             }
-
             //3.Tasklist 任务全部完成 ,创建自动任务
-         
+
             switch (request.status)
             {
                 case (int)TaskResultStatus.Cancel:
@@ -353,21 +350,15 @@ namespace Siger.ApiACC.Controllers
             //2.其他设备上料
             //3.其他设备下料 
             */
-           
-
             var updownDic= stationDicts.Where(s => s.dkey == DictKeyValConst.UploadloadStation);
             var uploadStations = updownDic.Select(f => f.dval.ToInt()).ToList();
-
             /* 自动任务创建只有CNC 设备;排除上料设备（手动任务） */
-
-
             var dictClean = stationDicts.FirstOrDefault(s=>s.dkey==DictKeyValConst.CleanStation);
             if (dictClean==null)
             {
                 Logger.WriteLineInfo($"AutoProcess 未配置清洗机字典");
                 return;
             }
-
             // 获取可用 设备状态列表 排除上料工位
             var machineStatusList = _automationMachineStatus.GetList(f => f.projectId == PID && !uploadStations.Contains(f.section) && f.enable == 1);
             if (!machineStatusList.Any())
@@ -464,7 +455,6 @@ namespace Siger.ApiACC.Controllers
         /// <param name="machineStatus"></param>
         /// <param name="actionType"></param>
         /// <param name="taskAction"></param>
-        /// <param name="uploadStations"></param>
         /// <param name="guid">工装GUID</param>
         /// <param name="orderno">订单</param>
         /// <param name="sn">工件</param>
@@ -534,7 +524,6 @@ namespace Siger.ApiACC.Controllers
             //}
             //储位有SN 工件
 
-          
             var location = _automationLocation.GetList(f => f.projectId == PID && productIds.Contains(f.productid));
             var hasSnloaction = location.Where(f =>!string.IsNullOrEmpty(f.sn));
             if (!hasSnloaction.Any())
@@ -551,14 +540,13 @@ namespace Siger.ApiACC.Controllers
             return new ResponseAutomationLocationRouteInfo
             {
                 fixture = result.fixturetools,
-                //fixturename=result.n
-                ordernumber=result.ordernumber,
+                fixturename = result.fixturename,
+                ordernumber =result.ordernumber,
                 location=result.locationid,
                 productId=result.productid,
                 productCode=result.productcode,
-                //productName=result.pr
-                
-                sn=result.sn,
+                productName = result.productname,
+                sn =result.sn,
                 pn= valiateBeat.process_number,
                 route=valiateBeat.route_name
             };

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationTaskListRepository.cs

@@ -27,7 +27,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
 
         public bool CanTask(int projectId,int section)
         {
-            var taskObj = _context.siger_automation_task_list.FirstOrDefault(f => f.projectId == projectId && f.status < (int)TaskResultStatus.Complated);
+            //已经下发，并且任务完成
+            var taskObj = _context.siger_automation_task_list.FirstOrDefault(f => f.projectId == projectId && f.send==1 && f.status < (int)TaskResultStatus.Complated);
 
             if (taskObj==null)
                 return true;