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

工单排程添加物料检测

Browse Source
This commit is contained in:
赵正易
2024-05-31 13:22:07 +08:00
parent 6677691305
commit c93711290e
8 changed files with 480 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
View File

@@ -12,6 +12,7 @@ using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.pro;
using ZR.Model.MES.pro.DTO;
using ZR.Service.mes.pro;
using ZR.Service.mes.pro.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
@@ -38,7 +39,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
[HttpGet("getWorkoderList")]
public IActionResult GetWorkorderList(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<ProWorkorder_v2>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, 0);
(List<ProWorkOrder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, 0);
return ToResponse(new ApiResult(200, "success", data));
}

22
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanV2Controller.cs
View File

@@ -44,8 +44,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, int year = -1, int week = -1, string partNumber = "", string color = "")
{
(List<ProWorklplan_v2>, int) data = proWorkplanService.GetAllData(pageNum, pageSize, year, week, partNumber, color);
(List<ProWorklplanDto>, int) data = proWorkplanService.GetAllData(pageNum, pageSize, year, week, partNumber, color);
return ToResponse(new ApiResult(200, "success", data));
}
@@ -240,7 +239,26 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
return ExportExcel(result.Item2, result.Item1);
}
/// <summary>
/// 生产计划检查
/// </summary>
/// <param name="proWorkplan">生产计划对象</param>
/// <returns></returns>
[HttpPost("checkWorkPlan")]
public IActionResult CheckWorkPlan([FromBody] ProWorklplan_v2 proWorkplan)
{
try
{
int result = proWorkplanService.CheckWorkPlan(proWorkplan);
return ToResponse(new ApiResult(200, "success", result));
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message, 0));
}
}
}
}