someupdate

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

@@ -516,7 +516,6 @@ namespace Siger.ApiACC.Controllers
             var beats = _productionBeatSet.GetList(f => f.projectID == PID && f.machineID == machine);
             var productIds = beats.Select(f => f.product_name.ToInt()).ToList();
 
-
             // 取产品交期最近的订单
             var planOrder = _automationFixtureToolsProduct.GetDeliveryOrder(productIds, PID);
             if (!planOrder.Any())
@@ -525,6 +524,11 @@ namespace Siger.ApiACC.Controllers
                 return null;
             }
             var order = planOrder.FirstOrDefault();
+
+            var beatset = beats.Where(f => f.product_name == order.productId.ToString());
+
+            //var routeIds = beatset.Select(s => s.id).ToList();
+
             var location = _automationLocation.GetList(f => f.projectId == PID && f.ordernumber== order.ordernumber && productIds.Contains(f.productid));
 
             if (location==null)

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

@@ -110,6 +110,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         where d.projectId == projectId && productIds.Contains(p.product_id) && d.status != (int)RowState.Invalid && p.status != (int)RowState.Invalid
                         select new ResponseAutomationPlanOrder
                         {
+                            productId=p.product_id,
                             ordernumber=d.OrderNumber,
                             productCode=p.product_code,
                             productName=p.product_name,

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseProductFixtureInfo.cs

@@ -43,7 +43,9 @@ namespace Siger.Middlelayer.AccRepository.Response
 
     public class ResponseAutomationPlanOrder
     {
+       
         public string ordernumber { get; set; }
+        public int productId { get; set; }
         public string productCode { get; set; }
         public string productName { get; set; }
         public int delvery { get; set; }