diff --git a/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs b/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs index 564cc74..54166db 100644 --- a/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs +++ b/RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderController.cs @@ -191,9 +191,9 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo /// [HttpGet("queryWorkOrderToDay")] [ActionPermissionFilter(Permission = "workorder:list")] - public ApiResult QueryWorkOrderToDay() + public ApiResult QueryWorkOrderToDay(string lineCode) { - var response = _WorkOrderService.QueryWorkOrderToDay(); + var response = _WorkOrderService.QueryWorkOrderToDay(lineCode); return response; } } diff --git a/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs b/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs index 38a2a8e..8eebee6 100644 --- a/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs +++ b/RIZO.Service/Mes/IMesService/WorkOrderInfo/IWorkOrderService.cs @@ -30,6 +30,6 @@ namespace RIZO.Service.Mes.IMesService.WorkOrderInfo List QueryWorkOrderMonth(); - ApiResult QueryWorkOrderToDay(); + ApiResult QueryWorkOrderToDay(string lineCode); } } diff --git a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs index c85f385..aeb0098 100644 --- a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs +++ b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs @@ -197,6 +197,7 @@ namespace RIZO.Service.Mes.WorkOrderInfo if (WorkOrder == null) { orderInfoNew.WorkOrderCode = strWorkOrderCode; + orderInfoNew.Sequcence = Sequcence; orderInfoNew.FlowCardNo = flowCard.FlowCardNo; orderInfoNew.MaterialCode = flowCard.MaterialCode; orderInfoNew.MaterialName = flowCard.MaterialName; @@ -415,15 +416,19 @@ namespace RIZO.Service.Mes.WorkOrderInfo return workOrders; } - public ApiResult QueryWorkOrderToDay() + public ApiResult QueryWorkOrderToDay(string lineCode) { try { var today = DateTime.Today; DateTime startTime = new DateTime(today.Year, today.Month, today.Day, 0, 0, 0); DateTime endTime = new DateTime(today.Year, today.Month, today.Day, 23, 59, 59); + var predicate = Expressionable.Create(); + predicate = predicate.And(it => it.CreateTime <= endTime); + predicate = predicate.And(it => it.CreateTime >= startTime); + predicate = predicate.AndIF(!string.IsNullOrEmpty(lineCode), it => it.LineCode == lineCode); List workOrders = Queryable() - .Where(it => it.CreateTime <= endTime && it.CreateTime >= startTime) + .Where(predicate.ToExpression()) .ToList(); if (workOrders.Any()) {