some update

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

@@ -33,9 +33,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         join w in _context.siger_wms_storage on l.storageid equals w.id
                         join u in _context.siger_project_user on q.updator equals u.mid into uu
                         from u in uu.DefaultIfEmpty()
-                        join m in _context.siger_automation_fixture_tools_moniter on q.fixturetools equals m.fixtureguid into mm
-                        from m in mm.DefaultIfEmpty()
-                        join r in _context.siger_project_beat_set on m.route equals r.id into rr
+                        join r in _context.siger_project_beat_set on q.routeid equals r.id into rr
                         from r in rr.DefaultIfEmpty()
                         where q.projectId == projectid && q.status == (int)RowState.Valid
                         select new ResponseAutomationLocation
@@ -57,7 +55,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             updator = u.name ?? "",
                             status = q.status,
                             updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : "",
-                            sn = m.sn ?? "",
+                            sn = q.sn ?? "",
                             route = r.route_name ?? "",
                             routenumber = r == null ? "" : r.route_number.ToString(),
                             cate_guid = c.guid ?? "",
@@ -104,8 +102,6 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         join c in _context.siger_automation_fixture_tools_category on t.category equals c.guid
                         join l in _context.siger_wms_storage_location on q.locationid equals l.locationid
                         join w in _context.siger_wms_storage on l.storageid equals w.id
-                        join m in _context.siger_automation_fixture_tools_moniter on q.fixturetools equals m.fixtureguid into mm
-                        from m in mm.DefaultIfEmpty()
                         where q.projectId == projectid && q.status == (int)RowState.Valid
                         select new ResponseAutomationLocationList
                         {
@@ -120,7 +116,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             fixturetoolid = t.id,
                             code = t.code,
                             name = t.name,
-                            materialsn = m.sn ?? "",
+                            materialsn = q.sn ?? "",
                             categoryid = c == null ? 0 : c.id
                         };
             var entities = query.AsNoTracking().ToList();