Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

查询报工列表

Browse Source
This commit is contained in:
qianhao.xu
2024-12-10 17:21:53 +08:00
parent d300393f95
commit c6708c68e7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
View File

@@ -32,9 +32,9 @@ namespace DOAN.Admin.WebApi.Controllers
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[HttpPost("list")]
[ActionPermissionFilter(Permission = "proreportwork:list")]
public IActionResult QueryProReportwork([FromQuery] ProReportworkQueryDto parm)
public IActionResult QueryProReportwork([FromBody] ProReportworkQueryDto parm)
{
parm.JobDate[0] = DOANConvertDate.ConvertLocalDate(parm.JobDate[0]);
parm.JobDate[1] = DOANConvertDate.ConvertLocalDate(parm.JobDate[1]);

1
DOAN.Service/MES/Product/ProReportworkService.cs
View File

@@ -25,6 +25,7 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
var query = Queryable()
.Where(predicate.ToExpression());
var response = Context.Queryable(query).LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
.OrderBy((q,w)=>new { q.Workorder ,w.Id})
.Select((q, w) => new ProReportworkDto
{
ProcessName = w.Name