From 0e91202a6002c120f5ec907bbb908dbd73b9bb06 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 12 Aug 2024 20:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/group/GroupPersonSkillController.cs          | 12 ++++++------
 DOAN.Model/MES/base/Dto/BaseWorkStationDto.cs        |  6 ++++++
 .../MES/group/GroupPersonSkillMatrixService.cs       |  8 +++++---
 .../group/IService/IGroupPersonSkillMatrixService.cs |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillController.cs b/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillController.cs
index 3217cb8..138d0f0 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillController.cs
@@ -157,7 +157,7 @@ namespace DOAN.Admin.WebApi.Controllers
 
 
 
-        //TODO  获取工艺路线
+        //TODO  1 获取工艺路线
         [HttpPost("get_route")]
         public IActionResult GetWorkRouteList([FromBody] BaseWorkRouteQueryDto query)
         {
@@ -166,11 +166,11 @@ namespace DOAN.Admin.WebApi.Controllers
             return SUCCESS(response);
         }
 
-        //TODO 获取工艺路线绑定的工位
-        [HttpGet("get_workstation_by_route")]
-        public IActionResult  GetWorkstationbyRoute(int route_id)
+        //TODO 2 获取工艺路线绑定的工位  分页
+        [HttpPost("get_workstation_by_route")]
+        public IActionResult  GetWorkstationbyRoute(BaseWorkStationQueryDto2 query)
         {
-            var response = _GroupPersonSkillService.GetWorkstationbyRoute(route_id);
+            var response = _GroupPersonSkillService.GetWorkstationbyRoute(query);
             return SUCCESS(response);
 
         }
@@ -209,7 +209,7 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
         //TODO 获取工位没有绑定的技能 分页
-        [HttpGet("get_workstation_unbind_skills")]
+        [HttpPost("get_workstation_unbind_skills")]
         public IActionResult GetWorkstationunBindSkillList([FromBody] GroupPersonSkillQueryDto3 parm)
         {
             var response = _GroupPersonSkillService.GetWorkstationunBindSkillList(parm);
diff --git a/DOAN.Model/MES/base/Dto/BaseWorkStationDto.cs b/DOAN.Model/MES/base/Dto/BaseWorkStationDto.cs
index 52e3411..5cb53e6 100644
--- a/DOAN.Model/MES/base/Dto/BaseWorkStationDto.cs
+++ b/DOAN.Model/MES/base/Dto/BaseWorkStationDto.cs
@@ -12,6 +12,12 @@ namespace DOAN.Model.MES.base_.Dto
 
     }
 
+    public class BaseWorkStationQueryDto2 : PagerInfo
+    {
+       public  int route_id { get; set; }
+
+    }
+
     /// <summary>
     /// 工位输入输出对象
     /// </summary>
diff --git a/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs b/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs
index dde3d13..00df570 100644
--- a/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs
+++ b/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs
@@ -165,16 +165,18 @@ namespace DOAN.Service.group
         /// </summary>
         /// <param name="route_id"></param>
         /// <returns></returns>
-        public List<BaseWorkStation>  GetWorkstationbyRoute(int route_id)
+        public PagedInfo<BaseWorkStation>  GetWorkstationbyRoute(BaseWorkStationQueryDto2 query)
         {
             var query1 = Context.Queryable<BaseRelWorkRouteProcesses>()
-                    .Where(it => it.FkWorkRoute == route_id);
+                    .Where(it => it.FkWorkRoute == query.route_id);
             List<BaseWorkProcesses> workProcesses = Context.Queryable(query1).LeftJoin<BaseWorkProcesses>((q, p) => q.FkWorkProcesses == p.Id)
                  .Select((q, p) => p)
                  .ToList();
             int?[] filters= workProcesses.Select(it=>it.Id).ToArray();
          
-            return  Context.Queryable<BaseWorkStation>().Where(it => filters.Contains(it.FkWorkProcesses)).ToList();
+            return  Context.Queryable<BaseWorkStation>()
+                .Where(it => filters.Contains(it.FkWorkProcesses))
+                .ToPage<BaseWorkStation, BaseWorkStation>(query); 
         }
         /// <summary>
         /// 获取工艺路线与工序父子表
diff --git a/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs b/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs
index a3e3454..ac85f75 100644
--- a/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs
+++ b/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs
@@ -37,7 +37,7 @@ namespace DOAN.Service.group.IService
 
         List<BaseWorkRoute> GetWorkRouteList([FromBody] BaseWorkRouteQueryDto query);
 
-        List<BaseWorkStation>  GetWorkstationbyRoute(int route_id);
+        PagedInfo<BaseWorkStation>  GetWorkstationbyRoute(BaseWorkStationQueryDto2 query);
 
         List<RouteANDprocess> RouteProcessParentSon(BaseWorkRouteQueryDto query);