diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs index 7f586b0..948acaf 100644 --- a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs +++ b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs @@ -54,6 +54,16 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban //工单 + [HttpGet("get_workorder")] + public IActionResult GetWorkOrderList(DateTime today,string LineCode) + { + if(today == DateTime.MinValue|| string.IsNullOrEmpty(LineCode)) + { + return SUCCESS(null); + } + var response = _LoginOrSetService.GetWorkOrderList(today, LineCode); + return SUCCESS(response); + } diff --git a/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs b/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs index a892de5..c228581 100644 --- a/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs +++ b/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs @@ -1,4 +1,6 @@ using DOAN.Model.MES.base_; +using DOAN.Model.MES.product; +using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Linq; @@ -12,5 +14,7 @@ namespace DOAN.Service.JobKanban.IService List GetGroupList(); string[] GetRouteList(); + List GetWorkOrderList(DateTime today, string LineCode); + } } diff --git a/DOAN.Service/JobKanban/LoginOrSetService.cs b/DOAN.Service/JobKanban/LoginOrSetService.cs index 145d489..b8ab0da 100644 --- a/DOAN.Service/JobKanban/LoginOrSetService.cs +++ b/DOAN.Service/JobKanban/LoginOrSetService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using DOAN.Model.MES.andon; using DOAN.Model.MES.base_; using DOAN.Model.MES.base_.Dto; +using DOAN.Model.MES.product; using DOAN.Service.JobKanban.IService; using DOAN.Service.MES.andon.IService; using Infrastructure.Attribute; @@ -19,13 +20,23 @@ namespace DOAN.Service.JobKanban public List GetGroupList() { - return Context.Queryable().Where(it=>it.Status==1).ToList(); + return Context.Queryable().Where(it => it.Status == 1).ToList(); } public string[] GetRouteList() { return Context.Queryable() - .Where(it => it.Status == 1).Select(it=>it.Code).ToArray(); + .Where(it => it.Status == 1).Select(it => it.Code).ToArray(); + } + + public List GetWorkOrderList(DateTime today, string LineCode) + { + today = today.Date; + return Context.Queryable() + .Where(it => it.WorkorderDate == today) + .Where(it => it.RouteId == LineCode) + .ToList(); + } }