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

IQC

Browse Source
This commit is contained in:
qianhao.xu
2023-11-27 16:28:16 +08:00
parent 7ba84f96cd
commit 2a6ccc616e
10 changed files with 293 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs
View File

@@ -44,6 +44,24 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 甘特图
/// </summary>
/// <param name="year"></param>
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("GetGanttList")]
public IActionResult GetGanttList(int year = -1, int week = -1, int date = -1)
{
GanttTaskDTO data = proWorkorderService.GetGanttList(year, week, date);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 获取所有排产工单
/// </summary>

9
ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs
View File

@@ -7,13 +7,14 @@ using Newtonsoft.Json.Linq;
using System.Text.Json;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.pro;
using ZR.Model.MES.qc.DTO;
using ZR.Service.mes.pro;
using ZR.Service.mes.pro.IService;
using ZR.Service.mes.qu.IService;
namespace ZR.Admin.WebApi.Controllers.mes.qu
{
[Route("mes/qu/rough")]
[Route("mes/qc/IQC")]
public class QcRoughController : BaseController
{
private readonly IQcRoughService quRoughService;
@@ -32,10 +33,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.qu
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("getworkorderList")]
public IActionResult GetWorkorderList(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
[HttpGet("getStatisticslist")]
public IActionResult GetStatisticslist(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<ProWorkorder>, int) data = quRoughService.GetWorkorderList(pageNum, pageSize, year, week, date, 1);
(List<Mr_QuRoughDTO>, int) data = quRoughService.GetStatisticslist(pageNum, pageSize, year, week, date, 1);
return ToResponse(new ApiResult(200, "success", data));
}