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

GP12触摸屏，油漆实验室改动提交

Browse Source
This commit is contained in:
赵正易
2025-02-20 10:46:07 +08:00
parent 96e0986a0e
commit e7cff07b8a
4 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,23 +33,20 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <summary>
/// 查询原材料记录表
/// </summary>
/// <param name="starttime">开始时间</param>
/// <param name="endTime">结束时间</param>
/// <param name="workorderid">批次号</param>
/// <param name="partnumber">颜色代码</param>
/// <param name="startDate">开始时间</param>
/// <param name="endDate">结束时间</param>
/// <param name="batchNumber">批次号</param>
/// <param name="productDescription">描述</param>
/// <param name="colorCode">颜色代码</param>
/// <param name="pageNum">页号</param>
/// <param name="pageSize">页大小</param>
/// <returns></returns>
[HttpGet("getrawmateriallist")]
public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, string workorderid,string partnumber,string description, int pageNum, int pageSize)
public IActionResult GetRawMateriallist(DateTime startDate, DateTime endDate, string batchNumber, string colorCode, string productDescription, int pageNum, int pageSize)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);
(List<PLRawMaterial>, int) list = plRawMaterialService.GetRawMaterialTable(startDate, endDate, batchNumber, colorCode, productDescription, pageNum, pageSize);
// 时间要增加，8个小时
(List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, workorderid, partnumber, description, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", lst));
return ToResponse(new ApiResult(200, "success", list));
}
/// <summary>
@@ -61,9 +58,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
public IActionResult AddRawMateriallist(int num)
{
int ret = plRawMaterialService.AddRawMaterialRecords(1, 5);
int result = plRawMaterialService.AddRawMaterialRecords(1, 5);
return ToResponse(new ApiResult(200, "success", ret));
return ToResponse(new ApiResult(200, "success", result));
}
/// <summary>
@@ -131,5 +128,19 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
return pLRawMaterial;
}
/// <summary>
/// 根据传入数据查询物料信息,下拉填写
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
[HttpGet("QueryMaterialOptions")]
public IActionResult QueryMaterialOptions(string query)
{
var result = plRawMaterialService.QueryMaterialOptions(query);
return ToResponse(new ApiResult(200, "success", result));
}
}
}