fixedbug

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

@@ -382,6 +382,16 @@ namespace Siger.ApiACC.Controllers
                         Logger.WriteLineError($"AutoProcess Tasklist 为空");
                         return;
                     }
+                    var locationObj = _automationLocation.Get(f =>f.projectId==PID&& f.locationid == tasklist.locationid);
+                    if (locationObj==null)
+                    {
+                        Logger.WriteLineError($"AutoProcess 立库 为空");
+                        return;
+                    }
+                    //工件回到立库
+                    locationObj.status = 1;
+                    _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; //完成当前任务 退出
                 }
@@ -414,6 +424,8 @@ namespace Siger.ApiACC.Controllers
                             locationObj.routeid = nextRoute != null ? nextRoute.id : 0;
                             locationObj.route = nextRoute != null ? nextRoute.name : "";
                         }
+                        //工件已出立库
+                        locationObj.status = 2;
                         _automationLocation.Update(locationObj);
 
                         CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location,location.route);
@@ -531,6 +543,12 @@ namespace Siger.ApiACC.Controllers
                 var autoLocation = _automationLocation.Get(f => f.projectId == b.projectID && !string.IsNullOrEmpty(f.sn) && f.routeid == b.route_number.ToInt() && f.productid == b.product_name.ToInt());
                 if (autoLocation == null)
                     continue;
+                if(autoLocation.status==2)
+                {
+                    //SN不在立库内
+                    Logger.WriteLineError($"SelectLocation 当前储位工件不在储位上");
+                    continue;
+                }
                 TempList.Add(new ResponseAutoRouteInfo
                 {
                      FixtureGuid=autoLocation.fixturetools,