diff --git a/ZR.Admin.WebApi/Controllers/BI/ProductionDashboardController.cs b/ZR.Admin.WebApi/Controllers/BI/ProductionDashboardController.cs index 406a8781..9e9c403c 100644 --- a/ZR.Admin.WebApi/Controllers/BI/ProductionDashboardController.cs +++ b/ZR.Admin.WebApi/Controllers/BI/ProductionDashboardController.cs @@ -1,9 +1,10 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; -using ZR.Admin.WebApi.Filters; +using ZR.Model.MES.qc.DTO; using ZR.Service.BI.IService; using ZR.Service.mes.mm; +using ZR.Service.mes.pro; namespace ZR.Admin.WebApi.Controllers.BI { @@ -60,5 +61,14 @@ namespace ZR.Admin.WebApi.Controllers.BI } + /// + /// 获取一检生产的工单 + /// + [HttpGet("getProductingWorkorder")] + public IActionResult GetProductingWorkorder() + { + + return SUCCESS(productionDashboard.GetProductingWorkorder()); + } } } diff --git a/ZR.Service/BI/IService/IProductionDashboardService.cs b/ZR.Service/BI/IService/IProductionDashboardService.cs index 2a5d02be..69ff935a 100644 --- a/ZR.Service/BI/IService/IProductionDashboardService.cs +++ b/ZR.Service/BI/IService/IProductionDashboardService.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using ZR.Model.MES.pro; using ZR.Model.MES.pro.DTO; +using ZR.Model.MES.qc.DTO; namespace ZR.Service.BI.IService { @@ -27,6 +28,6 @@ namespace ZR.Service.BI.IService /// List TodayFinishProductionProWorkorder(); - + QcCurrentWorkorderDto GetProductingWorkorder(); } } diff --git a/ZR.Service/BI/ProductionDashboardService.cs b/ZR.Service/BI/ProductionDashboardService.cs index 2755d7d4..4abccc83 100644 --- a/ZR.Service/BI/ProductionDashboardService.cs +++ b/ZR.Service/BI/ProductionDashboardService.cs @@ -7,8 +7,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using ZR.Model.MES.pro; +using ZR.Model.MES.qc.DTO; using ZR.Service.BI.IService; using ZR.Service.mes.mm.IService; +using ZR.Service.mes.pro; +using ZR.Service.mes.qc; namespace ZR.Service.BI { @@ -86,5 +89,11 @@ namespace ZR.Service.BI } + public QcCurrentWorkorderDto GetProductingWorkorder() + { + return FirstFQCService.Now_producting_Workorder_first; + } + + } }