fix bug

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

@@ -38,15 +38,13 @@ namespace Siger.ApiACC.Controllers
         private readonly ISigerTrMaterialsRepository _materialsRepository;
         private readonly IAutomationTaskListRepository _automationTaskList;
         private readonly IAutomationFixtureMonitor _fixtureMonitor;
-        private readonly IProductionBeatSetRepository _beatSetRepository;
 
         public QmsCheckController(IUnitOfWork unitOfWork, IAutomationFixtureToolsProductRepository automationFixtureToolsProduct,
             ISigerProjectProductRepository productRepository, ISigerProjectLevelRepository levelRepository,
             ISigerProjectLevelSectionRepository levelSectionRepository, IInspectStandardRepository inspectStandard,
             ICheckSnTraceInspectionRepository traceInspectionRepository, ICheckSnTraceDetailRepository traceDetailRepository,
             ICheckSnListRepository checkSnListRepository, ISigerTrMaterialsRepository materialsRepository,
-            IAutomationTaskListRepository automationTaskListRepository, IAutomationFixtureMonitor fixtureMonitor,
-            IProductionBeatSetRepository beatSetRepository)
+            IAutomationTaskListRepository automationTaskListRepository, IAutomationFixtureMonitor fixtureMonitor)
         {
             _unitOfWork = unitOfWork;
             _automationFixtureToolsProduct = automationFixtureToolsProduct;
@@ -60,7 +58,6 @@ namespace Siger.ApiACC.Controllers
             _materialsRepository = materialsRepository;
             _automationTaskList = automationTaskListRepository;
             _fixtureMonitor = fixtureMonitor;
-            _beatSetRepository = beatSetRepository;
         }
         [HttpPost]
         public IActionResult AddManual([FromBody]RequestAddDataCollection req)

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

@@ -22,17 +22,15 @@ namespace Siger.ApiACC.Controllers
         private readonly IUnitOfWork _unitOfWork;
         private readonly IAutomationSectionPropertyRepository _sectionPropertyRepository;
         private readonly ISigerProjectLevelSectionRepository _levelSectionRepository;
-        private readonly IProductionBeatSetRepository _beatSetRepository;
         private readonly IAutomationFixtureMonitor _fixtureMonitor;
+        private readonly IProductRouteRepository _routeRepository;
 
         public SectionPropertyController(IUnitOfWork unitOfWork, IAutomationSectionPropertyRepository sectionPropertyRepository,
-            ISigerProjectLevelSectionRepository levelSectionRepository, IProductionBeatSetRepository beatSetRepository,
-            IAutomationFixtureMonitor fixtureMonitor)
+            ISigerProjectLevelSectionRepository levelSectionRepository, IAutomationFixtureMonitor fixtureMonitor)
         {
             _unitOfWork = unitOfWork;
             _sectionPropertyRepository = sectionPropertyRepository;
             _levelSectionRepository = levelSectionRepository;
-            _beatSetRepository = beatSetRepository;
             _fixtureMonitor = fixtureMonitor;
         }
 
@@ -48,15 +46,14 @@ namespace Siger.ApiACC.Controllers
         }
 
         [HttpGet]
-        public IActionResult GetRouteByProduct(string productId, int sectionId)
+        public IActionResult GetRouteByProduct(string productId)
         {
-            var list = _beatSetRepository.GetList(q => q.projectID == ProjectId && q.status == (int)RowState.Valid && q.product_name.ToInt() == productId.ToInt() &&
-                q.section_id == sectionId).Select(q => new
-                {
-                    q.id,
-                    name = q.route_name,
-                    q.route_number
-                }).ToList();
+            var list = _routeRepository.GetList(q => q.projectId == ProjectId && q.status == (int)RowState.Valid && q.productId == productId.ToInt()).Select(q => new
+            {
+                q.id,
+                q.name,
+                route_number = q.serialNumber
+            }).ToList();
 
             return new ObjectResult(list);
         }

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/Repositories/CheckSnTraceDetailRepository.cs

@@ -38,7 +38,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                             from m in mm.DefaultIfEmpty()
                             join s in _context.siger_project_level_section on q.sectionid equals s.id into ss
                             from s in ss.DefaultIfEmpty()
-                            join r in _context.siger_project_beat_set on q.routeid equals r.id into rr
+                            join r in _context.siger_project_product_route on q.routeid equals r.id into rr
                             from r in rr.DefaultIfEmpty()
                             join u1 in _context.siger_project_user on q.send_mid equals u1.mid into uu1
                             from u1 in uu1.DefaultIfEmpty()
@@ -60,7 +60,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                                 check_time = (q.check_time.HasValue && q.check_time != DateTime.Now) ?
                                     q.check_time.Value.ToString(ParameterConstant.DateTimeFormat) : "",
                                 routeid = q.routeid,
-                                routename = r.route_name ?? "",
+                                routename = r.name ?? "",
                                 materialid = q.materialid,
                                 materialname = m.name ?? "",
                                 materialpn = m.pn ?? "",

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/Repositories/CheckSnTraceInspectionRepository.cs

@@ -34,7 +34,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                             join s in _context.siger_project_level_section on q.sectionid equals s.id
                             join m in _context.siger_tr_materials on q.materialid equals m.id into mm
                             from m in mm.DefaultIfEmpty()
-                            join r in _context.siger_project_beat_set on q.routeid equals r.id into rr
+                            join r in _context.siger_project_product_route on q.routeid equals r.id into rr
                             from r in rr.DefaultIfEmpty()
                             join u1 in _context.siger_user on q.send_mid equals u1.id into uu1
                             from u1 in uu1.DefaultIfEmpty()
@@ -58,7 +58,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                                 sectionid = q.sectionid,
                                 sectionname = s.title ?? "",
                                 routeid = q.routeid,
-                                routename = r.route_name ?? "",
+                                routename = r.name ?? "",
                                 testroom = q.testroom,
                                 sn = q.sn,
                                 checktype = q.check_type,