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; }
+
+ }
+
///
/// 工位输入输出对象
///
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
///
///
///
- public List GetWorkstationbyRoute(int route_id)
+ public PagedInfo GetWorkstationbyRoute(BaseWorkStationQueryDto2 query)
{
var query1 = Context.Queryable()
- .Where(it => it.FkWorkRoute == route_id);
+ .Where(it => it.FkWorkRoute == query.route_id);
List workProcesses = Context.Queryable(query1).LeftJoin((q, p) => q.FkWorkProcesses == p.Id)
.Select((q, p) => p)
.ToList();
int?[] filters= workProcesses.Select(it=>it.Id).ToArray();
- return Context.Queryable().Where(it => filters.Contains(it.FkWorkProcesses)).ToList();
+ return Context.Queryable()
+ .Where(it => filters.Contains(it.FkWorkProcesses))
+ .ToPage(query);
}
///
/// 获取工艺路线与工序父子表
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 GetWorkRouteList([FromBody] BaseWorkRouteQueryDto query);
- List GetWorkstationbyRoute(int route_id);
+ PagedInfo GetWorkstationbyRoute(BaseWorkStationQueryDto2 query);
List RouteProcessParentSon(BaseWorkRouteQueryDto query);