Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

油漆实验室

Browse Source
This commit is contained in:
卢江海
2025-03-28 17:29:12 +08:00
parent 19c72cd56c
commit 2c5caafacd
8 changed files with 534 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
View File

@@ -26,13 +26,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet("gettestlist")]
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize)
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize,int dateType)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, workorderid, description, pageNum, pageSize);
(List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, workorderid, description, pageNum, pageSize, dateType);
return ToResponse(new ApiResult(200, "success", lst));
}

25
ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
View File

@@ -15,23 +15,24 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
this.plBatchService = plbatchservice;
}
/// <summary>
/// 获取批处理数据
/// </summary>
/// <param name="starttime"></param>
/// <param name="endTime"></param>
/// <param name="workorderid">颜色代码</param>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet("getbatchlist")]
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize)
/// <summary>
/// 获取批处理数据
/// </summary>
/// <param name="starttime"></param>
/// <param name="endTime"></param>
/// <param name="workorderid">颜色代码</param>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="dateType"></param>
/// <returns></returns>
[HttpGet("getbatchlist")]
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize,int dateType, string workOrder)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, workorderid, description, pageNum, pageSize);
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, workorderid, description, pageNum, pageSize, dateType, workOrder);
return ToResponse(new ApiResult(200, "success", lst));
}