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

11111

Browse Source
This commit is contained in:
xiaowei.song
2024-06-20 11:52:05 +08:00
parent b5412117a7
commit 7e99683678
9 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -34,17 +34,18 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// </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, int pageNum, int pageSize)
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, int pageNum, int pageSize)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, pageNum, pageSize);
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, workorderid, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", lst));
}

14
ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
View File

@@ -33,19 +33,21 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <summary>
/// 查询原材料记录表
/// </summary>
/// <param name="starttime"></param>
/// <param name="endTime"></param>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="starttime">开始时间</param>
/// <param name="endTime">结束时间</param>
/// <param name="workorderid">批次号</param>
/// <param name="partnumber">颜色代码</param>
/// <param name="pageNum">页号</param>
/// <param name="pageSize">页大小</param>
/// <returns></returns>
[HttpGet("getrawmateriallist")]
public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, string workorderid,string partnumber,int pageNum, int pageSize)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
// 时间要增加，8个小时
(List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, pageNum, pageSize);
(List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, workorderid, partnumber,pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", lst));
}