diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs index 8889945..542c6b3 100644 --- a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs +++ b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs @@ -38,6 +38,21 @@ namespace DOAN.WebApi.Controllers.JobKanban } + //TODO 根据班组 ,产线 和日期获取all工单 + [HttpGet("get_workorder_list")] + public IActionResult GetWorkOrderList(string group_code,string line_code,DateTime handleDate) + { + if(string.IsNullOrEmpty(group_code)||string.IsNullOrEmpty(line_code)||handleDate==DateTime.MinValue) + { + return SUCCESS(null); + } + var response = workorderProgressService.GetWorkOrderList(group_code, line_code, handleDate); + + return SUCCESS(response); + } + + + } diff --git a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs index 4733bc3..88f9870 100644 --- a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs +++ b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using DOAN.Model.MES.base_; +using DOAN.Model.MES.product; namespace DOAN.Service.JobKanban.IService { public interface IWorkorderProgressService @@ -11,5 +12,8 @@ namespace DOAN.Service.JobKanban.IService List GetRoutes(); List GetGroups(); + + + List GetWorkOrderList(string group_code, string line_code, DateTime handleDate); } } diff --git a/DOAN.Service/JobKanban/WorkorderProgressService.cs b/DOAN.Service/JobKanban/WorkorderProgressService.cs index cb7bfbf..6f69828 100644 --- a/DOAN.Service/JobKanban/WorkorderProgressService.cs +++ b/DOAN.Service/JobKanban/WorkorderProgressService.cs @@ -23,6 +23,17 @@ namespace DOAN.Service.JobKanban { return Context.Queryable().Where(it => it.Status == 1).ToList(); } + + + public List GetWorkOrderList(string group_code, string line_code, DateTime handleDate) + { + handleDate = handleDate.ToLocalTime().Date; + + return Context.Queryable().Where(it => it.GroupCode == group_code) + .Where(it => it.LineCode == line_code) + .Where(it => it.WorkorderDate == handleDate) + .ToList(); + } } }