someupdate

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

@@ -315,6 +315,7 @@ namespace Siger.ApiACC.Controllers
                         location.ordernumber = taskObj.ordercode;
                         location.productcode = taskObj.productcode;
                         location.productid = taskObj.productid;
+                        location.routeid = taskObj.route;
                         location.sn = taskObj.sn;
                         _automationLocation.Update(location);
 
@@ -324,6 +325,8 @@ namespace Siger.ApiACC.Controllers
                             monitor.section = 0;
                             _automationFixtureMonitor.Update(monitor);
                         }
+
+                       
                     }
                 }
                

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

@@ -41,9 +41,11 @@ namespace Siger.ApiACC.Controllers
         private readonly IAutomationFixtureToolsRepository _automationFixtureTools;
         private readonly IAutomationLocationRepository _automationLocation;
         private readonly IAutomationLineMode _automationLine;
+        private readonly IProductRouteRepository _productRoute;
 
         public AutomationOperateController(IUnitOfWork unitOfWork,ISigerProjectLevelSectionRepository sigerProjectLevelSection , ISigerDict sigerDict,IAutomationMachineStatus  automationMachineStatus,ISigerProjectMachineAttributionRepository sigerProjectMachineAttribution,IAutomationTaskListRepository automationTaskList,
-            IProductPlanDetails planDetails,IProductPlanRepository productPlan,IAutomationFixtureMonitor automationFixtureMonitor ,IAutomationFixtureToolsProductRepository automationFixtureToolsProduct,IAutomationFixtureToolsRepository automationFixtureTools, IAutomationLocationRepository automationLocation, IAutomationLineMode automationLine)
+            IProductPlanDetails planDetails,IProductPlanRepository productPlan,IAutomationFixtureMonitor automationFixtureMonitor ,IAutomationFixtureToolsProductRepository automationFixtureToolsProduct,IAutomationFixtureToolsRepository automationFixtureTools, IAutomationLocationRepository automationLocation,
+            IAutomationLineMode automationLine, IProductRouteRepository productRoute)
         {
             _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
@@ -58,6 +60,7 @@ namespace Siger.ApiACC.Controllers
             _automationFixtureTools = automationFixtureTools;
             _automationLocation = automationLocation;
             _automationLine = automationLine;
+            _productRoute = productRoute;
         }
 
         /// <summary>
@@ -366,6 +369,11 @@ namespace Siger.ApiACC.Controllers
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             var sn = _automationTaskList.CreateRandonSn(plan.product_code);
 
+            var route = _productRoute.GetList(f => f.productId == plan.product_id, "serialNumber",false).FirstOrDefault();
+            if (route==null)
+            {
+                throw new BadRequestException(AccEnum.ProductRouteMissing);
+            }
             var unixtime = UnixTimeHelper.GetNow();
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -392,6 +400,7 @@ namespace Siger.ApiACC.Controllers
                  processid=0,
                  programnumber="",
                  remark ="手动任务-准备上料",
+                 route=route.id,
                  extend1= unixtime.ToString()
 
             });
@@ -411,11 +420,12 @@ namespace Siger.ApiACC.Controllers
                     updatetime = DateTime.Now,
                     status = (int)Automation.MachineStatus.Produce,
                     productId = plan.product_id,
-                    productCode = plan.product_code,
+                    productCode = plan.product_code, 
                     productName = plan.product_name,
                     ordernumber = plandts.OrderNumber,
                     locationId = fixtureToolsObj.Location,
-                    unixtime = unixtime
+                    unixtime = unixtime,
+                    route= route.id
                 });
             }
             else
@@ -430,6 +440,7 @@ namespace Siger.ApiACC.Controllers
                 monitor.ordernumber = plandts.OrderNumber;
                 monitor.locationId = fixtureToolsObj.Location;
                 monitor.unixtime = unixtime;
+                monitor.route = route.id;
                 _automationFixtureMonitor.Update(monitor);
             }
 

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_task_list.cs

@@ -103,5 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         public string remark { get; set; }
 
         public string extend1 { get; set; }
+
+        public int route { get; set; }
     }
 }