fixedbug

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

@@ -458,7 +458,9 @@ namespace Siger.ApiACC.Controllers
                         else
                         {
                             var nextRoute = productRoutes.OrderBy(d => d.serialNumber).FirstOrDefault();
-                            locationObj.route = nextRoute != null ? nextRoute.id.ToString() : "";
+
+                            locationObj.routeid = nextRoute != null ? nextRoute.id : 0;
+                            locationObj.route = nextRoute != null ? nextRoute.name : "";
                         }
                         _automationLocation.Update(locationObj);
 

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

@@ -94,6 +94,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
         {
             var query = from q in _context.siger_automation_task_list 
                         join t in _context.siger_automation_fixture_tools on q.fixtureguid equals t.guid
+                        join r in _context.siger_project_product_route on q.route equals r.id into rtemp
+                        from r in rtemp.DefaultIfEmpty()
                         join s in _context.siger_project_level_section on q.sectionid equals s.id
                         join lv in _context.siger_project_level_section on s.parentid equals lv.id
                         where q.projectId == projectid
@@ -117,7 +119,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                              ordernumber=q.ordercode,
                              productCode=q.productcode,
                              program=q.programnumber,
-                             route=q.remark,
+                             route=r!=null?$"{r.serialNumber}-{r.name}":"",
+
                              tasktype=EnumHelper.GetEnumDesc(q.tasktype),
                              status=q.status,