RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加分页

Browse Source
This commit is contained in:
qianhao.xu 2024-08-12 20:13:14 +08:00
parent 52ef3a4f6a
commit 0e91202a60
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillController.cs
View File

@ -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);

6
DOAN.Model/MES/base/Dto/BaseWorkStationDto.cs
View File

@ -12,6 +12,12 @@ namespace DOAN.Model.MES.base_.Dto
}
public class BaseWorkStationQueryDto2 : PagerInfo
{
public int route_id { get; set; }
}
/// <summary>
/// 工位输入输出对象
/// </summary>

8
DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs
View File

@ -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>
/// 获取工艺路线与工序父子表

2
DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs
View File

@ -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);